Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad43f66f00d923ede24c3911a2f44cd754afc7f2
commit ad43f66f00d923ede24c3911a2f44cd754afc7f2 Author: crazy <cr...@frugalware.org> Date: Sat Sep 23 01:44:31 2017 +0200 networkmanager-1.8.4-1-x86_64 * Version bump * disabled 32bit .. is br0ken and I'm not going to fix that gnome bump or whatver broke it , someone may want to figure diff --git a/source/base/networkmanager/FrugalBuild b/source/base/networkmanager/FrugalBuild index a69f45f..4cc3926 100644 --- a/source/base/networkmanager/FrugalBuild +++ b/source/base/networkmanager/FrugalBuild @@ -4,8 +4,8 @@ pkgname=networkmanager _F_gnome_name=NetworkManager -pkgver=1.8.2 -pkgrel=2 +pkgver=1.8.4 +pkgrel=1 pkgdesc="Network Management daemon" depends=('wireless_tools>=29-5' 'iproute2>=4.7.0-2' 'nss>=3.21-2' 'libgcrypt>=1.7.3-2' \ 'libnl>=3.2.9-2' 'ppp>=2.4.7-3' 'wpa_supplicant>=2.5-4' 'iptables' 'polkit>=0.113-9' 'ca-certificates' \ @@ -21,22 +21,21 @@ Finclude gnome options+=('scriptlet') backup=('etc/NetworkManager/NetworkManager.conf') -source+=("nping-compatilibity.patch") -sha1sums=('6a927025250c3c1b2c34e419ce5ce6bcf2e0fbfe' \ - '31c8c6ea426ae9d1481218ab3c9b59d90206c230') +sha1sums=('152845a0641f15b5aeba66ab523120d4ab93d4de') _F_cd_path=$_F_gnome_name-$pkgver _F_systemd_units=(NetworkManager=e) -_F_cross32_simple="true" -_F_cross32_subdepends=('lib32-nss' 'lib32-glib2' 'lib32-libgudev' 'lib32-libnl' 'lib32-libndp' 'lib32-modemmanager' 'lib32-polkit' 'lib32-newt' 'lib32-dbus-glib' 'lib32-jansson') -_F_cross32_delete=('lib/' 'usr/share' 'usr/lib' 'var/') -Finclude systemd cross32 +#_F_cross32_simple="true" +#_F_cross32_combined="yes" +#_F_cross32_subdepends=('lib32-nss' 'lib32-glib2' 'lib32-libgudev' 'lib32-libnl' 'lib32-libndp' 'lib32-modemmanager' 'lib32-polkit' 'lib32-newt' 'lib32-dbus-glib' 'lib32-jansson') +#_F_cross32_delete=('lib/' 'usr/share' 'usr/lib' 'var/') +Finclude systemd #cross32 replaces=('cnetworkmanager') provides=("${replaces[@]}") conflicts=("${replaces[@]}") -Fconfopts=" --with-distro=frugalware \ +Fconfopts+=" --with-distro=frugalware \ --with-crypto=nss \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-system-ca-path=/etc/ssl/certs \ @@ -47,10 +46,10 @@ Fconfopts=" --with-distro=frugalware \ --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \ --with-modem-manager-1 --disable-concheck" -F32confopts+=" --enable-bluez5-dun=no --enable-introspection=no" +#F32confopts+=" --enable-bluez5-dun=no --enable-introspection=no" build() { - Fbuild_cross32 + Fbuild Fmkdir etc/NetworkManager/system-connections Fmkdir etc/NetworkManager/dispatcher.d diff --git a/source/base/networkmanager/nping-compatilibity.patch b/source/base/networkmanager/nping-compatilibity.patch deleted file mode 100644 index a43569c..0000000 --- a/source/base/networkmanager/nping-compatilibity.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- NetworkManager-1.8.2/src/devices/nm-device.c 2017-07-07 14:03:25.000000000 +0200 -+++ NetworkManager-1.8.2.new/src/devices/nm-device.c 2017-09-09 17:52:40.000000000 +0200 -@@ -10243,7 +10243,7 @@ - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - gs_free char *str_timeout = NULL; - gs_free char *tmp_str = NULL; -- const char *args[] = { priv->gw_ping.binary, "-I", nm_device_get_ip_iface (self), -+ const char *args[] = { priv->gw_ping.binary, "-e", nm_device_get_ip_iface (self), - "-c", "1", "-w", NULL, priv->gw_ping.address, NULL }; - gs_free_error GError *error = NULL; - gboolean ret; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git