Message ID | 9811803ba55043e0b0bf8a6451c40cf2@LysExc01.nanotronic.local |
---|---|
State | Changes Requested |
Headers | show |
Dear Wetzel Andreas, your patch cannot be applied because your email client converted tabs to spaces: ----------------------- Applying: openvpn: add option for --enable-password-save error: patch failed: package/openvpn/Config.in:27 error: package/openvpn/Config.in: patch does not apply ----------------------- Please send your patches using "git send-email". More comments below. Please scroll down. On 09/15/2015 10:38 AM, Wetzel Andreas wrote: > Added configuration option BR2_PACKAGE_OPENVPN_PWSAVE that > adds --enable-password-save to OPENVPN_CONF_OPTS if selected. > > Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch> > --- > package/openvpn/Config.in | 6 ++++++ > package/openvpn/openvpn.mk | 4 ++++ > 2 files changed, 10 insertions(+) > > diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in > index 5edb479..2b5962d 100644 > --- a/package/openvpn/Config.in > +++ b/package/openvpn/Config.in > @@ -27,6 +27,12 @@ config BR2_PACKAGE_OPENVPN_SMALL > You loose eurephia, debugging info, help messages and more. > It saves around 100 KiB in binary file size. > > +config BR2_PACKAGE_OPENVPN_PWSAVE > + bool "Allow passwords in files" > + help > + Allow --askpass and --auth-user-pass passwords to be > + read from a file. You can still put more words in the first line of this comment if your plan is to cut it to 72 or 80 characters. > + > choice > prompt "Crypto backend" > default BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL > diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk > index 1caa9a0..cdae3f0 100644 > --- a/package/openvpn/openvpn.mk > +++ b/package/openvpn/openvpn.mk > @@ -41,6 +41,10 @@ else > OPENVPN_CONF_OPTS += --disable-lzo > endif > > +ifeq ($(BR2_PACKAGE_OPENVPN_PWSAVE),y) > +OPENVPN_CONF_OPTS += --enable-password-save > +endif Perhaps adding an else clause to explicitly disable password save just in case upstream changes the default behavior in the future? Regards, Vincent. > + > ifeq ($(BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL),y) > OPENVPN_CONF_OPTS += --with-crypto-library=openssl > OPENVPN_DEPENDENCIES += openssl >
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 5edb479..2b5962d 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -27,6 +27,12 @@ config BR2_PACKAGE_OPENVPN_SMALL You loose eurephia, debugging info, help messages and more. It saves around 100 KiB in binary file size. +config BR2_PACKAGE_OPENVPN_PWSAVE + bool "Allow passwords in files" + help + Allow --askpass and --auth-user-pass passwords to be + read from a file. + choice prompt "Crypto backend" default BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 1caa9a0..cdae3f0 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -41,6 +41,10 @@ else OPENVPN_CONF_OPTS += --disable-lzo endif +ifeq ($(BR2_PACKAGE_OPENVPN_PWSAVE),y) +OPENVPN_CONF_OPTS += --enable-password-save +endif + ifeq ($(BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL),y) OPENVPN_CONF_OPTS += --with-crypto-library=openssl OPENVPN_DEPENDENCIES += openssl
Added configuration option BR2_PACKAGE_OPENVPN_PWSAVE that adds --enable-password-save to OPENVPN_CONF_OPTS if selected. Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch> --- package/openvpn/Config.in | 6 ++++++ package/openvpn/openvpn.mk | 4 ++++ 2 files changed, 10 insertions(+)