diff options
author | Treeve Jelbert | 2022-10-07 15:40:28 +0200 |
---|---|---|
committer | Treeve Jelbert | 2022-10-07 15:40:28 +0200 |
commit | 46b11e6eb8c663f37e15a584d89f3bfd4546c170 (patch) | |
tree | f85d3fafa3a593d3cf9ebf875e56cc7bd08c4dc5 /net | |
parent | 91527a5fe6aaa8a07021e6fc9c3eff608159bd26 (diff) |
network-manager: => 1.40.0
Diffstat (limited to 'net')
-rwxr-xr-x | net/network-manager/BUILD | 18 | ||||
-rwxr-xr-x | net/network-manager/CONFIGURE | 8 | ||||
-rwxr-xr-x | net/network-manager/DEPENDS | 88 | ||||
-rwxr-xr-x | net/network-manager/DETAILS | 10 | ||||
-rw-r--r-- | net/network-manager/HISTORY | 13 | ||||
-rw-r--r-- | net/network-manager/NetworkManager-0.9.6.4.tar.xz.sig | bin | 287 -> 0 bytes | |||
-rwxr-xr-x | net/network-manager/PRE_BUILD | 10 |
7 files changed, 79 insertions, 68 deletions
diff --git a/net/network-manager/BUILD b/net/network-manager/BUILD index 37c2781b2c..cbdf463b06 100755 --- a/net/network-manager/BUILD +++ b/net/network-manager/BUILD @@ -1,2 +1,18 @@ -OPTS=" $OPTS --with-distro=debian" +OPTS+=" tests=no" +#OPTS+=" wext=false" #obsolete +OPTS+=" qt=false" +#OPTS+=" $NM_DOCS" +if is_depends_enabled $SPELL systemd; then + OPTS+=" session_tracking=systemd" +else + OPTS+=" session_tracking=elogind" + OPTS+=" suspend_resume=elogind" + OPTS+=" systemd_journal=false" + OPTS+=" systemdsystemunitdir=no" +fi && +if is_depends_enabled $SPELL iwd; then + config_wifi_backend_default=iwd +else + config_wifi_backend_default=wpa_supplicant +fi && default_build diff --git a/net/network-manager/CONFIGURE b/net/network-manager/CONFIGURE index cc3397a893..e94900abca 100755 --- a/net/network-manager/CONFIGURE +++ b/net/network-manager/CONFIGURE @@ -1,5 +1,9 @@ +source $GRIMOIRE/MESON_CONFIGURE && + config_query_option NETWORK_MANAGER_RESOLV "Enable resolv.conf support?" y \ - "--with-resolvconf=yes" "--with-resolvconf=no" && + with-resolvconf={yes,no} && config_query_list NETWORK_MANAGER_CRYPTO "Which cryptography library to use?" \ - nss gnutls + nss gnutls + +#config_query_option NM_DOCS "build docs?" n docs={true,false} diff --git a/net/network-manager/DEPENDS b/net/network-manager/DEPENDS index ed1ae72e69..14d124d2e1 100755 --- a/net/network-manager/DEPENDS +++ b/net/network-manager/DEPENDS @@ -1,3 +1,5 @@ +source $GRIMOIRE/MESON_DEPENDS && + depends dbus && depends dbus-glib && depends GETTEXT && @@ -9,69 +11,55 @@ depends libndp && depends readline && depends util-linux && depends DEVICE-MANAGER && -if is_depends_enabled $SPELL DEVICE-MANAGER; then - depends libgudev +if !is_depends_enabled $SPELL systemd; then + depends elogind fi && +depends libgudev && -depends $NETWORK_MANAGER_CRYPTO "--with-crypto=$NETWORK_MANAGER_CRYPTO" && +depends $NETWORK_MANAGER_CRYPTO crypto=$NETWORK_MANAGER_CRYPTO && -optional_depends newt \ - '--with-nmtui=yes' \ - '--with-nmtui=no' \ - 'Build nmtui' && +optional_depends newt nmtui={true,false} 'Build nmtui' && -optional_depends libsoup \ - '--with-libsoup=yes' \ - '--with-libsoup=no' \ - 'SOAP support' && +optional_depends policykit polkit={true,false} "Enable PolicyKit support?" && -optional_depends gtk-doc \ - "--enable-gtk-doc" \ - "--disable-gtk-doc" \ - "use gtk-doc to build documentation" +optional_depends CONSOLE-MANAGER session_tracking_consolekit={true,false} \ + "Enable ConsoleKit session tracking support?" && +#optional_depends dhcpcd "config_dhcp_default=dhcpcd dhcpcd=yes" dhcpcd='' \ +# "Enable dhcpcd support?" && -optional_depends policykit \ - "--enable-polkit=yes" \ - "--enable-polkit=disabled" \ - "Enable PolicyKit support?" && +optional_depends ppp ppp={true,false} "enable PPP/PPPoE support?" && -optional_depends CONSOLE-MANAGER \ - "--with-session-tracking=ck" \ - "--with-session-tracking=none" \ - "Enable ConsoleKit session tracking support?" && +optional_depends linux-firmware "kernel-firmware-dir=/lib/firmware" \ + "" "Use Linux Firmware?" && -optional_depends dnsmasq \ - "--with-dnsmasq" \ - "" \ - "DNS proxy with integrated DHCP" && +optional_depends IFUPDOWN ifupdown={true,false} "Network activation" && -optional_depends dhcpcd \ - "--with-dhcpcd=yes --with-dhclient=no" \ - "--with-dhcpcd=no --with-dhclient=no" \ - "Enable dhcpcd 4.x support?" && +optional_depends iwd iwd={true,false} 'enable iwd support' && +if !is_depends_enabled $SPELL iwd;then +# optional_depends wpa_supplicant '' '' '' + depends wpa_supplicant +fi && -optional_depends ppp \ - "--enable-ppp" \ - "--disable-ppp" \ - "enable PPP/PPPoE support?" && +optional_depends modemmanager modem_manager={true,false} 'Modem Manager support' && +optional_depends audit libaudit={yes,no} 'audit support' && +optional_depends jansson ovs={true,false} 'Open vSwitch integration' && +optional_depends libselinux selinux={true,false} 'security enhaced linux' -optional_depends linux-firmware \ - "--with-kernel-firmware-dir=/lib/firmware" \ - "" "Use Linux Firmware?" && +optional_depends gtk-doc docs={true,false} 'build documentation and manpages' && +optional_depends vala vapi={true,false} 'build api docs' +if is_depends_enabled $SPELL vala || + is_depends_enabled $SPELL gtk-doc ;then + depends gobject-introspection introspection=true +else + optional_depends gobject-introspection introspection={true,false} "introspection support" +fi +if(false);then optional_depends upower \ - "--with-suspend-resume=upower" \ - "" \ "Suspend/Resume support" && -optional_depends IFUPDOWN \ - "--enable-ifupdown" \ - "" \ - "Network activation" && - -optional_depends BLUEZ \ - "" \ - "" \ - "Bluetooth support" && -runtime_depends wpa_supplicant +optional_depends dnsmasq \ + "DNS proxy with integrated DHCP" +fi +#optional_depends diff --git a/net/network-manager/DETAILS b/net/network-manager/DETAILS index b194577e8a..939814339e 100755 --- a/net/network-manager/DETAILS +++ b/net/network-manager/DETAILS @@ -1,3 +1,4 @@ +source $GRIMOIRE/MESON_FUNCTIONS SPELL=network-manager if [[ $NETWORK_MANAGER_SCM == y ]]; then if [[ $NETWORK_MANAGER_SCM_AUTOUPDATE == y ]]; then @@ -11,12 +12,11 @@ if [[ $NETWORK_MANAGER_SCM == y ]]; then SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-git" FORCE_DOWNLOAD=1 else - VERSION=1.0.0 - SOURCE_HASH=sha512:7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e - BRANCH=${VERSION:0:3} + VERSION=1.40.0 + SOURCE_HASH=sha512:2e51a70a6ef5c0c7ba9af400b9af8e6956c9a23dd93566a7c07efe531bb6253bf3544ac2a61e147fc17145eaaeeb25d7e58c1cb7daf7e7bf7b8ae6742545417e + BRANCH=${VERSION:0:4} SOURCE="NetworkManager-${VERSION}.tar.xz" - SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/${BRANCH}/${SOURCE} -# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH" + SOURCE_URL[0]=https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/${BRANCH}/${SOURCE} SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-${VERSION}" fi PATCHLEVEL=1 diff --git a/net/network-manager/HISTORY b/net/network-manager/HISTORY index c09d7b268a..c894410d81 100644 --- a/net/network-manager/HISTORY +++ b/net/network-manager/HISTORY @@ -1,3 +1,16 @@ +2022-08-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.40.0 + +2022-08-14 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.38.4 + +2022-08-07 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.38.2 + use meson build + * DEPENDS: adapt to meson, lots of changes + * BUILD CONFIGURE: adjust + * PRE_BUILD: deleted + 2021-08-01 Florian Franzmann <bwlf@bandrate.org> * DEPENDS: depend on IFUPDOWN instead of ifupdown * DETAILS: PATCHLEVEL++ diff --git a/net/network-manager/NetworkManager-0.9.6.4.tar.xz.sig b/net/network-manager/NetworkManager-0.9.6.4.tar.xz.sig Binary files differdeleted file mode 100644 index 86fc905faa..0000000000 --- a/net/network-manager/NetworkManager-0.9.6.4.tar.xz.sig +++ /dev/null diff --git a/net/network-manager/PRE_BUILD b/net/network-manager/PRE_BUILD deleted file mode 100755 index d15ae714bf..0000000000 --- a/net/network-manager/PRE_BUILD +++ /dev/null @@ -1,10 +0,0 @@ -default_pre_build && - -if [[ "$NETWORK_MANAGER_SCM" == "y" ]]; then - cd $SOURCE_DIRECTORY && - sedit 's@^ *\./configure@true@' autogen.sh && - ./autogen.sh -fi && - -# Don't error on warnings, such fail -sedit 's:-Werror::g' "${SOURCE_DIRECTORY}"/configure |