[arch-commits] Commit in networkmanager/trunk (5 files)
Jan de Groot
jgc at archlinux.org
Fri Nov 14 22:15:15 UTC 2008
Date: Friday, November 14, 2008 @ 17:15:15
Author: jgc
Revision: 19108
upgpkg: networkmanager 0.7.0rc2-1
Modified:
networkmanager/trunk/PKGBUILD
Deleted:
networkmanager/trunk/dbus-hal-policy.patch
networkmanager/trunk/netfs
networkmanager/trunk/networkmanager-initscript.patch
networkmanager/trunk/ntpdate
---------------------------------+
PKGBUILD | 39 +++++++-------------
dbus-hal-policy.patch | 15 -------
netfs | 13 ------
networkmanager-initscript.patch | 73 --------------------------------------
ntpdate | 14 -------
5 files changed, 14 insertions(+), 140 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-11-14 22:06:33 UTC (rev 19107)
+++ PKGBUILD 2008-11-14 22:15:15 UTC (rev 19108)
@@ -6,41 +6,30 @@
# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
pkgname=networkmanager
-pkgver=0.6.6
+pkgver=0.7.0rc2
pkgrel=1
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.gnome.org/projects/NetworkManager/"
-depends=('wireless_tools' 'iproute' 'dhcdbd' 'hal>=0.5.11rc2' 'libnl>=1.1'
- 'wpa_supplicant>=0.5.10' "libnetworkmanager>=${pkgver}")
+depends=('wireless_tools' 'iproute' 'hal>=0.5.11-5' 'libnl>=1.1' 'ppp' 'dhcpcd'
+ 'wpa_supplicant>=0.5.10-2' "libnetworkmanager>=${pkgver}")
makedepends=('pkgconfig' 'perlxml')
-options=('!libtool')
-source=(http://people.redhat.com/dcbw/NetworkManager/0.6.6/NetworkManager-${pkgver}.tar.gz
- networkmanager-initscript.patch
- dbus-hal-policy.patch
- ntpdate
- netfs)
-md5sums=('412ed4db5d2db04285799c4303ddeeed'
- '730a3ebd470986a9f61deaf52cac0cb0'
- '1d52e4852badff1086611d81cc4b99d7'
- '9a3b8da1efac158d91bb9fc699736b03'
- 'ee592ee567faf683e7aecf651bd15937')
+options=('!libtool' '!makeflags')
+source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.7/NetworkManager-0.7.0-rc2.tar.bz2)
+md5sums=('cd9feed3004db64fd4d44f5b4cd5c073')
build() {
- cd ${startdir}/src/NetworkManager-${pkgver}
- patch -Np0 -i ${startdir}/src/networkmanager-initscript.patch || return 1
- patch -Np1 -i ${startdir}/src/dbus-hal-policy.patch || return 1
-
+ cd "${srcdir}/NetworkManager-0.7.0"
./configure --prefix=/usr --sysconfdir=/etc \
--with-distro=arch --localstatedir=/var \
- --without-gnome --libexecdir=/usr/lib/networkmanager || return 1
+ --libexecdir=/usr/lib/networkmanager \
+ --disable-static --with-dhcp-client=dhcpcd \
+ --with-crypto=nss || return 1
make || return 1
- sed -i -e '/\slibnm-util\s/d' -e '/\sinclude/d' -e '/\sgnome\s/d' Makefile
- make DESTDIR=${startdir}/pkg install || return 1
- install -d -m755 ${startdir}/pkg/usr/bin
- install -m755 test/nm-tool ${startdir}/pkg/usr/bin/nm-tool || return 1
- install -m755 ${startdir}/src/ntpdate ${startdir}/pkg/etc/NetworkManager/dispatcher.d/ntpdate || return 1
- install -m755 ${startdir}/src/netfs ${startdir}/pkg/etc/NetworkManager/dispatcher.d/netfs || return 1
+ sed -i -e 's/\slibnm-util\s/ /' -e 's/\slibnm-glib\s/ /' -e 's/\sinclude/ /' Makefile || return 1
+ make DESTDIR="${pkgdir}" install || return 1
+ install -d -m755 "${pkgdir}/usr/bin"
+ install -m755 test/.libs/nm-tool "${pkgdir}/usr/bin/" || return 1
}
Deleted: dbus-hal-policy.patch
===================================================================
--- dbus-hal-policy.patch 2008-11-14 22:06:33 UTC (rev 19107)
+++ dbus-hal-policy.patch 2008-11-14 22:15:15 UTC (rev 19108)
@@ -1,15 +0,0 @@
---- NetworkManager-0.6.6/src/NetworkManager.conf.orig 2008-04-10 20:35:03.000000000 +0000
-+++ NetworkManager-0.6.6/src/NetworkManager.conf 2008-04-10 20:35:38.000000000 +0000
-@@ -8,7 +8,11 @@
- <allow send_destination="org.freedesktop.NetworkManager"/>
- <allow send_interface="org.freedesktop.NetworkManager"/>
- </policy>
-- <policy at_console="true">
-+ <policy user="hal">
-+ <allow send_destination="org.freedesktop.NetworkManager"/>
-+ <allow send_interface="org.freedesktop.NetworkManager"/>
-+ </policy>
-+ <policy group="network">
- <allow send_destination="org.freedesktop.NetworkManager"/>
- <allow send_interface="org.freedesktop.NetworkManager"/>
- </policy>
Deleted: netfs
===================================================================
--- netfs 2008-11-14 22:06:33 UTC (rev 19107)
+++ netfs 2008-11-14 22:15:15 UTC (rev 19108)
@@ -1,13 +0,0 @@
-#!/bin/sh
-case "$2" in
- up)
- if [ /etc/rc.d/netfs ]; then
- /etc/rc.d/netfs start
- fi
- ;;
- down)
- if [ /var/run/daemons/netfs ]; then
- /etc/rc.d/netfs stop
- fi
- ;;
-esac
Deleted: networkmanager-initscript.patch
===================================================================
--- networkmanager-initscript.patch 2008-11-14 22:06:33 UTC (rev 19107)
+++ networkmanager-initscript.patch 2008-11-14 22:15:15 UTC (rev 19108)
@@ -1,73 +0,0 @@
---- initscript/Arch/networkmanager-dispatcher.in 2007-04-18 18:13:08.000000000 +0000
-+++ initscript/Arch/networkmanager-dispatcher.in 2007-08-19 12:22:50.000000000 +0000
-@@ -25,7 +25,7 @@
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
-- add_daemon NetworkManagerDispatcher
-+ add_daemon networkmanager-dispatcher
- stat_done
- fi
- ;;
-@@ -35,7 +35,7 @@
- if [ $? -gt 0 ]; then
- stat_fail
- else
-- rm_daemon NetworkManagerDispatcher
-+ rm_daemon networkmanager-dispatcher
- stat_done
- fi
- ;;
---- initscript/Arch/networkmanager.in 2007-04-18 18:13:08.000000000 +0000
-+++ initscript/Arch/networkmanager.in 2007-08-19 12:24:56.000000000 +0000
-@@ -19,6 +19,8 @@
- PID=`pidof -o %PPID $NETWORKMANAGER_BIN`
- case "$1" in
- start)
-+ ck_daemon dbus && /etc/rc.d/dbus start
-+ ck_daemon dhcdbd && /etc/rc.d/dhcdbd start
- stat_busy "Starting NetworkManager"
- if [ -z "$PID" ]; then
- $NETWORKMANAGER_BIN
-@@ -26,7 +28,7 @@
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
-- add_daemon NetworkManager
-+ add_daemon networkmanager
- stat_done
- fi
- ;;
-@@ -36,7 +38,7 @@
- if [ $? -gt 0 ]; then
- stat_fail
- else
-- rm_daemon NetworkManager
-+ rm_daemon networkmanager
- stat_done
- fi
- ;;
-@@ -45,8 +47,22 @@
- sleep 1
- $0 start
- ;;
-+ sleep)
-+ /usr/bin/dbus-send --system \
-+ --dest=org.freedesktop.NetworkManager \
-+ --type=method_call \
-+ /org/freedesktop/NetworkManager \
-+ org.freedesktop.NetworkManager.sleep
-+ ;;
-+ wake)
-+ /usr/bin/dbus-send --system \
-+ --dest=org.freedesktop.NetworkManager \
-+ --type=method_call \
-+ /org/freedesktop/NetworkManager \
-+ org.freedesktop.NetworkManager.wake
-+ ;;
- *)
-- echo "usage: $0 {start|stop|restart}"
-+ echo "usage: $0 {start|stop|restart|sleep|wake}"
- ;;
- esac
- exit 0
Deleted: ntpdate
===================================================================
--- ntpdate 2008-11-14 22:06:33 UTC (rev 19107)
+++ ntpdate 2008-11-14 22:15:15 UTC (rev 19108)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-case "$2" in
- up)
- if [ /etc/rc.d/ntpdate ]; then
- /etc/rc.d/ntpdate start
- fi
- ;;
- down)
- if [ /var/run/daemons/ntpdate ]; then
- /etc/rc.d/ntpdate stop
- fi
- ;;
-esac
More information about the arch-commits
mailing list