diff mbox series

[1/1] package/network-manager-openvpn: new package

Message ID 8b51f7b227fd3cef7bc968a0c4f0eebd018d6655.camel@wiedemann-group.com
State Changes Requested
Headers show
Series [1/1] package/network-manager-openvpn: new package | expand

Commit Message

Michel Alex Jan. 17, 2020, 7:46 a.m. UTC 
From: Alex Michel <alex.michel@wiedemann-group.com>

This package provides OpenVPN plugin for network manager

Signed-off-by: Alex Michel <alex.michel@wiedemann-group.com>
---
 package/network-manager-openvpn/Config.in     |  5 ++++
 .../network-manager-openvpn.hash              |  4 ++++
 .../network-manager-openvpn.mk                | 23 +++++++++++++++++++
 package/network-manager/Config.in             |  3 +++
 4 files changed, 35 insertions(+)
 create mode 100644 package/network-manager-openvpn/Config.in
 create mode 100644 package/network-manager-openvpn/network-manager-openvpn.hash
 create mode 100644 package/network-manager-openvpn/network-manager-openvpn.mk

Comments

Peter Korsgaard Feb. 3, 2020, 2:38 p.m. UTC | #1 
>>>>> "Michel" == Michel Alex <Alex.Michel@wiedemann-group.com> writes:

Hello,

Sorry for the slow response!

 > From: Alex Michel <alex.michel@wiedemann-group.com>
 > This package provides OpenVPN plugin for network manager

 > Signed-off-by: Alex Michel <alex.michel@wiedemann-group.com>
 > ---
 >  package/network-manager-openvpn/Config.in     |  5 ++++
 >  .../network-manager-openvpn.hash              |  4 ++++
 >  .../network-manager-openvpn.mk                | 23 +++++++++++++++++++
 >  package/network-manager/Config.in             |  3 +++
 >  4 files changed, 35 insertions(+)
 >  create mode 100644 package/network-manager-openvpn/Config.in
 >  create mode 100644 package/network-manager-openvpn/network-manager-openvpn.hash
 >  create mode 100644 package/network-manager-openvpn/network-manager-openvpn.mk

 > diff --git a/package/network-manager-openvpn/Config.in b/package/network-manager-openvpn/Config.in
 > new file mode 100644
 > index 0000000000..8f13d78d48
 > --- /dev/null
 > +++ b/package/network-manager-openvpn/Config.in
 > @@ -0,0 +1,5 @@
 > +config BR2_PACKAGE_NETWORK_MANAGER_OPENVPN
 > +	bool "OpenVPN support"
 > +	depends on BR2_PACKAGE_NETWORK_MANAGER

What about openvpn? Looking at the code, it seems to execute
/usr/bin/openvpn - So it should depend on BR2_PACKAGE_OPENVPN


 > +	help
 > +	  This option enables OpenVPN plugin

It would be good with an upstream URL here.


 > +++ b/package/network-manager-openvpn/network-manager-openvpn.mk
 > @@ -0,0 +1,23 @@
 > +################################################################################
 > +#
 > +# network-manager-openvpn
 > +#
 > +################################################################################
 > +
 > +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8
 > +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).10
 > +NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz
 > +NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR)
 > +NETWORK_MANAGER_OPENVPN_INSTALL_STAGING = YES

Why? Does this provide a library?


 > +++ b/package/network-manager/Config.in
 > @@ -61,6 +61,9 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
 >  	help
 >  	  This option enables support for OpenVSwitch
 
 > +# source the OpenVPN plugin
 > +	source "package/network-manager-openvpn/Config.in"
 > +
 >  endif

Elsewhere in Buildroot we simple add such extra/optional components
after the main package instead of including them from the Config.in of
the main package. Can you please do that as well here?
Michel Alex Feb. 4, 2020, 8:33 a.m. UTC | #2 
This package provides OpenVPN plugin for network manager

Signed-off-by: Alex Michel <alex.michel@wiedemann-group.com>

---
Changes v1 -> v2:
  - add openvpn dependency (suggested by Peter Korsgaard)
  - removed INSTALL_STAGING from network-manager-openvpn.mk (suggested
by Peter Korsgaard)
  - provide component in the main package instead of including it from
the Config.in of the main package (suggested by Peter Korsgaard)
---
 .../network-manager-openvpn.hash              |  4 ++++
 .../network-manager-openvpn.mk                | 22 +++++++++++++++++++
 package/network-manager/Config.in             |  8 +++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/network-manager-openvpn/network-manager-
openvpn.hash
 create mode 100644 package/network-manager-openvpn/network-manager-
openvpn.mk

diff --git a/package/network-manager-openvpn/network-manager-
openvpn.hash b/package/network-manager-openvpn/network-manager-
openvpn.hash
new file mode 100644
index 0000000000..0c52fb8d13
--- /dev/null
+++ b/package/network-manager-openvpn/network-manager-openvpn.hash
@@ -0,0 +1,4 @@
+# From 
https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.sha256sum
+sha256
af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef  Netwo
rkManager-openvpn-1.8.10.tar.xz
+# Locally computed
+sha256
c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46  COPYI
NG
diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk 
b/package/network-manager-openvpn/network-manager-openvpn.mk
new file mode 100644
index 0000000000..522cd2413e
--- /dev/null
+++ b/package/network-manager-openvpn/network-manager-openvpn.mk
@@ -0,0 +1,22 @@
+######################################################################
##########
+#
+# network-manager-openvpn
+#
+######################################################################
##########
+
+NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8
+NETWORK_MANAGER_OPENVPN_VERSION =
$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).10
+NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-
$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz
+NETWORK_MANAGER_OPENVPN_SITE = 
https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR
)
+NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn
+NETWORK_MANAGER_OPENVPN_LICENSE = GPL-2.0+
+NETWORK_MANAGER_OPENVPN_LICENSE_FILES = COPYING
+
+NETWORK_MANAGER_OPENVPN_CONF_OPTS = \
+	--without-gnome
+
+define NETWORK_MANAGER_OPENVPN_USERS
+      nm-openvpn -1 nm-openvpn -1 * - - - Openvpn user
+endef
+
+$(eval $(autotools-package))
diff --git a/package/network-manager/Config.in b/package/network-
manager/Config.in
index e6a3f5f04f..a1df4e0431 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -61,6 +61,14 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
 	help
 	  This option enables support for OpenVSwitch
 
+config BR2_PACKAGE_NETWORK_MANAGER_OPENVPN
+	bool "OpenVPN support"
+	depends on BR2_PACKAGE_OPENVPN
+	help
+	  This option enables support for OpenVPN
+
+	  https://gitlab.gnome.org/GNOME/NetworkManager-openvpn
+
 endif
 
 comment "NetworkManager needs udev /dev management and a glibc
toolchain w/ headers >= 3.2, dynamic library, wchar, threads"
Peter Korsgaard Feb. 4, 2020, 9:44 a.m. UTC | #3 
>>>>> "Michel" == Michel Alex <Alex.Michel@wiedemann-group.com> writes:

 > This package provides OpenVPN plugin for network manager
 > Signed-off-by: Alex Michel <alex.michel@wiedemann-group.com>

 > ---
 > Changes v1 -> v2:
 >   - add openvpn dependency (suggested by Peter Korsgaard)
 >   - removed INSTALL_STAGING from network-manager-openvpn.mk (suggested
 > by Peter Korsgaard)
 >   - provide component in the main package instead of including it from
 > the Config.in of the main package (suggested by Peter Korsgaard)
 > ---
 >  .../network-manager-openvpn.hash              |  4 ++++
 >  .../network-manager-openvpn.mk                | 22 +++++++++++++++++++
 >  package/network-manager/Config.in             |  8 +++++++
 >  3 files changed, 34 insertions(+)
 >  create mode 100644 package/network-manager-openvpn/network-manager-
 > openvpn.hash
 >  create mode 100644 package/network-manager-openvpn/network-manager-
 > openvpn.mk

 > diff --git a/package/network-manager-openvpn/network-manager-
 > openvpn.hash b/package/network-manager-openvpn/network-manager-
 > openvpn.hash
 > new file mode 100644
 > index 0000000000..0c52fb8d13
 > --- /dev/null
 > +++ b/package/network-manager-openvpn/network-manager-openvpn.hash
 > @@ -0,0 +1,4 @@
 > +# From 
 > https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.sha256sum
 > +sha256
 > af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef  Netwo
 > rkManager-openvpn-1.8.10.tar.xz

Sorry, but the patch is badly wrapped by your mailer, so it cannot be
applied. Can you send it with git send-email? If that doesn't work, the
please attach it instead.
Michel Alex Feb. 4, 2020, 9:52 a.m. UTC | #4 
Peter,

I'm sorry for that, I must use evolution email client. Please use the
attached file.

Thanks,
Alex

On Tue, 2020-02-04 at 10:44 +0100, Peter Korsgaard wrote:
> > > > > > 
> 
> Sorry, but the patch is badly wrapped by your mailer, so it cannot be
> applied. Can you send it with git send-email? If that doesn't work,
> the
> please attach it instead.
>
Peter Korsgaard Feb. 4, 2020, 12:31 p.m. UTC | #5 
>>>>> "Michel" == Michel Alex <Alex.Michel@wiedemann-group.com> writes:

Hi,

 > Peter,
 > I'm sorry for that, I must use evolution email client. Please use the
 > attached file.

Thanks.

 > From 1367aeb2b1d91473be1e35ccb9660300f8bb2dc2 Mon Sep 17 00:00:00 2001
 > From: Alex Michel <alex.michel@wiedemann-group.com>
 > Date: Tue, 4 Feb 2020 09:04:38 +0100
 > Subject: [PATCH v2] package/network-manager-openvpn: new package

 > This package provides OpenVPN plugin for network manager

 > Signed-off-by: Alex Michel <alex.michel@wiedemann-group.com>
 > ---
 >  .../network-manager-openvpn.hash              |  4 ++++
 >  .../network-manager-openvpn.mk                | 22 +++++++++++++++++++
 >  package/network-manager/Config.in             |  8 +++++++
 >  3 files changed, 34 insertions(+)
 >  create mode 100644 package/network-manager-openvpn/network-manager-openvpn.hash
 >  create mode 100644 package/network-manager-openvpn/network-manager-openvpn.mk

 > diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash
 > new file mode 100644
 > index 0000000000..0c52fb8d13
 > --- /dev/null
 > +++ b/package/network-manager-openvpn/network-manager-openvpn.hash
 > @@ -0,0 +1,4 @@
 > +# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.sha256sum
 > +sha256 af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef  NetworkManager-openvpn-1.8.10.tar.xz
 > +# Locally computed
 > +sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46  COPYING
 > diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk b/package/network-manager-openvpn/network-manager-openvpn.mk
 > new file mode 100644
 > index 0000000000..522cd2413e
 > --- /dev/null
 > +++ b/package/network-manager-openvpn/network-manager-openvpn.mk
 > @@ -0,0 +1,22 @@
 > +################################################################################
 > +#
 > +# network-manager-openvpn
 > +#
 > +################################################################################
 > +
 > +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8
 > +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).10
 > +NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz
 > +NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR)
 > +NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn
 > +NETWORK_MANAGER_OPENVPN_LICENSE = GPL-2.0+
 > +NETWORK_MANAGER_OPENVPN_LICENSE_FILES = COPYING
 > +
 > +NETWORK_MANAGER_OPENVPN_CONF_OPTS = \
 > +	--without-gnome
 > +
 > +define NETWORK_MANAGER_OPENVPN_USERS
 > +      nm-openvpn -1 nm-openvpn -1 * - - - Openvpn user

./utils/check-package warned about the indentation of this
line. Consider running check-package on future patches before
submitting.


 > +endef
 > +
 > +$(eval $(autotools-package))
 > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
 > index e6a3f5f04f..a1df4e0431 100644
 > --- a/package/network-manager/Config.in
 > +++ b/package/network-manager/Config.in
 > @@ -61,6 +61,14 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
 >  	help
 >  	  This option enables support for OpenVSwitch
 
 > +config BR2_PACKAGE_NETWORK_MANAGER_OPENVPN
 > +	bool "OpenVPN support"
 > +	depends on BR2_PACKAGE_OPENVPN
 > +	help
 > +	  This option enables support for OpenVPN
 > +
 > +	  https://gitlab.gnome.org/GNOME/NetworkManager-openvpn
 > +

This was actually not what I meant. I have moved this into
package/network-manager-openvpn/Config.in and adjusted the text a bit.

You forgot to add an entry to our DEVELOPERS file, so I did that and
committed, thanks.
diff mbox series

Patch

diff --git a/package/network-manager-openvpn/Config.in b/package/network-manager-openvpn/Config.in
new file mode 100644
index 0000000000..8f13d78d48
--- /dev/null
+++ b/package/network-manager-openvpn/Config.in
@@ -0,0 +1,5 @@ 
+config BR2_PACKAGE_NETWORK_MANAGER_OPENVPN
+	bool "OpenVPN support"
+	depends on BR2_PACKAGE_NETWORK_MANAGER
+	help
+	  This option enables OpenVPN plugin
diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash
new file mode 100644
index 0000000000..0c52fb8d13
--- /dev/null
+++ b/package/network-manager-openvpn/network-manager-openvpn.hash
@@ -0,0 +1,4 @@ 
+# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.sha256sum
+sha256 af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef  NetworkManager-openvpn-1.8.10.tar.xz
+# Locally computed
+sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46  COPYING
diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk b/package/network-manager-openvpn/network-manager-openvpn.mk
new file mode 100644
index 0000000000..d5dd9be409
--- /dev/null
+++ b/package/network-manager-openvpn/network-manager-openvpn.mk
@@ -0,0 +1,23 @@ 
+################################################################################
+#
+# network-manager-openvpn
+#
+################################################################################
+
+NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8
+NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).10
+NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz
+NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR)
+NETWORK_MANAGER_OPENVPN_INSTALL_STAGING = YES
+NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager
+NETWORK_MANAGER_OPENVPN_LICENSE = GPL-2.0+
+NETWORK_MANAGER_OPENVPN_LICENSE_FILES = COPYING
+
+NETWORK_MANAGER_OPENVPN_CONF_OPTS = \
+	--without-gnome
+
+define NETWORK_MANAGER_OPENVPN_USERS
+      nm-openvpn -1 nm-openvpn -1 * - - - Openvpn user
+endef
+
+$(eval $(autotools-package))
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index e6a3f5f04f..932463faa3 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -61,6 +61,9 @@  config BR2_PACKAGE_NETWORK_MANAGER_OVS
 	help
 	  This option enables support for OpenVSwitch
 
+# source the OpenVPN plugin
+	source "package/network-manager-openvpn/Config.in"
+
 endif
 
 comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads"