On Fri, Jul 28, 2023 at 12:18:16PM +0000, Klemens Nanni wrote:
> On Tue, Jul 25, 2023 at 05:06:35PM +0000, Klemens Nanni wrote:
> > On Tue, Jul 25, 2023 at 04:42:10PM +0000, Klemens Nanni wrote:
> > > After one of the recent www/iridum updates, the extension/native host now
> > > works there just like it does with www/chromium.
> > >
> > > Is this the right way to depend on either chromium or iridium?
> > > The way I understand this: use either iridium-* or chromium-* if
> > > installed,
> > > otherwise install www/chromium to satisfy the runtime dependency.
espie explained to me that this is how it is intended to work, but...
> >
> > Not in practise, as I can't uninstall chromium when iridium is
> > installed:
we have no code yet for these uninstall/replace paths, so using variant
dependencies, does not seem useful to me until these bits are implemented.
> >
> > $ pkg_info -S
> > Information for inst:web-eid-chrome-2.3.1p0
> >
> > Signature:
> >
> > web-eid-chrome-2.3.1p0,10,@chromium-115.0.5790.102,@web-eid-native-2.3.1p0
> >
> > Mark, I checked packages-specs(7) and looked for other ports with
> > variant dependencies, but they use the same stemA-*|stemB-*:pkgpathA
> > pattern... can you tell me how this is supposed to work?
>
> Alternatively, I can just drop the explicit run dependency stuff and
> expect users to install browsers themselves.
I'll go ahead with this diff, ignoring the dependencies for now.
>
>
> diff --git a/security/web-eid-app/Makefile b/security/web-eid-app/Makefile
> index e0802355391..95e6186326c 100644
> --- a/security/web-eid-app/Makefile
> +++ b/security/web-eid-app/Makefile
> @@ -1,5 +1,5 @@
> COMMENT-main = native messaging host for Web eID browser
> extension
> -COMMENT-chrome = chromium extension
> +COMMENT-chrome = Chromium extension
> CATEGORIES = security www
>
> # open "release tarballs with bundled git submodules"
> @@ -11,6 +11,7 @@ DISTFILES = ${GH_DISTFILE}
> PKGNAME-main = ${PKGNAME:S/app/native/}
> REVISION-main = 0
> PKGNAME-chrome = ${PKGNAME:S/app/chrome/}
> +REVISION-chrome = 0
>
> # TODO: firefox
> MULTI_PACKAGES = -main -chrome
> @@ -67,9 +68,7 @@ LIB_DEPENDS-main = ${MODQT_LIB_DEPENDS} \
> RUN_DEPENDS-main = devel/desktop-file-utils \
> x11/gtk+4,-guic
>
> -# TODO support www/iridium and www/ungoogled-chromium as well
> -RUN_DEPENDS-chrome = ${FULLPKGPATH-main} \
> - www/chromium
> +RUN_DEPENDS-chrome = ${FULLPKGPATH-main}
> LIB_DEPENDS-chrome = # empty
>
> # XXX pcsclite is detected with pkg-config, but its -I and -L are ignored
> diff --git a/security/web-eid-app/pkg/DESCR-chrome
> b/security/web-eid-app/pkg/DESCR-chrome
> index 5e214c12bc5..3233d177e58 100644
> --- a/security/web-eid-app/pkg/DESCR-chrome
> +++ b/security/web-eid-app/pkg/DESCR-chrome
> @@ -1 +1 @@
> -Configuration for the official Web eID extension for Chromium.
> +Configuration for the official Web eID extension for Chromium and Iridium.
> diff --git a/security/web-eid-app/pkg/PLIST-chrome
> b/security/web-eid-app/pkg/PLIST-chrome
> index b0465b00f2d..c684611aee3 100644
> --- a/security/web-eid-app/pkg/PLIST-chrome
> +++ b/security/web-eid-app/pkg/PLIST-chrome
> @@ -1,10 +1,18 @@
> -share/doc/pkg-readmes/web-eid-chrome
> +share/doc/pkg-readmes/${PKGSTEM}
> share/google-chrome/
> share/google-chrome/extensions/
> @sample ${SYSCONFDIR}/chromium/extensions/
> +@sample ${SYSCONFDIR}/iridium/extensions/
> +@sample ${SYSCONFDIR}/ungoogled-chromium/extensions/
> share/google-chrome/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
> @sample
> ${SYSCONFDIR}/chromium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
> +@sample
> ${SYSCONFDIR}/iridium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
> +@sample
> ${SYSCONFDIR}/ungoogled-chromium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
> share/web-eid/
> @sample ${SYSCONFDIR}/chromium/native-messaging-hosts/
> +@sample ${SYSCONFDIR}/iridium/native-messaging-hosts/
> +@sample ${SYSCONFDIR}/ungoogled-chromium/native-messaging-hosts/
> share/web-eid/eu.webeid.json
> @sample ${SYSCONFDIR}/chromium/native-messaging-hosts/eu.webeid.json
> +@sample ${SYSCONFDIR}/iridium/native-messaging-hosts/eu.webeid.json
> +@sample
> ${SYSCONFDIR}/ungoogled-chromium/native-messaging-hosts/eu.webeid.json
> diff --git a/security/web-eid-app/pkg/README-chrome
> b/security/web-eid-app/pkg/README-chrome
> index 16010e12dd3..5798a77d886 100644
> --- a/security/web-eid-app/pkg/README-chrome
> +++ b/security/web-eid-app/pkg/README-chrome
> @@ -4,7 +4,8 @@
>
> Install the official Web eID extension
>
> https://chrome.google.com/webstore/detail/ncibgoaomkmdpilpocfeponihegamlic
> -and add the following unveil rules to ${SYSCONFDIR}/chromium/unveil.main:
> +and add the following unveil rules to either of
> + ${SYSCONFDIR}/{chromium,iridium,ungoogled-chromium}/unveil.main:
>
> # native messaging host
> /usr/local/bin r
>
