Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

strongswan: Add dependency to virtual package strongswan-mod-socket #16367

Merged
merged 1 commit into from
Aug 15, 2022

Conversation

pprindeville
Copy link
Member

Maintainer: me, @Thermi
Compile tested: x86_64, generic, HEAD (f038a16)
Run tested: same, installed on test VM

Description:

Originally by Noel Kuntze, and refined by Stijn Tintel.

stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 15, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 15, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
pprindeville pushed a commit to pprindeville/packages that referenced this pull request Aug 15, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
pprindeville pushed a commit to pprindeville/packages that referenced this pull request Aug 15, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 15, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
@stintel
Copy link
Member

stintel commented Aug 15, 2021

You need to pull in my latest changes. I was still building an image for runtime test, and was about to open another PR then. Unfortunately I now have issues building nettle, blocking my runtime test.

stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 15, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 15, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 16, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 16, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 18, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 18, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 18, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
stintel added a commit to stintel/openwrt-packages that referenced this pull request Aug 20, 2021
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
@CodeFetch
Copy link
Contributor

CodeFetch commented Aug 21, 2021

Now I have an issue here. mod-socket and mod-socket-dynamic are conflicting. When selecting both I needed to delete the default library to use the dynamic one. Thus mod-socket-dynamic needs to be created as an individual package and PROVIDE mod-socket...

Ah sorry. This issue seems to be fixed...

pprindeville pushed a commit to pprindeville/packages that referenced this pull request Feb 3, 2022
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
pprindeville pushed a commit to pprindeville/packages that referenced this pull request Feb 4, 2022
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
@pprindeville
Copy link
Member Author

@stintel @Thermi Can you please test this PR?

@pprindeville
Copy link
Member Author

@CodeFetch @Neustradamus Can someone please test this?

@Neustradamus
Copy link

There is a progress on this PR?

@pprindeville
Copy link
Member Author

There is a progress on this PR?

Still need it tested.

@Thermi
Copy link
Contributor

Thermi commented Aug 15, 2022

I'd say it works

@pprindeville pprindeville merged commit b02fea1 into openwrt:master Aug 15, 2022
@pprindeville pprindeville deleted the strongswan-mod-socket-dep branch August 15, 2022 19:32
@stintel
Copy link
Member

stintel commented Aug 16, 2022

Why was this merged, even though I said in #16373 it was no good? It causes the following problem:

tmp/.config-package.in:122354:error: recursive dependency detected!
tmp/.config-package.in:122354:  symbol PACKAGE_strongswan-default depends on PACKAGE_strongswan-mod-socket-default
tmp/.config-package.in:123534:  symbol PACKAGE_strongswan-mod-socket-default is selected by PACKAGE_strongswan-default

@Thermi
Copy link
Contributor

Thermi commented Aug 16, 2022 via email

@stintel
Copy link
Member

stintel commented Aug 16, 2022

That whole circular dependency stuff is a disaster. It's the main reason I gave up on #16373 as I could just select the proper package in my .config and get on with life.

@Thermi
Copy link
Contributor

Thermi commented Aug 16, 2022

I fixed the issue, see #19184

stokito pushed a commit to stokito/packages that referenced this pull request Dec 6, 2022
This a virtual package that is satisfied by either
strongswan-mod-socket-default or strongswan-mod-socket-dynamic, and is
required by the charon daemon. When neither of these packages is
installed, charon will not function.

Closes openwrt#16261, openwrt#16263 and openwrt#16367.

Signed-off-by: Noel Kuntze <noel.kuntze@thermi.consulting>
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants