aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-07-17 20:07:06 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-07-17 21:58:45 +0000
commit4279fcd77da6f1b9040dfef61459f9f3b9382641 (patch)
tree38ef0f5096fd277f0f370aa652981671b9f2d9f2
parent7703ba71ce142f35fe8107627cd176f15ddccd50 (diff)
downloadaports-4279fcd77da6f1b9040dfef61459f9f3b9382641.tar.gz
aports-4279fcd77da6f1b9040dfef61459f9f3b9382641.tar.bz2
aports-4279fcd77da6f1b9040dfef61459f9f3b9382641.tar.xz
community/networkmanager: upgrade to 1.26.0
-rw-r--r--community/networkmanager/APKBUILD10
-rw-r--r--community/networkmanager/musl-fix-includes.patch10
-rw-r--r--community/networkmanager/py3.patch10
3 files changed, 15 insertions, 15 deletions
diff --git a/community/networkmanager/APKBUILD b/community/networkmanager/APKBUILD
index 8ae04a2b5d..2c7ea58449 100644
--- a/community/networkmanager/APKBUILD
+++ b/community/networkmanager/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=networkmanager
-pkgver=1.24.2
-pkgrel=1
+pkgver=1.26.0
+pkgrel=0
pkgdesc="Network Management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
arch="all"
@@ -122,14 +122,14 @@ bashcomp() {
amove usr/share/bash-completion
}
-sha512sums="34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e0280631ecc38d335871a3ee3483b338106b3a513d46a6cafdf61849027fe923 NetworkManager-1.24.2.tar.xz
+sha512sums="46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d NetworkManager-1.26.0.tar.xz
a6e507260e2ceffad4cacb2b49a1d4f6b933e5ae8bc50c1bd56f828298c5dc8d9d17aa4be766faeacefbe3c6c0c748e4ef499a55bb5ee40f0f04bbf766fbbc82 networkmanager.conf
5ac6d11b588c479de9c7e1fef79ed0a2c04dc159a2173636a6a77a2867c839cc1609860756109e9e794f23a02238a6d94834d8fb6fcb81a6be3ef1dbf4a34e6f networkmanager.initd
9820ed2ead0af689644842de57657bb10330a1eaff0e85b21ae9913f55e399e47d8b41b0a12956f30de80272b4424c6e55f33acbc88e156879003a260bf576f6 networkmanager.rules
9d1a9185b0b50f677a4173a8b67e808ba36971111165ae446e9a15b5c7adcc8cc6d44fa7bddac05762c50d80b04818a483756eaf2aaefe0162e1f37cd070fca4 musl-basic.patch
095c1d944f3274ba31435cd1af8e2affb4187bdd921a0cc0c185b59810b73cfab7919b5f551bab3d9e4644fbee8f9ac017b4c5d69a771fb68319cbefa37c71a3 musl-network-support.patch
-aa756d7d54aceb213a05746d43367ed1871782f4b9678f3f51b302f4f9c7a4384dd3f6d3a5a4a0106c741faf2b4c13964a57c5aa0c5d0222f653a4d51422857a musl-fix-includes.patch
+6bbd69084c8ad6171a7d230cbb814cef17c9b85764e94485defa5c223eda10189fa3c9ebbfabc7fc719a5ee8d687d6ebd5a130b4208040cb3b6ea8605101c0bf musl-fix-includes.patch
b5cd94928ca3ba1fb71aec28d9ff66f319f6d23131e02c90f1dfbfaf16c537935228a9981c95f29ffb74e91752a17801c94d09ca57b7ba98028262b9e8e5d322 musl-process-util.patch
634377674691b52da80ca4c445a727d39cd40269f7deef0d3ccc1e1041cc262e8bc1423200e9a2b0cf1804e9950059ebbbc827f1200c6a97c58bc76080a6d6d2 musl-compar.patch
342fb3eef0e7057b6d8f1a00687af17dc633387d8a25d475e3e9c8de5712221eec8ada634a189e3458dcbb12b20625b99b552acda3927b5baa61b960ce5740eb musl-no-drand.patch
-929add0500198f5bdeaf06daee34c116155ee7182337d5f104693263263871c108eb5278ef748834408803168636e9ece6e39047bf82160c211da47b34e8ca6b py3.patch"
+8f7bb0128881cd281f4f9b2335d9788cde715d9fc29c295bad234b97a2df9e5ed99061da4806702d9ab8aa163711ffa283e82216ea8d714bb54d2b37aa2607cb py3.patch"
diff --git a/community/networkmanager/musl-fix-includes.patch b/community/networkmanager/musl-fix-includes.patch
index 3e3da79bb3..98f8bc286e 100644
--- a/community/networkmanager/musl-fix-includes.patch
+++ b/community/networkmanager/musl-fix-includes.patch
@@ -1,3 +1,13 @@
+--- a/src/NetworkManagerUtils.c 2020-07-17 20:05:45.382005791 +0200
++++ b/src/NetworkManagerUtils.c 2020-07-17 20:05:39.721463542 +0200
+@@ -4,6 +4,7 @@
+ * Copyright (C) 2005 - 2008 Novell, Inc.
+ */
+
++#include <netinet/if_ether.h>
+ #include "nm-default.h"
+
+ #include "NetworkManagerUtils.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index e7a4a05..7578abf 100644
--- a/src/devices/nm-device.c
diff --git a/community/networkmanager/py3.patch b/community/networkmanager/py3.patch
index 4efcbc1dde..d0fb1ca229 100644
--- a/community/networkmanager/py3.patch
+++ b/community/networkmanager/py3.patch
@@ -308,16 +308,6 @@ index 9bba619..8893f10 100755
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2014 Red Hat, Inc.
-diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
-index 025689e..eb17f22 100755
---- a/libnm/generate-setting-docs.py
-+++ b/libnm/generate-setting-docs.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: LGPL-2.1+
- #
- # Copyright (C) 2009 - 2017 Red Hat, Inc.
diff --git a/src/tests/test-secret-agent.py b/src/tests/test-secret-agent.py
index d8cabc6..5f0ed5e 100755
--- a/src/tests/test-secret-agent.py