jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

NetworkManager: /run switch; systemd for everything; switch to gnutls.

Browse source
This commit is contained in:
Juan RP 2013-10-11 17:35:07 +02:00
parent d54d36480d
commit ecdc74a08d
2 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
srcpkgs/NetworkManager/patches/disable_set_hostname.patch
View file

@ -1,18 +0,0 @@
--- src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
+++ src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
@@ -302,6 +302,7 @@
return;
}
+#if 0
/* Try automatically determined hostname from the best device's IP config */
if (!best4)
best4 = get_best_ip4_device (policy->manager, &best_req4);
@@ -356,6 +357,7 @@
}
}
+#endif
/* If no automatically-configured hostname, try using the hostname from
* when NM started up.
*/

16
srcpkgs/NetworkManager/template
View file

@ -5,12 +5,13 @@ revision=1
build_style=gnu-configure
configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
--with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
--with-crypto=nss --disable-static --enable-ppp --enable-concheck
--with-crypto=gnutls --disable-static --enable-ppp --enable-concheck
--with-systemdsystemunitdir=/usr/lib/systemd/system
--with-session-tracking=systemd --with-udev-dir=/usr/lib/udev
--with-kernel-firmware-dir=/usr/lib/firmware --disable-wimax
--with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 --enable-modify-system
--with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf"
--with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf
--with-suspend-resume=systemd"
short_desc="Network Management daemon"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/NetworkManager/"
@ -19,15 +20,20 @@ distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
checksum=8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel
ModemManager-devel dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant bluez>5
mobile-broadband-provider-info"
pre_configure() {
# Full switch to /run to not depend on /var/run being a symlink.
sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
}
post_install() {
# Install config file.
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
rm -rf ${DESTDIR}/etc/init.d ${DESTDIR}/var
rm -rf ${DESTDIR}/etc/init.d
}
libnm_package() {
@ -56,7 +62,7 @@ NetworkManager_package() {
/etc/${pkgname}/dispatcher.d 0755 root root
/etc/${pkgname}/system-connections 0755 root root
/var/lib/${pkgname} 0700 root root"
depends="bluez>5 dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
conf_files="/etc/${pkgname}/${pkgname}.conf"
systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
pkg_install() {