From b544d68bf6b4e2254e161b86f2d45301194618b4 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 16 Jan 2019 11:20:40 -0200 Subject: [PATCH] NetworkManager: Move dirs that do not live in tmpfs to make_dirs= @Cogitri --- srcpkgs/NetworkManager/files/NetworkManager/run | 5 ----- srcpkgs/NetworkManager/template | 9 ++++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/NetworkManager/files/NetworkManager/run b/srcpkgs/NetworkManager/files/NetworkManager/run index 3b4d79cb297..2df342d579b 100755 --- a/srcpkgs/NetworkManager/files/NetworkManager/run +++ b/srcpkgs/NetworkManager/files/NetworkManager/run @@ -1,8 +1,3 @@ #!/bin/sh sv check dbus >/dev/null || exit 1 -# Create required dirs -[ ! -d /etc/NetworkManager/dispatcher.d ] && mkdir -m0755 -p /etc/NetworkManager/dispatcher.d -[ ! -d /etc/NetworkManager/VPN ] && mkdir -m0755 -p /etc/NetworkManager/VPN -[ ! -d /etc/NetworkManager/system-connections ] && mkdir -m0755 -p /etc/NetworkManager/system-connections -[ ! -d /var/lib/NetworkManager ] && mkdir -m0700 -p /var/lib/NetworkManager exec NetworkManager -n > /dev/null 2>&1 diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index c7b44467cdf..5e246df1582 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager version=1.14.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no @@ -22,8 +22,8 @@ configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_debian_version=no" short_desc="Network Management daemon" maintainer="Rasmus Thomsen " -homepage="https://wiki.gnome.org/Projects/NetworkManager" license="GPL-2.0-or-later" +homepage="https://wiki.gnome.org/Projects/NetworkManager" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18 @@ -45,10 +45,13 @@ depends="dbus dhclient iproute2 openresolv wpa_supplicant" lib32disabled=yes conf_files="/etc/${pkgname}/${pkgname}.conf" make_dirs=" - /etc/NetworkManager/system-connections 0750 root root + /etc/NetworkManager/system-connections 0755 root root /etc/NetworkManager/dispatcher.d/pre-up.d 0750 root root /etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root + /etc/NetworkManager/VPN 0755 root root + /var/lib/NetworkManager 0755 root root " + case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS+=" -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv"