Skip to contentSkip to conversation

package/strongswan: install dev headers

PATCH New Matt Weber 2 participants 6 messages Sep 20, 2018 – Oct 18, 2018

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH 1/2 package/strongswan: install dev headers

Adds '--with-dev-headers' configure option to install development headers into staging. The package provides these headers to enable linking against pluggins.

---
 package/strongswan/strongswan.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/strongswan/strongswan.mk +3 -1
index 5c597d5..f2e70a3 100644
@@ -10,6 +10,7 @@ STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_LICENSE = GPL-2.0+
 STRONGSWAN_LICENSE_FILES = COPYING LICENSE
 STRONGSWAN_DEPENDENCIES = host-pkgconf
+STRONGSWAN_INSTALL_STAGING=YES
 STRONGSWAN_CONF_OPTS += \
 	--without-lib-prefix \
 	--enable-led \
@@ -36,7 +37,8 @@ STRONGSWAN_CONF_OPTS += \
 	--enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \
 	--with-ipseclibdir=/usr/lib \
 	--with-plugindir=/usr/lib/ipsec/plugins \
-	--with-imcvdir=/usr/lib/ipsec/imcvs
+	--with-imcvdir=/usr/lib/ipsec/imcvs \
+	--with-dev-headers=/usr/include
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 STRONGSWAN_CONF_ENV += LIBS='-latomic'
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 package/strongswan: install libcharon vici header

- Adds patch to install 'libvici.h' if
--with-dev-headers is configured.

Strongswan currently installs development headers if '--with-dev-headers' is configured, except 'libvici.h'.

Original discussion and commit:
https://wiki.strongswan.org/projects/strongswan/repository/revisions/01c2b62362df88a03c53b748bb4e88631410f326

Upstream:
https://lists.strongswan.org/pipermail/dev/2018-September/001932.html

---
 ...1-libcharon-vici-install-libvici.h-header.patch | 45 ++++++++++++++++++++++
 package/strongswan/strongswan.mk                   |  3 ++
 2 files changed, 48 insertions(+)
 create mode 100644 package/strongswan/0001-libcharon-vici-install-libvici.h-header.patch
package/strongswan/0001-libcharon-vici-install-libvici.h-header.patch new file +45 -0
new file mode 100644
index 0000000..b518118
@@ -0,0 +1,45 @@
+From bf82805d9ecb232b7fda20899ea898c32a651833 Mon Sep 17 00:00:00 2001
+From: Paresh Chaudhary <[email protected]>
+Date: Tue, 18 Sep 2018 12:56:39 -0500
+Subject: [PATCH] libcharon/vici: install libvici.h header
+
+Install "libvici.h" if --with-dev-headers is configured.
+Strongswan currently installs other development headers using
+this method.
+
+The libvici plugin provides a stable low-level C API to
+exchange messages using the VICI protocol. This allows a user
+to write standalone applications based on 'libvici' functions,
+'libvici.h' header file is required to link all functions at
+compile time.
+
+Original discussion and commit:
+https://wiki.strongswan.org/projects/strongswan/repository/revisions/01c2b62362df88a03c53b748bb4e88631410f326
+
+Signed-off-by: Paresh Chaudhary <[email protected]>
+Signed-off-by: Matt Weber <[email protected]>
+---
+ src/libcharon/plugins/vici/Makefile.am | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/libcharon/plugins/vici/Makefile.am b/src/libcharon/plugins/vici/Makefile.am
+index e8bcdba..6b11ff1 100644
+--- a/src/libcharon/plugins/vici/Makefile.am
++++ b/src/libcharon/plugins/vici/Makefile.am
+@@ -42,7 +42,12 @@ libvici_la_SOURCES = \
+ 	vici_message.c vici_message.h \
+ 	vici_builder.c vici_builder.h \
+ 	vici_cert_info.h vici_cert_info.c \
+-	libvici.c libvici.h
++	libvici.c
++
++if USE_DEV_HEADERS
++vici_includedir = ${dev_headers}
++nobase_vici_include_HEADERS = libvici.h
++endif
+ 
+ libvici_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+ 
+-- 
+1.9.1
+
package/strongswan/strongswan.mk +3 -0
index f2e70a3..089099e 100644
@@ -40,6 +40,9 @@ STRONGSWAN_CONF_OPTS += \
 	--with-imcvdir=/usr/lib/ipsec/imcvs \
 	--with-dev-headers=/usr/include
 
+# 0001-libcharon-vici-install-libvici.h-header.patch
+STRONGSWAN_AUTORECONF = YES
+
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 STRONGSWAN_CONF_ENV += LIBS='-latomic'
 endif
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/2 package/strongswan: install libcharon vici header

Hello,

Quoted 8 lines · Matt Weber

- Adds patch to install 'libvici.h' if
--with-dev-headers is configured.

Strongswan currently installs development headers if '--with-dev-headers' is configured, except 'libvici.h'.

Original discussion and commit:
https://wiki.strongswan.org/projects/strongswan/repository/revisions/01c2b62362df88a03c53b748bb4e88631410f326

I don't understand: if there is an upstream commit for this that dates back from 2 years ago, why do we need to have this patch ?

Also you say "discussion", but I don't see any "discussion" at this URL.

And you resubmitted the same patch at
https://lists.strongswan.org/pipermail/dev/2018-September/001932.html.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/2 package/strongswan: install libcharon vici header

Thomas,

Quoted 7 lines · Thomas Petazzoni

Hello,

Quoted 3 lines · Matt Weber

- Adds patch to install 'libvici.h' if
--with-dev-headers is configured.

Quoted 8 lines
Quoted 5 lines

Strongswan currently installs development headers if '--with-dev-headers' is configured, except 'libvici.h'.

Original discussion and commit:
https://wiki.strongswan.org/projects/strongswan/repository/revisions/01c2b62362df88a03c53b748bb4e88631410f326

I don't understand: if there is an upstream commit for this that dates back from 2 years ago, why do we need to have this patch ?

That commit was never pulled into their master. It is currently hanging out on a libvici-dev-header branch.

Quoted 3 lines

Also you say "discussion", but I don't see any "discussion" at this URL.

Shoot, I meant to include this mailing list link. It doesn't directly tie back to the commit on that branch but provides discussion on the fix.
https://lists.strongswan.org/pipermail/users/2015-September/008777.html

I will respond to my upstream email and include these notes and branch name. I should have asked the question about why this has never been included in a release.

Matt

#4 lore raw

PATCH 2/2 package/strongswan: install libcharon vici header

Thomas,

Quoted 28 lines · Matthew Weber

Thomas,

Quoted 7 lines · Thomas Petazzoni

Hello,

Quoted 3 lines · Matt Weber

- Adds patch to install 'libvici.h' if
--with-dev-headers is configured.

Quoted 8 lines
Quoted 5 lines

Strongswan currently installs development headers if '--with-dev-headers' is configured, except 'libvici.h'.

Original discussion and commit:
https://wiki.strongswan.org/projects/strongswan/repository/revisions/01c2b62362df88a03c53b748bb4e88631410f326

I don't understand: if there is an upstream commit for this that dates back from 2 years ago, why do we need to have this patch ?

That commit was never pulled into their master. It is currently hanging out on a libvici-dev-header branch.

Quoted 3 lines

Also you say "discussion", but I don't see any "discussion" at this URL.

Quoted 9 lines

Shoot, I meant to include this mailing list link. It doesn't directly tie back to the commit on that branch but provides discussion on the fix.
https://lists.strongswan.org/pipermail/users/2015-September/008777.html

I will respond to my upstream email and include these notes and branch name. I should have asked the question about why this has never been included in a release.

Got some details back and turns out there is a API stable library we should be using for vici. We'll see if we need to add that library to Buildroot or if there are any other changes. I'll mark this current patch as rejected.
https://lists.strongswan.org/pipermail/dev/2018-October/001939.html

Matt

#5 lore raw

PATCH 1/2 package/strongswan: install dev headers

In reply to Matt Weber

Hello,

Quoted 15 lines · Matt Weber

Adds '--with-dev-headers' configure option to install development headers into staging. The package provides these headers to enable linking against pluggins.

---
 package/strongswan/strongswan.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/strongswan/strongswan.mk +0 -0
index 5c597d5..f2e70a3 100644

package/strongswan/strongswan.mk STRONGSWAN_SITE = http://download.strongswan.org · line 13

Quoted 4 lines
package/strongswan/strongswan.mk +1 -0
@@ -10,6 +10,7 @@ STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_LICENSE = GPL-2.0+
 STRONGSWAN_LICENSE_FILES = COPYING LICENSE
 STRONGSWAN_DEPENDENCIES = host-pkgconf
+STRONGSWAN_INSTALL_STAGING=YES

Spaces around the = sign. I've fixed this and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com