From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20200828145947.GB9815@lenoch>
MIME-Version: 1.0
Message-Id: <E1kPiAx-0004iS-AV@dude02.hi.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Tue, 06 Oct 2020 10:18:23 +0200
Subject: Re: [ptxdist] [APPLIED] networkmanager-openvpn: version bump 1.8.4
 -> 1.8.12
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de

Thanks, applied as 787b94ab5c89204ec2f34e24290d4f2f57d74c4d.

Michael

[sent from post-receive hook]

On Tue, 06 Oct 2020 10:18:23 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200828145947.GB9815@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/networkmanager-openvpn.make b/rules/networkmanager-openvpn.make
> index 52dee7918e90..3bea763792f6 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,13 @@ $(STATEDIR)/networkmanager-openvpn.targetinstall:
>  	@$(call install_fixup, networkmanager-openvpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
>  	@$(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)
> -	@$(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_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> +		/usr/share/dbus-1/system.d/nm-openvpn-service.conf)
>  
>  	@$(call install_finish, networkmanager-openvpn)
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de