Re: UPDATE: security/qca2
On 2017/07/10 19:49, Rafael Sadowski wrote: > > Personally I'd probably merge it all into security/qca and name > > it as qca-2.x.x, just get rid of qca2, then the only quirks entry > > would be one obsolete entry for qca-tls ... > > The idea is good and works for me: > > # -> pkg_info | grep qca > qca-1.0p8 Qt Cryptographic Architecture > qca-gnupg-2.0.0beta3 GnuPG plugin for QCA2 > qca-ossl-2.0.0beta3p5 SSL/TLS plugin for QCA2 > qca2-2.0.3p2Qt Cryptographic Architecture > > # env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u > qca-1.0p8+qca2-2.0.3p2->qca-2.1.3 forward dependencies: > | Dependency of qca-ossl-2.0.0beta3p5 on qca2-* doesn't match > | Dependency of qca-gnupg-2.0.0beta3 on qca2-* doesn't match > Merging qca-ossl-2.0.0beta3p5->2.1.3 (ok) > Merging qca-gnupg-2.0.0beta3->2.1.3 (ok) > qca-1.0p8+qca-gnupg-2.0.0beta3+qca-ossl-2.0.0beta3p5+qca2-2.0.3p2->qca-2.1.3+qca-gnupg-2.1.3+qca-ossl-2.1.3: > ok > Read shared items: ok > > # pkg_info | grep qca > qca-2.1.3 Qt Cryptographic Architecture for Qt4 > qca-gnupg-2.1.3 GnuPG plugin > qca-ossl-2.1.3 SSL/TLS plugin > > I don't know if "Dependency of qca-ossl-2.0.0beta3p5 on qca2-* doesn't > match" noise is okay but it works with the (final) diff below. Yes, that's normal and expected. > When I get an OK I'll build all consumers again and commit. Perfect - I think it fits together much better this way. OK sthen@.
Re: UPDATE: security/qca2
On Mon Jul 10, 2017 at 09:04:56AM +0100, Stuart Henderson wrote:
> On 2017/07/09 23:24, Rafael Sadowski wrote:
> > On Sun Jul 09, 2017 at 10:40:14PM +0200, Landry Breuil wrote:
> > > On Sun, Jul 09, 2017 at 10:22:51PM +0200, Rafael Sadowski wrote:
> > >
> > > > > > +@conflict qca-1*
> > > > > > +@pkgpath security/qca
> > > > >
> > > > > I suppose you've tested the upgrade path :)
> > > >
> > > > This was the last task after final diff and it works with the main port:
> > > >
> > > > "qca2-2.0.3p2->2.1.3: ok"
> > > >
> > > > but not with the new flavors. I'm going crazy, I've tried so much but
> > > > nothing works :( Any advice?
> > > >
> > > > Final diff below expect for the last old qca-{ossl,gnupg} ->
> > > > qca2,{ossl,gnupg} update bits.
> > >
> > > You dont need this .if/.endif, as since we removed the pseudo flavors
> > > we're
> > > always building those pkgs - just merge the CONFIGURE_ARGS (ie remove
> > > -DBUILD_PLUGINS:Bool=OFF from above) and specify the DEPENDS for
> > > subpackages. Those WANTLIB below are duplicate too.
> > >
> > > > +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> > > > +CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
> > > > +LIB_DEPENDS-ossl +=${BUILD_PKGPATH},-main
> > > > +LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
> > > >
> > > > -WANTLIB += c m pthread ${LIBCXX}
> > > > +RUN_DEPENDS-gnupg += security/gnupg
> > > > +.endif
> > >
> > > Looking at other plugins, shouldnt you also merge qca-tls plugin ? Or
> > > remove it as it's unused ? If it's not in qca2 it might be replaced by
> > > ossl..
> >
> > There is no qca-tls plugin, I'll remove it because no port use it.
> >
> > >
> > > Now, for the upgrade paths:
> > >
> > > > +++ security/qca2/pkg/PLIST-gnupg 9 Jul 2017 20:11:09 -
> > > > +@conflict qca-gnupg-*
> > > > +@pkgpath security/qca-gnupg
> > >
> > > > +++ security/qca2/pkg/PLIST-main9 Jul 2017 20:11:09 -
> > > > +@conflict qca-<=1.0
> > > > +@pkgpath security/qca2
> > >
> > > here i think you also need @pkgpath security/qca if you want to upgrade
> > > it to qca2. The first @pkgpath here is (i think) to update qca2 to
> > > qca2,-main (ie the multipackage split)
> >
> > I'll not update security/qca to security/qca2 because I think qca is
> > dead. No port uses it.
> >
> > >
> > > And then if you remove qca, qca-ossl and qca-gnupg you *might* need a
> > > quirks entry for their removal (unsure, as they should be updated.. to
> > > test)
> > >
> > > > +++ security/qca2/pkg/PLIST-ossl9 Jul 2017 20:11:09 -
> > > > +@conflict qca-ossl-*
> > > > +@pkgpath security/qca-ossl
> > >
> > > As for ossl and gnupg, the conflict/pkgpath look fine to me, did you try
> > > upgrading all of them in a single updateset ?
> >
> > Yes exactly.
> >
> > > ie pkg_add qca qca-ossl
> > > qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
> > > qca-gnupg ?
> > >
> >
> > both, `pkg_add` -u and `pkg_add -u qca qca-ossl qca-gnupg` only work
> > with the quirks diff below (more precisely with the qca-{ossl,gnupg}
> > entries in $stem_extensions):
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/quirks/Makefile,v
> > retrieving revision 1.492
> > diff -u -p -u -p -r1.492 Makefile
> > --- Makefile9 Jul 2017 11:01:56 - 1.492
> > +++ Makefile9 Jul 2017 21:18:59 -
> > @@ -5,7 +5,7 @@ CATEGORIES =devel databases
> > DISTFILES =
> >
> > # API.rev
> > -PKGNAME = quirks-2.337
> > +PKGNAME = quirks-2.338
> > PKG_ARCH = *
> > MAINTAINER = Marc Espie
> >
> > Index: files/Quirks.pm
> > ===
> > RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> > retrieving revision 1.504
> > diff -u -p -u -p -r1.504 Quirks.pm
> > --- files/Quirks.pm 9 Jul 2017 11:01:57 - 1.504
> > +++ files/Quirks.pm 9 Jul 2017 21:18:59 -
> > @@ -412,8 +412,11 @@ my $stem_extensions = {
> > 'markdown' => 'py-markdown',
> > 'netperf-wrapper' => 'flent',
> > 'kamailio-xmlrpc' => 'kamailio-xml',
> > + 'qca-gnupg' => 'qca2-gnupg',
> > + 'qca-ossl' => 'qca2-ossl',
> > };
> >
> > +
> > my $obsolete_reason = {
> > 'BitTorrent' => 0,
> > 'BitTorrent-gui' => 0,
> > @@ -987,6 +990,8 @@ my $obsolete_reason = {
> > 'mrxvt' => 2,
> > 'net/cutegram' => 3,
> > 'devel/libqtelegram-aseman-edition' => 5,
> > + 'qca' => 3,
> > + 'qca-tls' => 3,
> > };
> >
> > # reasons for obsolete packages
> >
> >
> >
>
> Do you actually need to change the names for qca-gnupg / qca-ossl,
> can't they just stay with the same names? Then you can drop the
> renaming in quirks and the @conflict, then you just need @pkgpath
> and the obsolete entries in quirks ..
>
> Personally I'd probably merge it all into security/qca and name
> it as qca-2.x.x, just get rid of qca2, then the only
Re: UPDATE: security/qca2
On 2017/07/09 23:24, Rafael Sadowski wrote:
> On Sun Jul 09, 2017 at 10:40:14PM +0200, Landry Breuil wrote:
> > On Sun, Jul 09, 2017 at 10:22:51PM +0200, Rafael Sadowski wrote:
> >
> > > > > +@conflict qca-1*
> > > > > +@pkgpath security/qca
> > > >
> > > > I suppose you've tested the upgrade path :)
> > >
> > > This was the last task after final diff and it works with the main port:
> > >
> > > "qca2-2.0.3p2->2.1.3: ok"
> > >
> > > but not with the new flavors. I'm going crazy, I've tried so much but
> > > nothing works :( Any advice?
> > >
> > > Final diff below expect for the last old qca-{ossl,gnupg} ->
> > > qca2,{ossl,gnupg} update bits.
> >
> > You dont need this .if/.endif, as since we removed the pseudo flavors we're
> > always building those pkgs - just merge the CONFIGURE_ARGS (ie remove
> > -DBUILD_PLUGINS:Bool=OFF from above) and specify the DEPENDS for
> > subpackages. Those WANTLIB below are duplicate too.
> >
> > > +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> > > +CONFIGURE_ARGS +=-DBUILD_PLUGINS="ossl;gnupg"
> > > +LIB_DEPENDS-ossl += ${BUILD_PKGPATH},-main
> > > +LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
> > >
> > > -WANTLIB += c m pthread ${LIBCXX}
> > > +RUN_DEPENDS-gnupg += security/gnupg
> > > +.endif
> >
> > Looking at other plugins, shouldnt you also merge qca-tls plugin ? Or
> > remove it as it's unused ? If it's not in qca2 it might be replaced by
> > ossl..
>
> There is no qca-tls plugin, I'll remove it because no port use it.
>
> >
> > Now, for the upgrade paths:
> >
> > > +++ security/qca2/pkg/PLIST-gnupg 9 Jul 2017 20:11:09 -
> > > +@conflict qca-gnupg-*
> > > +@pkgpath security/qca-gnupg
> >
> > > +++ security/qca2/pkg/PLIST-main 9 Jul 2017 20:11:09 -
> > > +@conflict qca-<=1.0
> > > +@pkgpath security/qca2
> >
> > here i think you also need @pkgpath security/qca if you want to upgrade
> > it to qca2. The first @pkgpath here is (i think) to update qca2 to
> > qca2,-main (ie the multipackage split)
>
> I'll not update security/qca to security/qca2 because I think qca is
> dead. No port uses it.
>
> >
> > And then if you remove qca, qca-ossl and qca-gnupg you *might* need a
> > quirks entry for their removal (unsure, as they should be updated.. to
> > test)
> >
> > > +++ security/qca2/pkg/PLIST-ossl 9 Jul 2017 20:11:09 -
> > > +@conflict qca-ossl-*
> > > +@pkgpath security/qca-ossl
> >
> > As for ossl and gnupg, the conflict/pkgpath look fine to me, did you try
> > upgrading all of them in a single updateset ?
>
> Yes exactly.
>
> > ie pkg_add qca qca-ossl
> > qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
> > qca-gnupg ?
> >
>
> both, `pkg_add` -u and `pkg_add -u qca qca-ossl qca-gnupg` only work
> with the quirks diff below (more precisely with the qca-{ossl,gnupg}
> entries in $stem_extensions):
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.492
> diff -u -p -u -p -r1.492 Makefile
> --- Makefile 9 Jul 2017 11:01:56 - 1.492
> +++ Makefile 9 Jul 2017 21:18:59 -
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-2.337
> +PKGNAME =quirks-2.338
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.504
> diff -u -p -u -p -r1.504 Quirks.pm
> --- files/Quirks.pm 9 Jul 2017 11:01:57 - 1.504
> +++ files/Quirks.pm 9 Jul 2017 21:18:59 -
> @@ -412,8 +412,11 @@ my $stem_extensions = {
> 'markdown' => 'py-markdown',
> 'netperf-wrapper' => 'flent',
> 'kamailio-xmlrpc' => 'kamailio-xml',
> + 'qca-gnupg' => 'qca2-gnupg',
> + 'qca-ossl' => 'qca2-ossl',
> };
>
> +
> my $obsolete_reason = {
> 'BitTorrent' => 0,
> 'BitTorrent-gui' => 0,
> @@ -987,6 +990,8 @@ my $obsolete_reason = {
> 'mrxvt' => 2,
> 'net/cutegram' => 3,
> 'devel/libqtelegram-aseman-edition' => 5,
> + 'qca' => 3,
> + 'qca-tls' => 3,
> };
>
> # reasons for obsolete packages
>
>
>
Do you actually need to change the names for qca-gnupg / qca-ossl,
can't they just stay with the same names? Then you can drop the
renaming in quirks and the @conflict, then you just need @pkgpath
and the obsolete entries in quirks ..
Personally I'd probably merge it all into security/qca and name
it as qca-2.x.x, just get rid of qca2, then the only quirks entry
would be one obsolete entry for qca-tls ...
Re: UPDATE: security/qca2
On Sun, Jul 09, 2017 at 11:24:38PM +0200, Rafael Sadowski wrote:
> On Sun Jul 09, 2017 at 10:40:14PM +0200, Landry Breuil wrote:
> > On Sun, Jul 09, 2017 at 10:22:51PM +0200, Rafael Sadowski wrote:
> >
> > > > > +@conflict qca-1*
> > > > > +@pkgpath security/qca
> > > >
> > > > I suppose you've tested the upgrade path :)
> > >
> > > This was the last task after final diff and it works with the main port:
> > >
> > > "qca2-2.0.3p2->2.1.3: ok"
> > >
> > > but not with the new flavors. I'm going crazy, I've tried so much but
> > > nothing works :( Any advice?
> > >
> > > Final diff below expect for the last old qca-{ossl,gnupg} ->
> > > qca2,{ossl,gnupg} update bits.
> >
> > You dont need this .if/.endif, as since we removed the pseudo flavors we're
> > always building those pkgs - just merge the CONFIGURE_ARGS (ie remove
> > -DBUILD_PLUGINS:Bool=OFF from above) and specify the DEPENDS for
> > subpackages. Those WANTLIB below are duplicate too.
> >
> > > +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> > > +CONFIGURE_ARGS +=-DBUILD_PLUGINS="ossl;gnupg"
> > > +LIB_DEPENDS-ossl += ${BUILD_PKGPATH},-main
> > > +LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
> > >
> > > -WANTLIB += c m pthread ${LIBCXX}
> > > +RUN_DEPENDS-gnupg += security/gnupg
> > > +.endif
> >
> > Looking at other plugins, shouldnt you also merge qca-tls plugin ? Or
> > remove it as it's unused ? If it's not in qca2 it might be replaced by
> > ossl..
>
> There is no qca-tls plugin, I'll remove it because no port use it.
>
> >
> > Now, for the upgrade paths:
> >
> > > +++ security/qca2/pkg/PLIST-gnupg 9 Jul 2017 20:11:09 -
> > > +@conflict qca-gnupg-*
> > > +@pkgpath security/qca-gnupg
> >
> > > +++ security/qca2/pkg/PLIST-main 9 Jul 2017 20:11:09 -
> > > +@conflict qca-<=1.0
> > > +@pkgpath security/qca2
> >
> > here i think you also need @pkgpath security/qca if you want to upgrade
> > it to qca2. The first @pkgpath here is (i think) to update qca2 to
> > qca2,-main (ie the multipackage split)
>
> I'll not update security/qca to security/qca2 because I think qca is
> dead. No port uses it.
>
> >
> > And then if you remove qca, qca-ossl and qca-gnupg you *might* need a
> > quirks entry for their removal (unsure, as they should be updated.. to
> > test)
> >
> > > +++ security/qca2/pkg/PLIST-ossl 9 Jul 2017 20:11:09 -
> > > +@conflict qca-ossl-*
> > > +@pkgpath security/qca-ossl
> >
> > As for ossl and gnupg, the conflict/pkgpath look fine to me, did you try
> > upgrading all of them in a single updateset ?
>
> Yes exactly.
>
> > ie pkg_add qca qca-ossl
> > qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
> > qca-gnupg ?
> >
>
> both, `pkg_add` -u and `pkg_add -u qca qca-ossl qca-gnupg` only work
> with the quirks diff below (more precisely with the qca-{ossl,gnupg}
> entries in $stem_extensions):
Hm. Not sure anymore how that stuff is supposed to work now :)
Re: UPDATE: security/qca2
On Sun Jul 09, 2017 at 10:40:14PM +0200, Landry Breuil wrote:
> On Sun, Jul 09, 2017 at 10:22:51PM +0200, Rafael Sadowski wrote:
>
> > > > +@conflict qca-1*
> > > > +@pkgpath security/qca
> > >
> > > I suppose you've tested the upgrade path :)
> >
> > This was the last task after final diff and it works with the main port:
> >
> > "qca2-2.0.3p2->2.1.3: ok"
> >
> > but not with the new flavors. I'm going crazy, I've tried so much but
> > nothing works :( Any advice?
> >
> > Final diff below expect for the last old qca-{ossl,gnupg} ->
> > qca2,{ossl,gnupg} update bits.
>
> You dont need this .if/.endif, as since we removed the pseudo flavors we're
> always building those pkgs - just merge the CONFIGURE_ARGS (ie remove
> -DBUILD_PLUGINS:Bool=OFF from above) and specify the DEPENDS for
> subpackages. Those WANTLIB below are duplicate too.
>
> > +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> > +CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
> > +LIB_DEPENDS-ossl +=${BUILD_PKGPATH},-main
> > +LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
> >
> > -WANTLIB += c m pthread ${LIBCXX}
> > +RUN_DEPENDS-gnupg += security/gnupg
> > +.endif
>
> Looking at other plugins, shouldnt you also merge qca-tls plugin ? Or
> remove it as it's unused ? If it's not in qca2 it might be replaced by
> ossl..
There is no qca-tls plugin, I'll remove it because no port use it.
>
> Now, for the upgrade paths:
>
> > +++ security/qca2/pkg/PLIST-gnupg 9 Jul 2017 20:11:09 -
> > +@conflict qca-gnupg-*
> > +@pkgpath security/qca-gnupg
>
> > +++ security/qca2/pkg/PLIST-main9 Jul 2017 20:11:09 -
> > +@conflict qca-<=1.0
> > +@pkgpath security/qca2
>
> here i think you also need @pkgpath security/qca if you want to upgrade
> it to qca2. The first @pkgpath here is (i think) to update qca2 to
> qca2,-main (ie the multipackage split)
I'll not update security/qca to security/qca2 because I think qca is
dead. No port uses it.
>
> And then if you remove qca, qca-ossl and qca-gnupg you *might* need a
> quirks entry for their removal (unsure, as they should be updated.. to
> test)
>
> > +++ security/qca2/pkg/PLIST-ossl9 Jul 2017 20:11:09 -
> > +@conflict qca-ossl-*
> > +@pkgpath security/qca-ossl
>
> As for ossl and gnupg, the conflict/pkgpath look fine to me, did you try
> upgrading all of them in a single updateset ?
Yes exactly.
> ie pkg_add qca qca-ossl
> qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
> qca-gnupg ?
>
both, `pkg_add` -u and `pkg_add -u qca qca-ossl qca-gnupg` only work
with the quirks diff below (more precisely with the qca-{ossl,gnupg}
entries in $stem_extensions):
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.492
diff -u -p -u -p -r1.492 Makefile
--- Makefile9 Jul 2017 11:01:56 - 1.492
+++ Makefile9 Jul 2017 21:18:59 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.337
+PKGNAME = quirks-2.338
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.504
diff -u -p -u -p -r1.504 Quirks.pm
--- files/Quirks.pm 9 Jul 2017 11:01:57 - 1.504
+++ files/Quirks.pm 9 Jul 2017 21:18:59 -
@@ -412,8 +412,11 @@ my $stem_extensions = {
'markdown' => 'py-markdown',
'netperf-wrapper' => 'flent',
'kamailio-xmlrpc' => 'kamailio-xml',
+ 'qca-gnupg' => 'qca2-gnupg',
+ 'qca-ossl' => 'qca2-ossl',
};
+
my $obsolete_reason = {
'BitTorrent' => 0,
'BitTorrent-gui' => 0,
@@ -987,6 +990,8 @@ my $obsolete_reason = {
'mrxvt' => 2,
'net/cutegram' => 3,
'devel/libqtelegram-aseman-edition' => 5,
+ 'qca' => 3,
+ 'qca-tls' => 3,
};
# reasons for obsolete packages
Re: UPDATE: security/qca2
On Sun, Jul 09, 2017 at 10:22:51PM +0200, Rafael Sadowski wrote:
> > > +@conflict qca-1*
> > > +@pkgpath security/qca
> >
> > I suppose you've tested the upgrade path :)
>
> This was the last task after final diff and it works with the main port:
>
> "qca2-2.0.3p2->2.1.3: ok"
>
> but not with the new flavors. I'm going crazy, I've tried so much but
> nothing works :( Any advice?
>
> Final diff below expect for the last old qca-{ossl,gnupg} ->
> qca2,{ossl,gnupg} update bits.
You dont need this .if/.endif, as since we removed the pseudo flavors we're
always building those pkgs - just merge the CONFIGURE_ARGS (ie remove
-DBUILD_PLUGINS:Bool=OFF from above) and specify the DEPENDS for
subpackages. Those WANTLIB below are duplicate too.
> +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> +CONFIGURE_ARGS +=-DBUILD_PLUGINS="ossl;gnupg"
> +LIB_DEPENDS-ossl += ${BUILD_PKGPATH},-main
> +LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
>
> -WANTLIB += c m pthread ${LIBCXX}
> +RUN_DEPENDS-gnupg += security/gnupg
> +.endif
Looking at other plugins, shouldnt you also merge qca-tls plugin ? Or
remove it as it's unused ? If it's not in qca2 it might be replaced by
ossl..
Now, for the upgrade paths:
> +++ security/qca2/pkg/PLIST-gnupg 9 Jul 2017 20:11:09 -
> +@conflict qca-gnupg-*
> +@pkgpath security/qca-gnupg
> +++ security/qca2/pkg/PLIST-main 9 Jul 2017 20:11:09 -
> +@conflict qca-<=1.0
> +@pkgpath security/qca2
here i think you also need @pkgpath security/qca if you want to upgrade
it to qca2. The first @pkgpath here is (i think) to update qca2 to
qca2,-main (ie the multipackage split)
And then if you remove qca, qca-ossl and qca-gnupg you *might* need a
quirks entry for their removal (unsure, as they should be updated.. to
test)
> +++ security/qca2/pkg/PLIST-ossl 9 Jul 2017 20:11:09 -
> +@conflict qca-ossl-*
> +@pkgpath security/qca-ossl
As for ossl and gnupg, the conflict/pkgpath look fine to me, did you try
upgrading all of them in a single updateset ? ie pkg_add qca qca-ossl
qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
qca-gnupg ?
Landry
Re: UPDATE: security/qca2
On Sun Jul 09, 2017 at 11:02:38AM +0200, Landry Breuil wrote:
> On Sun, Jul 09, 2017 at 10:30:06AM +0200, Rafael Sadowski wrote:
>
> 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..
ACK;
>
> > +# 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 :)
Fixed and check double!
>
> > +@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 ?
Of course, Thanks for your feedback.
>
> > +@conflict qca-1*
> > +@pkgpath security/qca
>
> I suppose you've tested the upgrade path :)
This was the last task after final diff and it works with the main port:
"qca2-2.0.3p2->2.1.3: ok"
but not with the new flavors. I'm going crazy, I've tried so much but
nothing works :( Any advice?
Final diff below expect for the last old qca-{ossl,gnupg} ->
qca2,{ossl,gnupg} update bits.
Index: audio/clementine/Makefile
===
RCS file: /cvs/ports/audio/clementine/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- audio/clementine/Makefile 19 Jun 2017 19:57:07 - 1.24
+++ audio/clementine/Makefile 9 Jul 2017 20:10:52 -
@@ -5,7 +5,7 @@ COMMENT = Qt4-based featureful music pla
V =1.2.3
DISTNAME = clementine-${V}
CATEGORIES = audio x11
-REVISION = 6
+REVISION = 7
HOMEPAGE = http://clementine-player.org/
@@ -26,7 +26,7 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2
WANTLIB += gstapp-0.10 gstbase-0.10 gstcdda-0.10 gstreamer-0.10
WANTLIB += gsttag-0.10
WANTLIB += cdio chromaprint gpod execinfo fftw3 lastfm mtp mygpo-qt
-WANTLIB += protobuf qca2 qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
+WANTLIB += protobuf qca qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
# those are dlopen'ed
WANTLIB += plist
Index: geo/qgis/Makefile
===
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 Makefile
--- geo/qgis/Makefile 25 Jun 2017 13:35:42 - 1.69
+++ geo/qgis/Makefile 9 Jul 2017 20:11:01 -
@@ -5,6 +5,7 @@ COMMENT = desktop geographical informati
DISTNAME = qgis-2.18.10
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
+REVISION = 0
SHARED_LIBS = qgis_core 17.1 \
qgis_app5.0 \
@@ -31,7 +32,7 @@ MODULES = devel/cmake \
COMPILER = gcc
BUILD_DEPENDS =x11/py-qt4>=4.8.4 \
- security/qca-ossl \
+ security/qca2,-ossl \
editors/py-qscintilla \
devel/bison>=2.4 \
geo/gdal,-python
@@ -39,7 +40,7 @@ BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
RUN_DEPENDS = x11/py-qt4>=4.8.4 \
www/py-requests \
- security/qca-ossl \
+ security/qca2,-ossl \
geo/gdal,-python \
databases/py-psycopg2 \
editors/py-qscintilla \
@@ -65,7 +66,7 @@ WANTLIB +=ICE SM X11 Xext Xi Xinerama
fontconfig freetype glib-2.0 gobject-2.0 gthread-2.0 lcms m \
mng png pthread util z proj \
QtGui QtNetwork QtXml QtSql QtCore QtScript QtSvg \
- QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi qca2 \
+ QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi qca \
QtTest spatialindex spatialite sqlite3 qscintilla2 qjson
WANTLIB += ${MODPY_WANTLIB} jpeg tiff
Index: graphics/digikam-kde4/Makefile
===
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- graphics/digikam-kde4/Makefile 28 May 2017 15:54:08 - 1.25
+++ graphics/digikam-kde4/Makefile 9 Jul 2017 20:11:01 -
@@ -16,8
Re: UPDATE: security/qca2
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 :)
Re: UPDATE: security/qca2
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!
>
> > - don't remove pkgname. qca2 is okay
> > - don't prefix qca with "-qt4" and don't rename qca to qca2 as it is
> > currently. All consumers expect libqca and for Qt5 libqca-qt5. FreeBSD
> > makes it so and I think, that's the bast way.
>
> So if i get it right, that'll be less churn around in the consumers ? I
> think that'll be preffered then
New diff below with less churn. Build fine on amd64. Only one runtime
test with net/konversation but I do not expect any impact.
Have a beautiful Sunday,
Rafael
Index: audio/clementine/Makefile
===
RCS file: /cvs/ports/audio/clementine/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- audio/clementine/Makefile 19 Jun 2017 19:57:07 - 1.24
+++ audio/clementine/Makefile 9 Jul 2017 08:16:36 -
@@ -5,7 +5,7 @@ COMMENT = Qt4-based featureful music pla
V =1.2.3
DISTNAME = clementine-${V}
CATEGORIES = audio x11
-REVISION = 6
+REVISION = 7
HOMEPAGE = http://clementine-player.org/
@@ -26,7 +26,7 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2
WANTLIB += gstapp-0.10 gstbase-0.10 gstcdda-0.10 gstreamer-0.10
WANTLIB += gsttag-0.10
WANTLIB += cdio chromaprint gpod execinfo fftw3 lastfm mtp mygpo-qt
-WANTLIB += protobuf qca2 qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
+WANTLIB += protobuf qca qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
# those are dlopen'ed
WANTLIB += plist
Index: geo/qgis/Makefile
===
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 Makefile
--- geo/qgis/Makefile 25 Jun 2017 13:35:42 - 1.69
+++ geo/qgis/Makefile 9 Jul 2017 08:16:45 -
@@ -5,6 +5,7 @@ COMMENT = desktop geographical informati
DISTNAME = qgis-2.18.10
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
+REVISION = 0
SHARED_LIBS = qgis_core 17.1 \
qgis_app5.0 \
@@ -31,7 +32,7 @@ MODULES = devel/cmake \
COMPILER = gcc
BUILD_DEPENDS =x11/py-qt4>=4.8.4 \
-
Re: UPDATE: security/qca2
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 ?
> - don't remove pkgname. qca2 is okay
> - don't prefix qca with "-qt4" and don't rename qca to qca2 as it is
> currently. All consumers expect libqca and for Qt5 libqca-qt5. FreeBSD
> makes it so and I think, that's the bast way.
So if i get it right, that'll be less churn around in the consumers ? I
think that'll be preffered then
Re: UPDATE: security/qca2
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}
- don't remove pkgname. qca2 is okay
- don't prefix qca with "-qt4" and don't rename qca to qca2 as it is
currently. All consumers expect libqca and for Qt5 libqca-qt5. FreeBSD
makes it so and I think, that's the bast way.
Opinions?
> Oh, and i think ports install manpages in man/ and not under share/man,
> you should fix qca.
Oh! Thanks fixed.
Re: UPDATE: security/qca2
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 ?
Oh, and i think ports install manpages in man/ and not under share/man,
you should fix qca.
UPDATE: security/qca2
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)
This is a list of all conventions:
audio/clementine
geo/qgis
graphics/digikam-kde4
net/konversation
net/libktorrent
net/psi
security/qoauth
x11/kde4/kget
x11/kde4/runtime
x11/kde4/kopete
x11/kde4/ksirk
x11/kde4/libs
x11/kde4/okteta
x11/kde4/okular
x11/kde4/plasma-addons
I have all tested and patch. The result can be found in the diff below.
I hope to have noticed everything.
All comments are really welcome and okay anyway.
Okay to remove security/qca-gnupg and security/qca-ossl after
update?
Best regards,
Rafael Sadowski
Index: audio/clementine/Makefile
===
RCS file: /cvs/ports/audio/clementine/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- audio/clementine/Makefile 19 Jun 2017 19:57:07 - 1.24
+++ audio/clementine/Makefile 7 Jul 2017 12:35:34 -
@@ -5,7 +5,7 @@ COMMENT = Qt4-based featureful music pla
V =1.2.3
DISTNAME = clementine-${V}
CATEGORIES = audio x11
-REVISION = 6
+REVISION = 7
HOMEPAGE = http://clementine-player.org/
@@ -26,7 +26,7 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2
WANTLIB += gstapp-0.10 gstbase-0.10 gstcdda-0.10 gstreamer-0.10
WANTLIB += gsttag-0.10
WANTLIB += cdio chromaprint gpod execinfo fftw3 lastfm mtp mygpo-qt
-WANTLIB += protobuf qca2 qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
+WANTLIB += protobuf qca-qt4 qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
# those are dlopen'ed
WANTLIB += plist
Index: audio/clementine/patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/audio/clementine/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- audio/clementine/patches/patch-CMakeLists_txt 1 Oct 2014 20:52:48
- 1.3
+++ audio/clementine/patches/patch-CMakeLists_txt 7 Jul 2017 12:35:34
-
@@ -1,8 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2014/10/01 20:52:48 dcoppa Exp $
1. Force using bundled GTest and GMock, as it's better this way.
2. Make Clementine use system SHA-2 implementation.
CMakeLists.txt.origWed Apr 23 12:16:44 2014
-+++ CMakeLists.txt Wed Oct 1 16:34:54 2014
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
cmake_policy(SET CMP0011 OLD)
@@ -11,6 +12,35 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
include(FindPkgConfig)
include(cmake/Summary.cmake)
include(cmake/Version.cmake)
+@@ -46,6 +47,7 @@ find_package(Gettext REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ find_package(Protobuf REQUIRED)
+ find_package(FFTW3)
++find_package(Qca-qt4 REQUIRED)
+
+ pkg_check_modules(CDIO libcdio)
+ pkg_check_modules(CHROMAPRINT libchromaprint)
+@@ -62,7 +64,6 @@ pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
+ pkg_check_modules(LIBMTP libmtp>=1.0)
+ pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.7)
+ pkg_check_modules(LIBXML libxml-2.0)
+-pkg_check_modules(QCA qca2)
+ pkg_check_modules(QJSON REQUIRED QJson)
+ pkg_check_modules(SPOTIFY libspotify>=12.1.45)
+ pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
+@@ -256,10 +257,10 @@ optional_component(SPARKLE ON "Sparkle integration"
+
+ optional_component(VISUALISATIONS ON "Visualisations")
+
+-if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND)
++if(NOT HAVE_SPOTIFY_BLOB AND NOT Qca-qt4_FOUND)
+ message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify "
+ "code must be compiled in")
+-elseif(QCA_FOUND)
++elseif(Qca-qt4_FOUND)
+ set(HAVE_SPOTIFY_DOWNLOADER ON)
+ endif()
+
@@ -366,27 +367,45 @@ if(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES
set(ECHONEST_LIBRARIES echonest)
endif(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES)
Index: audio/clementine/patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/audio/clementine/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_CMakeLists_txt
--- audio/clementine/patches/patch-src_CMakeLists_txt 1 Oct 2014 20:52:48
- 1.3
+++ audio/clementine/patches/patch-src_CMakeLists_txt 7 Jul 2017 12:35:34
-
@@ -1,8 +1,9 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2014/10/01 20:52:48 dcoppa Exp $
1. -Wno-unused-private-field -Wno-unknown-warning-option dont exist on gcc 4.8
2. FIX BUG 4401: No namespaces
Re: UPDATE: security/qca2
I was wondering if there's anyone who has run into this: One thing I've run into the very few times I tried building KDE4 is that for me the qca2 library is installed with version 2.0 instead of 3.0. make package fails with: Error: /home/remco/ports/pobj/qca2-2.0.3/fake-i386/usr/local/lib/libqca.so.3.0 does not exist .. $ cat /etc/mk.conf FETCH_PACKAGES=yes MAKE_FLAGS=-j4 overwritten MAKE_FLAGS. should be MAKE_FLAGS+=-j4 Thanks, that fixed it.
Re: UPDATE: security/qca2
Alexandr Shadchin wrote:
On Thu, Dec 01, 2011 at 12:06:50PM -0600, Amit Kulkarni wrote:
On Thu, Dec 1, 2011 at 12:58 AM, Antoine Jacoutot ajacou...@bsdfrog.org
wrote:
On Thu, Dec 01, 2011 at 05:43:36AM +0600, Alexandr Shadchin wrote:
Hi,
This update package qca2 to the latest release 2.0.3.
Tested on amd64.
Comments ? OK ?
Considering this port is not hooked to the build, I think it's pretty
safe... ok aja@
NO_REGRESS should be Yes. there's some weird space between WANTLIB
line and .include...
in the original file there are tabs. thanks for NO_REGRESS.
other than that, it works fine...
thanks
I was wondering if there's anyone who has run into this:
One thing I've run into the very few times I tried building KDE4 is that for
me the qca2 library is installed with version 2.0 instead of 3.0.
make package fails with:
Error: /home/remco/ports/pobj/qca2-2.0.3/fake-i386/usr/local/lib/libqca.so.3.0
does not exist
The build is done on i386:
OpenBSD 5.0-current (GENERIC.MP) #134: Mon Nov 28 16:18:46 MST 2011
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP
$ ls -l ~/ports/pobj/qca2-2.0.3/fake-i386/usr/local/lib/
total 2640
drwxr-xr-x 3 root wheel 512 Dec 1 20:02 X11
-rw-r--r-- 1 root wheel 392 Dec 1 20:02 libqca.prl
-rwxr-xr-x 1 root wheel 1313478 Dec 1 20:02 libqca.so.2.0
drwxr-xr-x 2 root wheel 512 Dec 1 20:02 pkgconfig
drwxr-xr-x 3 root wheel 512 Dec 1 20:02 qt4
If I remember correctly, in the past, I once worked around it by
defining SHARED_LIBS += qca 2.0 and subsequently changing qca2
dependencies to =2.0 instead of =3.0 within KDE4.
Another time I somehow hardcoded the 3.0 version into qca2 leaving all
KDE4 dependencies at =3.0.
One particularity of this system is that I have ports installed
in /usr/local/ports.
The system I tried today also has ports in a non-default location:
$ grep PORTSDIR ~/.profile
PORTSDIR=/home/remco/ports
export PORTSDIR
$ cat /etc/mk.conf
FETCH_PACKAGES=yes
MAKE_FLAGS=-j4
SUDO=/usr/bin/sudo
PORTSDIR_PATH=${PORTSDIR}:$(PORTSDIR)/openbsd-wip
I don't know if my setup has some weirdness, though that means I have two
similarly weird setups. The biggest difference I'm able to spot is that I'm
building on i386 with ports in a non-default location, though I don't
understand how that could possibly affect the version of the library
produced.
Re: UPDATE: security/qca2
Hi, This update package qca2 to the latest release 2.0.3. Tested on amd64. Comments ? OK ? Considering this port is not hooked to the build, I think it's pretty safe... ok aja@ this is used by KDE 4.X series alongwith qca-ossl. I will give it a try while wading through the 4.8 beta1 (more packages being split...more work) and let you know later today. thanks
Re: UPDATE: security/qca2
On Thu, Dec 1, 2011 at 12:58 AM, Antoine Jacoutot ajacou...@bsdfrog.org wrote: On Thu, Dec 01, 2011 at 05:43:36AM +0600, Alexandr Shadchin wrote: Hi, This update package qca2 to the latest release 2.0.3. Tested on amd64. Comments ? OK ? Considering this port is not hooked to the build, I think it's pretty safe... ok aja@ NO_REGRESS should be Yes. there's some weird space between WANTLIB line and .include... other than that, it works fine... thanks
Re: UPDATE: security/qca2
On Thu, Dec 01, 2011 at 12:06:50PM -0600, Amit Kulkarni wrote:
On Thu, Dec 1, 2011 at 12:58 AM, Antoine Jacoutot ajacou...@bsdfrog.org
wrote:
On Thu, Dec 01, 2011 at 05:43:36AM +0600, Alexandr Shadchin wrote:
Hi,
This update package qca2 to the latest release 2.0.3.
Tested on amd64.
Comments ? OK ?
Considering this port is not hooked to the build, I think it's pretty
safe...
ok aja@
NO_REGRESS should be Yes. there's some weird space between WANTLIB
line and .include...
in the original file there are tabs. thanks for NO_REGRESS.
other than that, it works fine...
thanks
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/security/qca2/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile18 Oct 2010 21:41:47 - 1.5
+++ Makefile1 Dec 2011 18:16:25 -
@@ -3,14 +3,14 @@
COMMENT = Qt Cryptographic Architecture
SHARED_ONLY = Yes
-DISTNAME = qca-2.0.2
-PKGNAME = qca2-2.0.2
+DISTNAME = qca-2.0.3
+PKGNAME = qca2-2.0.3
CATEGORIES = security
SHARED_LIBS += qca 3.0
HOMEPAGE = http://delta.affinix.com/qca/
-# LGPL
+# LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
@@ -27,8 +27,8 @@ CONFIGURE_ENV += QTDIR=${MODQT_LIBDIR} H
MAKE_FLAGS = LIBqca_VERSION=${LIBqca_VERSION}
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}
USE_GROFF =Yes
+NO_REGRESS = Yes
+
+WANTLIB += c m pthread stdc++
-WANTLIB += c m
-WANTLIB += pthread stdc++
-
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/security/qca2/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 Jun 2010 00:35:42 - 1.2
+++ distinfo1 Dec 2011 18:16:25 -
@@ -1,5 +1,5 @@
-MD5 (qca-2.0.2.tar.bz2) = J+vfvZhp2Q2uB4pt7NAp9A==
-RMD160 (qca-2.0.2.tar.bz2) = GLD0l3CflwAidkSXeUZzXS7DxiM=
-SHA1 (qca-2.0.2.tar.bz2) = WkFMMpbNN9HsNBgr4NCJxQc/Vag=
-SHA256 (qca-2.0.2.tar.bz2) = SbVHRFAQSiKYdHwkPeFFGremru1L999D/6S3EoooN7g=
-SIZE (qca-2.0.2.tar.bz2) = 1937201
+MD5 (qca-2.0.3.tar.bz2) = /BW9TaIrgJbFH8/lLS+jCQ==
+RMD160 (qca-2.0.3.tar.bz2) = Mzz9zpH+367AnCBVKN5S17VpxSE=
+SHA1 (qca-2.0.3.tar.bz2) = nIaLBbgdzhcsQbgT3k3mhVQVTGA=
+SHA256 (qca-2.0.3.tar.bz2) = jaIMifOQlU/c/NPE3u83khPdta6da14MkX0j9eR0iV8=
+SIZE (qca-2.0.3.tar.bz2) = 4530731
UPDATE: security/qca2
Hi,
This update package qca2 to the latest release 2.0.3.
Tested on amd64.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/security/qca2/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile18 Oct 2010 21:41:47 - 1.5
+++ Makefile30 Nov 2011 23:41:33 -
@@ -3,14 +3,14 @@
COMMENT = Qt Cryptographic Architecture
SHARED_ONLY = Yes
-DISTNAME = qca-2.0.2
-PKGNAME = qca2-2.0.2
+DISTNAME = qca-2.0.3
+PKGNAME = qca2-2.0.3
CATEGORIES = security
SHARED_LIBS += qca 3.0
HOMEPAGE = http://delta.affinix.com/qca/
-# LGPL
+# LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
@@ -28,7 +28,6 @@ MAKE_FLAGS = LIBqca_VERSION=${LIBqca_VER
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}
USE_GROFF =Yes
-WANTLIB += c m
-WANTLIB += pthread stdc++
-
+WANTLIB += c m pthread stdc++
+
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/security/qca2/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 Jun 2010 00:35:42 - 1.2
+++ distinfo30 Nov 2011 23:41:33 -
@@ -1,5 +1,5 @@
-MD5 (qca-2.0.2.tar.bz2) = J+vfvZhp2Q2uB4pt7NAp9A==
-RMD160 (qca-2.0.2.tar.bz2) = GLD0l3CflwAidkSXeUZzXS7DxiM=
-SHA1 (qca-2.0.2.tar.bz2) = WkFMMpbNN9HsNBgr4NCJxQc/Vag=
-SHA256 (qca-2.0.2.tar.bz2) = SbVHRFAQSiKYdHwkPeFFGremru1L999D/6S3EoooN7g=
-SIZE (qca-2.0.2.tar.bz2) = 1937201
+MD5 (qca-2.0.3.tar.bz2) = /BW9TaIrgJbFH8/lLS+jCQ==
+RMD160 (qca-2.0.3.tar.bz2) = Mzz9zpH+367AnCBVKN5S17VpxSE=
+SHA1 (qca-2.0.3.tar.bz2) = nIaLBbgdzhcsQbgT3k3mhVQVTGA=
+SHA256 (qca-2.0.3.tar.bz2) = jaIMifOQlU/c/NPE3u83khPdta6da14MkX0j9eR0iV8=
+SIZE (qca-2.0.3.tar.bz2) = 4530731
Re: UPDATE: security/qca2
On Thu, Dec 01, 2011 at 05:43:36AM +0600, Alexandr Shadchin wrote:
Hi,
This update package qca2 to the latest release 2.0.3.
Tested on amd64.
Comments ? OK ?
Considering this port is not hooked to the build, I think it's pretty safe...
ok aja@
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/security/qca2/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 18 Oct 2010 21:41:47 - 1.5
+++ Makefile 30 Nov 2011 23:41:33 -
@@ -3,14 +3,14 @@
COMMENT =Qt Cryptographic Architecture
SHARED_ONLY =Yes
-DISTNAME = qca-2.0.2
-PKGNAME =qca2-2.0.2
+DISTNAME = qca-2.0.3
+PKGNAME =qca2-2.0.3
CATEGORIES = security
SHARED_LIBS += qca 3.0
HOMEPAGE = http://delta.affinix.com/qca/
-# LGPL
+# LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
@@ -28,7 +28,6 @@ MAKE_FLAGS =LIBqca_VERSION=${LIBqca_VER
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}
USE_GROFF = Yes
-WANTLIB += c m
-WANTLIB += pthread stdc++
-
+WANTLIB += c m pthread stdc++
+
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/security/qca2/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 22 Jun 2010 00:35:42 - 1.2
+++ distinfo 30 Nov 2011 23:41:33 -
@@ -1,5 +1,5 @@
-MD5 (qca-2.0.2.tar.bz2) = J+vfvZhp2Q2uB4pt7NAp9A==
-RMD160 (qca-2.0.2.tar.bz2) = GLD0l3CflwAidkSXeUZzXS7DxiM=
-SHA1 (qca-2.0.2.tar.bz2) = WkFMMpbNN9HsNBgr4NCJxQc/Vag=
-SHA256 (qca-2.0.2.tar.bz2) = SbVHRFAQSiKYdHwkPeFFGremru1L999D/6S3EoooN7g=
-SIZE (qca-2.0.2.tar.bz2) = 1937201
+MD5 (qca-2.0.3.tar.bz2) = /BW9TaIrgJbFH8/lLS+jCQ==
+RMD160 (qca-2.0.3.tar.bz2) = Mzz9zpH+367AnCBVKN5S17VpxSE=
+SHA1 (qca-2.0.3.tar.bz2) = nIaLBbgdzhcsQbgT3k3mhVQVTGA=
+SHA256 (qca-2.0.3.tar.bz2) = jaIMifOQlU/c/NPE3u83khPdta6da14MkX0j9eR0iV8=
+SIZE (qca-2.0.3.tar.bz2) = 4530731
--
Antoine
