On Sun, Aug 23, 2020 at 03:42:52PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <[email protected]>
> ---
>  rules/networkmanager-openvpn.make | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/rules/networkmanager-openvpn.make 
> b/rules/networkmanager-openvpn.make
> index 52dee7918..047ddefb5 100644
> --- a/rules/networkmanager-openvpn.make
> +++ b/rules/networkmanager-openvpn.make
> @@ -14,13 +14,17 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER_OPENVPN) += 
> networkmanager-openvpn
>  #
>  # Paths and names
>  #
> -NETWORKMANAGER_OPENVPN_VERSION       := 1.8.4
> -NETWORKMANAGER_OPENVPN_MD5   := db5bee5160da14ee76e9f8cf287ab9ec
> +NETWORKMANAGER_OPENVPN_VERSION       := 1.8.12
> +NETWORKMANAGER_OPENVPN_MD5   := e8b1210011ece18d0278310fbff45af5
>  NETWORKMANAGER_OPENVPN               := 
> NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
>  NETWORKMANAGER_OPENVPN_SUFFIX        := tar.xz
> -NETWORKMANAGER_OPENVPN_URL   := 
> http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.8/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
> +NETWORKMANAGER_OPENVPN_URL   := 
> https://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/$(basename 
> $(NETWORKMANAGER_OPENVPN_VERSION))/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
>  NETWORKMANAGER_OPENVPN_SOURCE        := 
> $(SRCDIR)/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
>  NETWORKMANAGER_OPENVPN_DIR   := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
> +NETWORKMANAGER_OPENVPN_LICENSE       := GPL-2.0-or-later
> +NETWORKMANAGER_OPENVPN_LICENSE_FILES := \
> +     file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c \
> +     
> file://src/nm-openvpn-service.c;startline=4;endline=16;md5=dc133184bee887456e34cd179e2e9549
>  
>  # 
> ----------------------------------------------------------------------------
>  # Prepare
> @@ -29,8 +33,8 @@ NETWORKMANAGER_OPENVPN_DIR  := 
> $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
>  #
>  # autoconf
>  #
> -NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
> -NETWORKMANAGER_OPENVPN_CONF_OPT := \
> +NETWORKMANAGER_OPENVPN_CONF_TOOL     := autoconf
> +NETWORKMANAGER_OPENVPN_CONF_OPT              := \
>       $(CROSS_AUTOCONF_USR) \
>       --enable-shared \
>       --disable-static \
> @@ -38,7 +42,7 @@ NETWORKMANAGER_OPENVPN_CONF_OPT := \
>       --disable-ld-gc \
>       --disable-lto \
>       --disable-nls \
> -     --enable-more-warnings \
> +     --disable-more-warnings \
>       --without-gnome \
>       --without-libnm-glib
>  
> @@ -55,10 +59,11 @@ $(STATEDIR)/networkmanager-openvpn.targetinstall:
>       @$(call install_fixup, networkmanager-openvpn,AUTHOR,"Ladislav Michl 
> <[email protected]>")
>       @$(call install_fixup, networkmanager-openvpn,DESCRIPTION, 
> "networkmanager-openvpn")
>  
> -     @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, 
> /etc/dbus-1/system.d/nm-openvpn-service.conf)

This file is now in /usr/share/dbus-1. I think it is still needed.

Michael

> -     @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, 
> /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
> -
> -     @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec/)
> +     @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> +             /usr/lib/NetworkManager/libnm-vpn-plugin-openvpn.so)
> +     @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> +             /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
> +     @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec)
>  
>       @$(call install_finish, networkmanager-openvpn)
>  
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> [email protected]
> To unsubscribe, send a mail with subject "unsubscribe" to 
> [email protected]
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to 
[email protected]

Reply via email to