From 85586ffbed39a0919e915fb65644f9a3b5267e46 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 14 May 2019 18:55:35 +0200 Subject: [PATCH] temp/networkmanager: remove (exists in upstream again) --- temp/networkmanager/APKBUILD | 118 ------------------ temp/networkmanager/fix-ppc64le-build.patch | 12 -- temp/networkmanager/musl-basic.patch | 46 ------- temp/networkmanager/musl-compar.patch | 18 --- temp/networkmanager/musl-fix-includes.patch | 52 -------- .../musl-has-not-secure-getenv.patch | 13 -- .../networkmanager/musl-network-support.patch | 42 ------- temp/networkmanager/musl-process-util.patch | 40 ------ temp/networkmanager/networkmanager.conf | 2 - temp/networkmanager/networkmanager.initd | 24 ---- .../networkmanager/networkmanager.pre-install | 9 -- .../networkmanager/networkmanager.pre-upgrade | 1 - temp/networkmanager/networkmanager.rules | 9 -- 13 files changed, 386 deletions(-) delete mode 100644 temp/networkmanager/APKBUILD delete mode 100644 temp/networkmanager/fix-ppc64le-build.patch delete mode 100644 temp/networkmanager/musl-basic.patch delete mode 100644 temp/networkmanager/musl-compar.patch delete mode 100644 temp/networkmanager/musl-fix-includes.patch delete mode 100644 temp/networkmanager/musl-has-not-secure-getenv.patch delete mode 100644 temp/networkmanager/musl-network-support.patch delete mode 100644 temp/networkmanager/musl-process-util.patch delete mode 100644 temp/networkmanager/networkmanager.conf delete mode 100644 temp/networkmanager/networkmanager.initd delete mode 100644 temp/networkmanager/networkmanager.pre-install delete mode 120000 temp/networkmanager/networkmanager.pre-upgrade delete mode 100644 temp/networkmanager/networkmanager.rules diff --git a/temp/networkmanager/APKBUILD b/temp/networkmanager/APKBUILD deleted file mode 100644 index b28470780..000000000 --- a/temp/networkmanager/APKBUILD +++ /dev/null @@ -1,118 +0,0 @@ -# Forked from Alpine, because networkmanager is currently missing in armhf, armv7 (#244) -pkgname=networkmanager -pkgver=1.18.1 -pkgrel=1 -pkgdesc="Network Management daemon" -url="https://wiki.gnome.org/Projects/NetworkManager" -arch="all" -license="GPL-2.0-or-later" -depends="dhcpcd iptables dbus" -install="$pkgname.pre-install $pkgname.pre-upgrade" -makedepends="$depends_dev - curl-dev - dbus-glib-dev - eudev-dev - libgudev-dev - gobject-introspection-dev - intltool - libndp-dev - libnl3-dev - libsoup-dev - libteam-dev - linux-headers - modemmanager-dev - newt-dev - nss-dev - polkit-dev - ppp-dev - readline-dev - util-linux-dev - jansson-dev - vala - meson - py-gobject3 - libpsl-dev - python2 - " -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" -source="https://download.gnome.org/sources/NetworkManager/${pkgver:0:4}/NetworkManager-$pkgver.tar.xz - $pkgname.conf - $pkgname.initd - $pkgname.rules - musl-basic.patch - musl-network-support.patch - musl-fix-includes.patch - musl-process-util.patch - musl-has-not-secure-getenv.patch - musl-compar.patch - fix-ppc64le-build.patch - " -options="!check" # fail to compile on musl - -builddir="$srcdir"/NetworkManager-$pkgver - -build() { - meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - -Dsystemdsystemunitdir=no \ - -Dudev_dir=/lib/udev \ - -Diptables=/sbin/iptables \ - -Ddnsmasq=/usr/sbin/dnsmasq \ - -Dmodify_system=true \ - -Dselinux=false \ - -Dsystemd_journal=false \ - -Dlibaudit=no \ - -Diwd=true \ - -Dpppd=/usr/sbin/pppd \ - -Dconfig_plugins_default=ifupdown \ - -Difupdown=true \ - -Ddhcpcd=true \ - -Dconfig_dhcp_default=dhcpcd \ - -Dvapi=true \ - -Dtests=no \ - -Dlibnm_glib=true \ - -Dpolkit_agent=true \ - -Dsession_tracking=no \ - -Dqt=false \ - . output - ninja -C output -} - -check() { - ninja -C output test -} - -package() { - DESTDIR="$pkgdir" ninja -C output install - - install -m755 -D "$srcdir"/networkmanager.initd "$pkgdir"/etc/init.d/networkmanager - install -m644 -D "$srcdir/$pkgname.conf" "$pkgdir"/etc/NetworkManager/NetworkManager.conf - # allow plugdev users to modify connections - install -m644 -D "$srcdir/$pkgname.rules" \ - "$pkgdir/usr/share/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - mkdir -p "$pkgdir/usr/share/apk-tools/$pkgname" - # post-install message - mv "$pkgdir/usr/share/doc/NetworkManager" "$pkgdir/usr/share/doc/$pkgname" - cat > $pkgdir/usr/share/doc/$pkgname/README.alpine < - -+#ifndef RTLD_DEEPBIND -+#define RTLD_DEEPBIND 0 -+#endif -+ - void *_nm_jansson_json_object_iter_value; - void *_nm_jansson_json_object_key_to_iter; - void *_nm_jansson_json_integer; -diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h -index c3b9448..e80a938 100644 ---- a/shared/systemd/src/basic/stdio-util.h -+++ b/shared/systemd/src/basic/stdio-util.h -@@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - #pragma once - -+#if defined(__GLIBC__) - #include -+#endif - #include - #include - #include -diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h -index 25e6ab8..7967e8a 100644 ---- a/shared/systemd/src/basic/util.h -+++ b/shared/systemd/src/basic/util.h -@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) { - #endif - } - -+#if !defined(__GLIBC__) -+typedef int (*__compar_fn_t) (const void*, const void*); -+typedef __compar_fn_t comparison_fn_t; -+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); -+#endif -+ - static inline unsigned u32ctz(uint32_t n) { - #if __SIZEOF_INT__ == 4 - return n != 0 ? __builtin_ctz(n) : 32; diff --git a/temp/networkmanager/musl-compar.patch b/temp/networkmanager/musl-compar.patch deleted file mode 100644 index 1b1de2f28..000000000 --- a/temp/networkmanager/musl-compar.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h -index e029f86..935f136 100644 ---- a/shared/systemd/src/basic/sort-util.h -+++ b/shared/systemd/src/basic/sort-util.h -@@ -5,6 +5,13 @@ - - #include "macro.h" - -+#ifndef __COMPAR_FN_T -+# define __COMPAR_FN_T -+typedef int (*__compar_fn_t) (const void *, const void *); -+typedef __compar_fn_t comparison_fn_t; -+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); -+#endif -+ - void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, - __compar_d_fn_t compar, void *arg); - diff --git a/temp/networkmanager/musl-fix-includes.patch b/temp/networkmanager/musl-fix-includes.patch deleted file mode 100644 index e68925372..000000000 --- a/temp/networkmanager/musl-fix-includes.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index bd4fbcc..cb5436f 100644 ---- a/src/devices/nm-device.c -+++ b/src/devices/nm-device.c -@@ -32,7 +32,11 @@ - #include - #include - #include -+#if defined(__GLIBC__) - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 40e068a..aa57ce8 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "nm-glib-aux/nm-c-list.h" - -diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index d4b0115..c934f10 100644 ---- a/src/platform/nm-linux-platform.c -+++ b/src/platform/nm-linux-platform.c -@@ -20,6 +20,7 @@ - #include "nm-default.h" - - #include "nm-linux-platform.h" -+#include "wpan/nm-wpan-utils.h" - - #include - #include -@@ -28,7 +29,11 @@ - #include - #include - #include -+#if defined(__GLIBC__) - #include -+#else -+#include -+#endif - #include - #include - #include diff --git a/temp/networkmanager/musl-has-not-secure-getenv.patch b/temp/networkmanager/musl-has-not-secure-getenv.patch deleted file mode 100644 index 37883e272..000000000 --- a/temp/networkmanager/musl-has-not-secure-getenv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -index 8c07c53..d043afc 100644 ---- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -+++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -@@ -65,7 +65,7 @@ - # ifdef HAVE___SECURE_GETENV - # define secure_getenv __secure_getenv - # else --# error neither secure_getenv nor __secure_getenv is available -+# define secure_getenv getenv - # endif - #endif - diff --git a/temp/networkmanager/musl-network-support.patch b/temp/networkmanager/musl-network-support.patch deleted file mode 100644 index 36536df67..000000000 --- a/temp/networkmanager/musl-network-support.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/libnm-core/nm-utils.h -+++ b/libnm-core/nm-utils.h -@@ -30,7 +30,11 @@ - #include - - /* For ETH_ALEN and INFINIBAND_ALEN */ -+#if defined(__GLIBC__) - #include -+#else -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - #include - - #include "nm-core-enum-types.h" ---- a/src/platform/wifi/nm-wifi-utils.h -+++ b/src/platform/wifi/nm-wifi-utils.h -@@ -22,7 +22,11 @@ - #ifndef __WIFI_UTILS_H__ - #define __WIFI_UTILS_H__ - -+#if defined(__GLIBC__) - #include -+#else /* musl libc */ -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - - #include "nm-dbus-interface.h" - ---- a/shared/systemd/src/basic/socket-util.h 2019-03-16 15:41:33.287235649 +0100 -+++ b/shared/systemd/src/basic/socket-util.h 2019-03-16 15:42:24.273912106 +0100 -@@ -12,6 +12,11 @@ - #include - #include - #include -+#if !defined(__GLIBC__) -+/* SIOCGSTAMPNS from linux/asm-generic.h -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */ -+#include -+#endif - - #include "macro.h" - #include "missing_socket.h" diff --git a/temp/networkmanager/musl-process-util.patch b/temp/networkmanager/musl-process-util.patch deleted file mode 100644 index 0eb0057fd..000000000 --- a/temp/networkmanager/musl-process-util.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/shared/systemd/src/basic/process-util.c -+++ b/shared/systemd/src/basic/process-util.c -@@ -21,6 +21,9 @@ - #include - #include - #include -+#ifndef __GLIBC__ -+#include -+#endif - #if 0 /* NM_IGNORED */ - #if HAVE_VALGRIND_VALGRIND_H - #include -@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) { - cached_pid = CACHED_PID_UNSET; - } - -+#ifdef __GLIBC__ - /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc - * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against - * libpthread, as it is part of glibc anyway. */ - extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); - extern void* __dso_handle _weak_; -+#endif - - pid_t getpid_cached(void) { - static bool installed = false; -@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) { - * only half-documented (glibc doesn't document it but LSB does — though only superficially) - * we'll check for errors only in the most generic fashion possible. */ - -- if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { -+ #ifdef __GLIBC__ -+ if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { -+ #else -+ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { -+ #endif -+ - /* OOM? Let's try again later */ - cached_pid = CACHED_PID_UNSET; - return new_pid; diff --git a/temp/networkmanager/networkmanager.conf b/temp/networkmanager/networkmanager.conf deleted file mode 100644 index 8da4fe048..000000000 --- a/temp/networkmanager/networkmanager.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -dhcp=dhcpcd diff --git a/temp/networkmanager/networkmanager.initd b/temp/networkmanager/networkmanager.initd deleted file mode 100644 index 1c5e41fc0..000000000 --- a/temp/networkmanager/networkmanager.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2008 Saleem Abdulrasool -# Distributed under the terms of the GNU General Purpose License v2 -# $Header: $ - -depend() { - need dbus - provide net -} - -start() { - ebegin "Starting NetworkManager" - start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \ - --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid - eend $? -} - -stop() { - ebegin "Stopping NetworkManager" - start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid - eend $? -} - -# vim: set ft=gentoo-init-d ts=3 sw=3 et: diff --git a/temp/networkmanager/networkmanager.pre-install b/temp/networkmanager/networkmanager.pre-install deleted file mode 100644 index 26811dfb0..000000000 --- a/temp/networkmanager/networkmanager.pre-install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -addgroup -S plugdev 2>/dev/null - -printf " *\n * To setup system connections, regular users must be member of 'plugdev' group.\n *\n" -printf " *\n * To control WiFi devices, enable wpa_supplicant service: 'rc-update add wpa_supplicant default'\n" -printf " * then reboot the system or restart 'wpa_supplicant' and 'networkmanager' services respectively.\n *\n" - -exit 0 diff --git a/temp/networkmanager/networkmanager.pre-upgrade b/temp/networkmanager/networkmanager.pre-upgrade deleted file mode 120000 index a349c8889..000000000 --- a/temp/networkmanager/networkmanager.pre-upgrade +++ /dev/null @@ -1 +0,0 @@ -networkmanager.pre-install \ No newline at end of file diff --git a/temp/networkmanager/networkmanager.rules b/temp/networkmanager/networkmanager.rules deleted file mode 100644 index 66d21d6bb..000000000 --- a/temp/networkmanager/networkmanager.rules +++ /dev/null @@ -1,9 +0,0 @@ -// Let users in plugdev group modify NetworkManager -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" && - subject.isInGroup("plugdev") && subject.active) { - return "yes"; - } -}); - -