From 09686d4eb409ea96f9515e54ea9a664303e5b103 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 17:49:44 +0100 Subject: [PATCH] automatic version update by autodist [release 0.9.8.10-1mamba;Thu Apr 24 2014] --- NetworkManager-0.8.2-initscript.patch | 12 + ...kManager-0.8.2-polkit-localauthority.patch | 12 + NetworkManager-0.9.4.0-upstream-fixes-2.patch | 287 ++++++++++++ ....9.4.0-wpa_supplicant_longer_timeout.patch | 14 + NetworkManager.spec | 416 ++++++++++++++++++ README.md | 2 + 6 files changed, 743 insertions(+) create mode 100644 NetworkManager-0.8.2-initscript.patch create mode 100644 NetworkManager-0.8.2-polkit-localauthority.patch create mode 100644 NetworkManager-0.9.4.0-upstream-fixes-2.patch create mode 100644 NetworkManager-0.9.4.0-wpa_supplicant_longer_timeout.patch create mode 100644 NetworkManager.spec diff --git a/NetworkManager-0.8.2-initscript.patch b/NetworkManager-0.8.2-initscript.patch new file mode 100644 index 0000000..b968914 --- /dev/null +++ b/NetworkManager-0.8.2-initscript.patch @@ -0,0 +1,12 @@ +diff -Nru NetworkManager-0.8.2.orig//initscript/RedHat/NetworkManager NetworkManager-0.8.2/initscript/RedHat/NetworkManager +--- NetworkManager-0.8.2.orig//initscript/RedHat/NetworkManager.in 2010-11-03 21:11:32.000000000 +0100 ++++ NetworkManager-0.8.2/initscript/RedHat/NetworkManager.in 2010-12-03 03:23:19.419087517 +0100 +@@ -49,7 +49,7 @@ + echo + + echo -n $"Starting NetworkManager daemon: " +- daemon --pidfile $pidfile --check $servicename $processname --pid-file=$pidfile ++ daemon --pidfile=$pidfile --check $servicename $processname --pid-file=$pidfile + RETVAL=$? + echo + if [ -n "${NETWORKWAIT}" ]; then diff --git a/NetworkManager-0.8.2-polkit-localauthority.patch b/NetworkManager-0.8.2-polkit-localauthority.patch new file mode 100644 index 0000000..8adb977 --- /dev/null +++ b/NetworkManager-0.8.2-polkit-localauthority.patch @@ -0,0 +1,12 @@ +[Allow group sysadmin to create wireless connections for all users] +Identity=unix-group:sysadmin +Action=org.freedesktop.network-manager-settings.system.modify +ResultAny=yes +ResultInactive=no +ResultActive=yes + +Identity=unix-group:sysadmin +Action=org.freedesktop.NetworkManager.settings.modify.system +ResultAny=yes +ResultInactive=no +ResultActive=yes diff --git a/NetworkManager-0.9.4.0-upstream-fixes-2.patch b/NetworkManager-0.9.4.0-upstream-fixes-2.patch new file mode 100644 index 0000000..dde9a08 --- /dev/null +++ b/NetworkManager-0.9.4.0-upstream-fixes-2.patch @@ -0,0 +1,287 @@ +Submitted By: Armin K. +Date: 2012-06-03 +Initial Package Version: 0.9.4.0 +Upstream Status: In upstream SVN +Origin: Upstream +Description: libnm-glib: initialize GError, else invalid free() crash can occur (rh #809123) + libnm-glib: more ensure_inited() fixing + ppp: don't use struct ifpppstatsreq that was removed from linux/ip_ppp.h + +diff -Naur NetworkManager.orig/libnm-glib/nm-access-point.c NetworkManager/libnm-glib/nm-access-point.c +--- NetworkManager.orig/libnm-glib/nm-access-point.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-access-point.c 2012-06-03 21:00:42.173840751 +0200 +@@ -464,6 +464,8 @@ + { + NMAccessPoint *ap = NM_ACCESS_POINT (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_FLAGS: + g_value_set_uint (value, nm_access_point_get_flags (ap)); +diff -Naur NetworkManager.orig/libnm-glib/nm-active-connection.c NetworkManager/libnm-glib/nm-active-connection.c +--- NetworkManager.orig/libnm-glib/nm-active-connection.c 2012-03-12 22:25:57.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-active-connection.c 2012-06-03 21:00:42.174840767 +0200 +@@ -394,6 +394,8 @@ + { + NMActiveConnection *self = NM_ACTIVE_CONNECTION (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_CONNECTION: + g_value_set_string (value, nm_active_connection_get_connection (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-client.c NetworkManager/libnm-glib/nm-client.c +--- NetworkManager.orig/libnm-glib/nm-client.c 2012-03-21 18:29:52.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-client.c 2012-06-03 21:00:42.174840767 +0200 +@@ -1502,6 +1502,8 @@ + NMClient *self = NM_CLIENT (object); + NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_VERSION: + g_value_set_string (value, nm_client_get_version (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-bond.c NetworkManager/libnm-glib/nm-device-bond.c +--- NetworkManager.orig/libnm-glib/nm-device-bond.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-bond.c 2012-06-03 21:00:42.174840767 +0200 +@@ -241,6 +241,8 @@ + { + NMDeviceBond *device = NM_DEVICE_BOND (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_bond_get_hw_address (device)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-bt.c NetworkManager/libnm-glib/nm-device-bt.c +--- NetworkManager.orig/libnm-glib/nm-device-bt.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-bt.c 2012-06-03 21:00:42.174840767 +0200 +@@ -303,6 +303,8 @@ + { + NMDeviceBt *device = NM_DEVICE_BT (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_bt_get_hw_address (device)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device.c NetworkManager/libnm-glib/nm-device.c +--- NetworkManager.orig/libnm-glib/nm-device.c 2012-03-23 21:54:25.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device.c 2012-06-03 21:00:42.175840783 +0200 +@@ -313,6 +313,8 @@ + NMDevice *device = NM_DEVICE (object); + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_DEVICE_TYPE: + g_value_set_uint (value, nm_device_get_device_type (device)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-ethernet.c NetworkManager/libnm-glib/nm-device-ethernet.c +--- NetworkManager.orig/libnm-glib/nm-device-ethernet.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-ethernet.c 2012-06-03 21:00:42.175840783 +0200 +@@ -311,6 +311,8 @@ + { + NMDeviceEthernet *device = NM_DEVICE_ETHERNET (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_ethernet_get_hw_address (device)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-infiniband.c NetworkManager/libnm-glib/nm-device-infiniband.c +--- NetworkManager.orig/libnm-glib/nm-device-infiniband.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-infiniband.c 2012-06-03 21:00:42.175840783 +0200 +@@ -250,6 +250,8 @@ + { + NMDeviceInfiniband *device = NM_DEVICE_INFINIBAND (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_infiniband_get_hw_address (device)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-modem.c NetworkManager/libnm-glib/nm-device-modem.c +--- NetworkManager.orig/libnm-glib/nm-device-modem.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-modem.c 2012-06-03 21:00:42.175840783 +0200 +@@ -205,6 +205,8 @@ + { + NMDeviceModem *self = NM_DEVICE_MODEM (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_MODEM_CAPS: + g_value_set_uint (value, nm_device_modem_get_modem_capabilities (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-olpc-mesh.c NetworkManager/libnm-glib/nm-device-olpc-mesh.c +--- NetworkManager.orig/libnm-glib/nm-device-olpc-mesh.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-olpc-mesh.c 2012-06-03 21:00:42.176840799 +0200 +@@ -257,6 +257,8 @@ + { + NMDeviceOlpcMesh *device = NM_DEVICE_OLPC_MESH (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_olpc_mesh_get_hw_address (device)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-vlan.c NetworkManager/libnm-glib/nm-device-vlan.c +--- NetworkManager.orig/libnm-glib/nm-device-vlan.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-vlan.c 2012-06-03 21:00:42.176840799 +0200 +@@ -264,6 +264,8 @@ + { + NMDeviceVlan *device = NM_DEVICE_VLAN (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_vlan_get_hw_address (device)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-wifi.c NetworkManager/libnm-glib/nm-device-wifi.c +--- NetworkManager.orig/libnm-glib/nm-device-wifi.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-wifi.c 2012-06-03 21:00:42.176840799 +0200 +@@ -501,6 +501,8 @@ + { + NMDeviceWifi *self = NM_DEVICE_WIFI (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_wifi_get_hw_address (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-device-wimax.c NetworkManager/libnm-glib/nm-device-wimax.c +--- NetworkManager.orig/libnm-glib/nm-device-wimax.c 2012-03-20 21:40:12.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-device-wimax.c 2012-06-03 21:00:42.176840799 +0200 +@@ -444,6 +444,8 @@ + { + NMDeviceWimax *self = NM_DEVICE_WIMAX (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_wimax_get_hw_address (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-dhcp4-config.c NetworkManager/libnm-glib/nm-dhcp4-config.c +--- NetworkManager.orig/libnm-glib/nm-dhcp4-config.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-dhcp4-config.c 2012-06-03 21:00:42.176840799 +0200 +@@ -132,6 +132,8 @@ + { + NMDHCP4Config *self = NM_DHCP4_CONFIG (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_OPTIONS: + g_value_set_boxed (value, nm_dhcp4_config_get_options (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-dhcp6-config.c NetworkManager/libnm-glib/nm-dhcp6-config.c +--- NetworkManager.orig/libnm-glib/nm-dhcp6-config.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-dhcp6-config.c 2012-06-03 21:00:42.176840799 +0200 +@@ -132,6 +132,8 @@ + { + NMDHCP6Config *self = NM_DHCP6_CONFIG (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_OPTIONS: + g_value_set_boxed (value, nm_dhcp6_config_get_options (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-ip4-config.c NetworkManager/libnm-glib/nm-ip4-config.c +--- NetworkManager.orig/libnm-glib/nm-ip4-config.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-ip4-config.c 2012-06-03 21:00:42.177840815 +0200 +@@ -187,6 +187,8 @@ + NMIP4Config *self = NM_IP4_CONFIG (object); + NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_ADDRESSES: + nm_utils_ip4_addresses_to_gvalue (priv->addresses, value); +diff -Naur NetworkManager.orig/libnm-glib/nm-ip6-config.c NetworkManager/libnm-glib/nm-ip6-config.c +--- NetworkManager.orig/libnm-glib/nm-ip6-config.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-ip6-config.c 2012-06-03 21:00:42.177840815 +0200 +@@ -268,6 +268,8 @@ + NMIP6Config *self = NM_IP6_CONFIG (object); + NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (self); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_ADDRESSES: + nm_utils_ip6_addresses_to_gvalue (priv->addresses, value); +diff -Naur NetworkManager.orig/libnm-glib/nm-remote-settings.c NetworkManager/libnm-glib/nm-remote-settings.c +--- NetworkManager.orig/libnm-glib/nm-remote-settings.c 2012-03-21 18:31:38.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-remote-settings.c 2012-06-03 21:00:42.177840815 +0200 +@@ -109,7 +109,7 @@ + _nm_remote_settings_ensure_inited (NMRemoteSettings *self) + { + NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self); +- GError *error; ++ GError *error = NULL; + + if (!priv->inited) { + if (!g_initable_init (G_INITABLE (self), NULL, &error)) { +@@ -1061,6 +1061,8 @@ + { + NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (object); + ++ _nm_remote_settings_ensure_inited (NM_REMOTE_SETTINGS (object)); ++ + switch (prop_id) { + case PROP_BUS: + g_value_set_boxed (value, priv->bus); +diff -Naur NetworkManager.orig/libnm-glib/nm-vpn-connection.c NetworkManager/libnm-glib/nm-vpn-connection.c +--- NetworkManager.orig/libnm-glib/nm-vpn-connection.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-vpn-connection.c 2012-06-03 21:00:42.177840815 +0200 +@@ -211,6 +211,8 @@ + { + NMVPNConnection *self = NM_VPN_CONNECTION (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_VPN_STATE: + g_value_set_uint (value, nm_vpn_connection_get_vpn_state (self)); +diff -Naur NetworkManager.orig/libnm-glib/nm-wimax-nsp.c NetworkManager/libnm-glib/nm-wimax-nsp.c +--- NetworkManager.orig/libnm-glib/nm-wimax-nsp.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager/libnm-glib/nm-wimax-nsp.c 2012-06-03 21:00:42.177840815 +0200 +@@ -247,6 +247,8 @@ + { + NMWimaxNsp *nsp = NM_WIMAX_NSP (object); + ++ _nm_object_ensure_inited (NM_OBJECT (object)); ++ + switch (prop_id) { + case PROP_NAME: + g_value_set_string (value, nm_wimax_nsp_get_name (nsp)); +diff -Naur NetworkManager.orig/src/ppp-manager/nm-ppp-manager.c NetworkManager/src/ppp-manager/nm-ppp-manager.c +--- NetworkManager.orig/src/ppp-manager/nm-ppp-manager.c 2012-03-20 22:13:41.000000000 +0100 ++++ NetworkManager/src/ppp-manager/nm-ppp-manager.c 2012-06-03 21:01:35.545685909 +0200 +@@ -304,18 +304,20 @@ + { + NMPPPManager *manager = NM_PPP_MANAGER (user_data); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (manager); +- struct ifpppstatsreq req; ++ struct ifreq req; ++ struct ppp_stats stats; + + memset (&req, 0, sizeof (req)); +- req.stats_ptr = (caddr_t) &req.stats; ++ memset (&stats, 0, sizeof (stats)); ++ req.ifr_data = (caddr_t) &stats; + +- strncpy (req.ifr__name, priv->ip_iface, sizeof (req.ifr__name)); ++ strncpy (req.ifr_name, priv->ip_iface, sizeof (req.ifr_name)); + if (ioctl (priv->monitor_fd, SIOCGPPPSTATS, &req) < 0) { + nm_log_warn (LOGD_PPP, "could not read ppp stats: %s", strerror (errno)); + } else { + g_signal_emit (manager, signals[STATS], 0, +- req.stats.p.ppp_ibytes, +- req.stats.p.ppp_obytes); ++ stats.p.ppp_ibytes, ++ stats.p.ppp_obytes); + } + + return TRUE; diff --git a/NetworkManager-0.9.4.0-wpa_supplicant_longer_timeout.patch b/NetworkManager-0.9.4.0-wpa_supplicant_longer_timeout.patch new file mode 100644 index 0000000..a6b6348 --- /dev/null +++ b/NetworkManager-0.9.4.0-wpa_supplicant_longer_timeout.patch @@ -0,0 +1,14 @@ +diff -Nru NetworkManager-0.9.4.0.orig/src/nm-device-wifi.c NetworkManager-0.9.4.0/src/nm-device-wifi.c +--- NetworkManager-0.9.4.0.orig/src/nm-device-wifi.c 2012-03-22 17:49:43.000000000 +0100 ++++ NetworkManager-0.9.4.0/src/nm-device-wifi.c 2012-05-03 12:26:47.861700288 +0200 +@@ -2426,8 +2426,8 @@ + + priv = NM_DEVICE_WIFI_GET_PRIVATE (self); + +- /* Set up a timeout on the connection attempt to fail it after 25 seconds */ +- id = g_timeout_add_seconds (25, supplicant_connection_timeout_cb, self); ++ /* Set up a timeout on the connection attempt to fail it after 90 seconds */ ++ id = g_timeout_add_seconds (90, supplicant_connection_timeout_cb, self); + if (id == 0) { + nm_log_err (LOGD_DEVICE | LOGD_WIFI, + "Activation (%s/wireless): couldn't start supplicant " diff --git a/NetworkManager.spec b/NetworkManager.spec new file mode 100644 index 0000000..b584f7a --- /dev/null +++ b/NetworkManager.spec @@ -0,0 +1,416 @@ +%define majver %(echo %version | cut -d. -f 1-2) +Name: NetworkManager +Version: 0.9.8.10 +Release: 1mamba +Summary: A hardware level network management tool integrated with D-Bus +Group: System/Kernel and Hardware +Vendor: openmamba +Distribution: openmamba +Packager: Silvan Calarco +URL: http://www.gnome.org +Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/%{majver}/%{name}-%{version}.tar.xz +Source1: NetworkManager-0.8.2-polkit-localauthority.patch +# From svn: +# svn co svn://svn.gnome.org/svn/NetworkManager/trunk NetworkManager +Patch0: %{name}-0.8.2-initscript.patch +Patch7: %{name}-0.9.4.0-wpa_supplicant_longer_timeout.patch +Patch12: %{name}-0.9.4.0-upstream-fixes-2.patch +License: GPL +## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +BuildRequires: libdbus-devel +BuildRequires: libdbus-glib-devel +BuildRequires: libffi-devel +BuildRequires: libglib-devel +BuildRequires: liblzma-devel +BuildRequires: libnl-devel +BuildRequires: libnspr-devel +BuildRequires: libnss-devel +BuildRequires: libselinux-devel +BuildRequires: libsoup-devel +BuildRequires: libuuid-devel +BuildRequires: libxml2-devel +BuildRequires: libz-devel +BuildRequires: polkit-devel +BuildRequires: systemd-devel +BuildRequires: udev-devel +## AUTOBUILDREQ-END +BuildRequires: gettext-devel +BuildRequires: pkgconfig +BuildRequires: libgcrypt-devel +BuildRequires: dhcdbd +BuildRequires: dhcp-client +BuildRequires: libiw-devel +BuildRequires: ppp-devel +Requires: iproute >= 2.6.11 +Requires: wpa_supplicant >= 0.7.3-3mamba +Requires: ppp >= 2.4.5-5mamba +Requires: dhcpclient +Requires: libnm = %{?epoch:%epoch:}%{version}-%{release} +Requires(post):dbus +Requires(post):systemd-core +Conflicts: wicd +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +NetworkManager is a hardware level network management tool integrated with the D-Bus subsystem. + +%package -n libnm +Summary: Libraries used by %{name} +Group: System/Libraries + +%description -n libnm +NetworkManager is a hardware level network management tool integrated with the D-Bus subsystem. +This package contains the shared libraries. + +%package -n libnm-devel +Summary: Devel package for %{name} +Group: Development/Libraries +Requires: libnm = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: NetworkManager-devel +Provides: NetworkManager-devel + +%description -n libnm-devel +NetworkManager is a hardware level network management tool integrated with the D-Bus subsystem. +This package contains static libraries and header files need for development. + +%package apidocs +Group: Documentation +Summary: %{name} API documentation +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires: gtk-doc + +%description apidocs +This package includes the %{name} API documentation. + +%debug_package + +%prep +%setup -q +%patch0 -p1 +%patch7 -p1 +#%patch12 -p1 + +%build +%configure \ + --with-tests \ + --enable-doc \ + --enable-gtk-doc \ + --enable-ifcfg-rh \ + --with-systemdsystemunitdir=`pkg-config systemd --variable=systemdsystemunitdir` \ + --with-modem-manager-1 \ + --enable-bluez4 + +# --enable-wimax \ +# --with-distro=redhat \ + +%make + +%install +[ "%{buildroot}" != / ] && rm -rf %{buildroot} +%makeinstall + +install -m0755 test/.libs/nm-online %{buildroot}%{_bindir}/nm-online +install -D -m0644 %{SOURCE1} \ + %{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d/10-org-freedesktop-network-manager-settings.pkla +rm -f %{buildroot}%{_libdir}/libnm-*.a + +install -d -m0755 %{buildroot}%{_sysconfdir}/NetworkManager/VPN +install -d -m0755 %{buildroot}%{_sysconfdir}/NetworkManager/system-connections +install -D -m0755 initscript/RedHat/NetworkManager %{buildroot}%{_initrddir}/NetworkManager + +%{find_lang} %{name} + +cat > %{buildroot}%{_sysconfdir}/NetworkManager/NetworkManager.conf << _EOF +[main] +plugins=ifcfg-rh,keyfile +_EOF + + +%clean +[ "%{buildroot}" != / ] && rm -rf %{buildroot} + +%post +/sbin/ldconfig +if [ $1 -ge 1 ]; then + sed -i "s|^plugins=keyfile$|plugins=ifcfg-rh,keyfile|" %{_sysconfdir}/NetworkManager/NetworkManager.conf + systemctl -q enable NetworkManager + systemctl -q enable NetworkManager-dispatcher + systemctl -q daemon-reload +fi +if [ $1 -eq 1 ]; then + # new install + systemctl -q enable NetworkManager + systemctl -q daemon-reload + systemctl -q start NetworkManager + /sbin/chkconfig --add NetworkManager +fi +exit 0 + +%preun +# erase +/sbin/ldconfig +if [ $1 -eq 0 ]; then + systemctl -q stop NetworkManager + systemctl -q disable NetworkManager +fi +exit 0 + +%files -f %{name}.lang +%defattr(-,root,root) +%{_sysconfdir}/dbus-1/system.d/*.conf +%{_sysconfdir}/polkit-1/localauthority/50-local.d/10-org-freedesktop-network-manager-settings.pkla +%dir %{_sysconfdir}/NetworkManager +%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf +%dir %{_sysconfdir}/NetworkManager/dispatcher.d +%dir %{_sysconfdir}/NetworkManager/VPN +%dir %{_sysconfdir}/NetworkManager/system-connections +%{_initrddir}/NetworkManager +%{_sbindir}/NetworkManager +%{_bindir}/nmcli +%{_bindir}/nm-tool +%{_bindir}/nm-online +%{_libdir}/pppd/*/nm-pppd-plugin.la +%{_libdir}/pppd/*/nm-pppd-plugin.so +/lib/udev/rules.d/77-nm-olpc-mesh.rules +/lib/systemd/system/NetworkManager.service +/lib/systemd/system/NetworkManager-dispatcher.service +/lib/systemd/system/NetworkManager-wait-online.service +%{_libexecdir}/nm-avahi-autoipd.action +%{_libexecdir}/nm-dhcp-client.action +%{_libexecdir}/nm-dispatcher.action +%{_datadir}/bash-completion/completions/nmcli +%{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy +%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service +%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service +#%{_libexecdir}/nm-crash-logger +#%{_datadir}/NetworkManager/gdb-cmd +/var/run/NetworkManager +%{_mandir}/man1/nm-online.1.* +%{_mandir}/man1/nm-tool.1* +%{_mandir}/man1/nmcli.1* +%{_mandir}/man5/NetworkManager.conf.5* +%{_mandir}/man5/nm-settings.5* +%{_mandir}/man5/nm-system-settings.conf.5* +%{_mandir}/man8/NetworkManager.8* + +%files -n libnm +%defattr(-,root,root) +%{_libdir}/libnm-util.so.* +%{_libdir}/libnm-glib-vpn.so.* +%{_libdir}/libnm-glib.so.* +%dir %{_libdir}/NetworkManager +%{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.la +%{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so +%{_libdir}/girepository-1.0/NMClient-1.0.typelib +%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib +%doc AUTHORS COPYING + +%files -n libnm-devel +%defattr(-,root,root) +%{_libdir}/*.la +%{_libdir}/*.so +%dir %{_includedir}/NetworkManager +%{_includedir}/NetworkManager/*.h +%{_libdir}/pkgconfig/*.pc +%{_includedir}/libnm-glib/libnm_glib.h +%{_includedir}/libnm-glib/nm-*.h +%{_datadir}/gir-1.0/NMClient-1.0.gir +%{_datadir}/gir-1.0/NetworkManager-1.0.gir +%{_datadir}/vala/vapi/libnm-glib.deps +%{_datadir}/vala/vapi/libnm-glib.vapi +%{_datadir}/vala/vapi/libnm-util.deps +%{_datadir}/vala/vapi/libnm-util.vapi +%doc ChangeLog NEWS README TODO + +%files apidocs +%defattr(-,root,root) +%dir %{_datadir}/gtk-doc/html/NetworkManager +%{_datadir}/gtk-doc/html/NetworkManager/* +%dir %{_datadir}/gtk-doc/html/libnm-glib +%{_datadir}/gtk-doc/html/libnm-glib/* +%dir %{_datadir}/gtk-doc/html/libnm-util +%{_datadir}/gtk-doc/html/libnm-util/* + +%changelog +* Thu Apr 24 2014 Automatic Build System 0.9.8.10-1mamba +- automatic version update by autodist + +* Mon Apr 07 2014 Automatic Build System 0.9.8.9-1mamba +- automatic version update by autodist + +* Sun Dec 01 2013 Silvan Calarco 0.9.8.8-3mamba +- enable bluez4 support + +* Sat Nov 30 2013 Silvan Calarco 0.9.8.8-2mamba +- rebuilt with --with-modem-manager-1 to support ModemManager 1.0 + +* Fri Oct 11 2013 Automatic Build System 0.9.8.8-1mamba +- automatic version update by autodist + +* Tue Oct 01 2013 Automatic Build System 0.9.8.6-1mamba +- automatic version update by autodist + +* Sat Sep 14 2013 Automatic Build System 0.9.8.4-1mamba +- automatic version update by autodist + +* Wed Sep 11 2013 Silvan Calarco 0.9.8.2-3mamba +- also enable NetworkManager-dispatcher service for dispatcher function to work + (https://bugzilla.redhat.com/show_bug.cgi?id=974811) + +* Fri Aug 30 2013 Silvan Calarco 0.9.8.2-2mamba +- polkit: allo action org.freedesktop.NetworkManager.settings.modify.system to sysadmin as required by network-manager-applet + +* Sat Jun 08 2013 Automatic Build System 0.9.8.2-1mamba +- automatic version update by autodist + +* Thu Mar 21 2013 Silvan Calarco 0.9.8.0-4mamba +- enable systemd NetworkManager service + +* Sun Mar 17 2013 Silvan Calarco 0.9.8.0-3mamba +- fix systemdsystemunitdir installation path + +* Mon Feb 25 2013 Silvan Calarco 0.9.8.0-2mamba +- install initscript, no longer installed by default + +* Sat Feb 23 2013 Automatic Build System 0.9.8.0-1mamba +- automatic version update by autodist + +* Tue Jan 22 2013 Automatic Build System 0.9.7.995-1mamba +- automatic version update by autodist + +* Sun Oct 29 2012 Automatic Build System 0.9.6.4-1mamba +- automatic version update by autodist +- source edit: require ppp > 2.4.5-5mamba (with ipv6 support enabled) + +* Sat Sep 15 2012 Silvan Calarco 0.9.6.0-2mamba +- moved typelib files from libnm-devel to libnm + +* Tue Aug 07 2012 Automatic Build System 0.9.6.0-1mamba +- automatic version update by autodist + +* Tue Jul 24 2012 Automatic Build System 0.9.5.96-1mamba +- automatic version update by autodist + +* Sat Jun 30 2012 Automatic Build System 0.9.5.95-1mamba +- automatic version update by autodist + +* Sat Jun 09 2012 Silvan Calarco 0.9.4.0-4mamba +- use lfs patch to fix nmcli issues + +* Fri May 18 2012 Silvan Calarco 0.9.4.0-3mamba +- added upstream patch to fix nmcli (http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=8a2267ab6b37948a70c10f0af781be4822a54c6b) + +* Thu May 03 2012 Silvan Calarco 0.9.4.0-2mamba +- added patch to raise wpa_supplicant timeout from 25 to 90 seconds +- fixed installation of nm-online tool +- don't restart service on upgrade + +* Sat Mar 24 2012 Automatic Build System 0.9.4.0-1mamba +- automatic version update by autodist + +* Mon Mar 19 2012 Automatic Build System 0.9.3.997-1mamba +- automatic version update by autodist + +* Tue Mar 13 2012 Automatic Build System 0.9.3.995-1mamba +- automatic version update by autodist + +* Thu Nov 10 2011 Automatic Build System 0.9.2.0-1mamba +- automatic version update by autodist + +* Sat Oct 29 2011 Automatic Build System 0.9.1.95-1mamba +- automatic version update by autodist + +* Wed Sep 28 2011 Automatic Build System 0.9.1.90-1mamba +- automatic version update by autodist + +* Sun Sep 18 2011 Silvan Calarco 0.9.0-2mamba +- require wpa_supplicant >= 0.7.3-3mamba + +* Thu Aug 25 2011 Automatic Build System 0.9.0-1mamba +- automatic version update by autodist + +* Thu May 12 2011 Automatic Build System 0.8.4.0-1mamba +- automatic update by autodist + +* Fri Apr 29 2011 Silvan Calarco 0.8.2-12mamba +- Added patch reconnect_if_modem to avoid disabling modems after first failure + +* Wed Apr 27 2011 Silvan Calarco 0.8.2-11mamba +- enable ifcfg-rh plugin + +* Thu Feb 10 2011 Silvan Calarco 0.8.2-10mamba +- added requirement for dbus + +* Tue Feb 08 2011 Silvan Calarco 0.8.2-9mamba +- activate service on install + +* Fri Feb 04 2011 Silvan Calarco 0.8.2-8mamba +- added virtual requirement for dhcpclient + +* Mon Jan 31 2011 Silvan Calarco 0.8.2-7mamba +- added patch to disable wireless scan if connected (http://nilvec.com/disable-scanning-in-networkmanager-when-connected/) + +* Fri Jan 28 2011 Silvan Calarco 0.8.2-6mamba +- install main configuration file (fixes system connection configuration) + +* Thu Jan 13 2011 Silvan Calarco 0.8.2-5mamba +- create VPN and system-connections directory in configuration dir + +* Sun Dec 19 2010 Silvan Calarco 0.8.2-4mamba +- added patch to suppress weird log messages about file existence when writing connections + +* Thu Dec 09 2010 Silvan Calarco 0.8.2-3mamba +- added policykit configuration for system-wide settings + +* Thu Dec 02 2010 Silvan Calarco 0.8.2-2mamba +- rebuilt with debug package +- added patch that fixes a startup crash when checking wired connections + +* Mon Nov 08 2010 Automatic Build System 0.8.2-1mamba +- automatic update to 0.8.2 by autodist + +* Mon Jul 26 2010 Automatic Build System 0.8.1-1mamba +- automatic update to 0.8.1 by autodist + +* Mon Mar 15 2010 Automatic Build System 0.8-1mamba +- automatic update to 0.8 by autodist + +* Tue Nov 24 2009 Automatic Build System 0.7.2-1mamba +- automatic update to 0.7.2 by autodist + +* Sun Apr 19 2009 Automatic Build System 0.7.1-1mamba +- automatic update by autodist + +* Sat Apr 04 2009 Silvan Calarco 0.7.0.99-1mamba +- automatic update by autodist + +* Sat Feb 21 2009 Silvan Calarco 0.7.0.97-1mamba +- automatic update by autodist + +* Tue Dec 02 2008 Silvan Calarco 0.7.0-2mamba +- update to released version + +* Fri Jun 13 2008 Silvan Calarco 0.7.0-1mamba +- update to 0.7.0 (svn) + +* Fri Jun 13 2008 Silvan Calarco 0.6.5-3mamba +- added libnm and libnm-devel subpackages + +* Mon Jul 16 2007 Silvan Calarco 0.6.5-2mamba +- rebuilt against wireless_tools 29 + +* Tue Jul 10 2007 Aleph0 0.6.5-1mamba +- update to 0.6.5 +- run ldconfig +- dropped patch for dbus: merged upstream +- added missing build requirement + +* Fri Apr 06 2007 Silvan Calarco 0.6.4-1mamba +- update to version 0.6.4 by autospec + +* Fri Mar 10 2006 Silvan Calarco 0.5.0-1qilnx +- update to version 0.5.0 by autospec + +* Sat Sep 03 2005 Silvan Calarco 0.4-1qilnx +- package created by autospec diff --git a/README.md b/README.md index 4cf0d2c..ca2042a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # NetworkManager +NetworkManager is a hardware level network management tool integrated with the D-Bus subsystem. +