aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan P.C. McQuen <ryan.q@linux.com>2014-11-25 07:43:37 -0800
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-11-29 08:13:49 +0700
commitfdf23c2dfa9c9d642f0211983e89c1b39f4b5212 (patch)
tree14deb07d0da14acd457a848fba432d17b1da446a
parentcd054ec3f3a41b955741d589deb253ec27a5807a (diff)
network/connman: Remove patch and add connmanctl.
Signed-off-by: Ryan P.C. McQuen <ryan.q@linux.com>
-rw-r--r--network/connman/connman.SlackBuild14
-rw-r--r--network/connman/netdev.patch15
2 files changed, 7 insertions, 22 deletions
diff --git a/network/connman/connman.SlackBuild b/network/connman/connman.SlackBuild
index ec67d53da218a..10d804c18d8f5 100644
--- a/network/connman/connman.SlackBuild
+++ b/network/connman/connman.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/sh
-#
+
# Slackware build script for connman
# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
@@ -25,7 +25,7 @@
PRGNAM=connman
VERSION=1.26
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -64,20 +64,18 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
-# use correct group for Slackware
-patch -p1 -i ${CWD}/netdev.patch
-
-# Configure
+# configure
CFLAGS=${SCFLAGS} CXXFLAGS=${SCXXFLAGS} LIBS=-lncurses \
./configure \
--prefix=/usr \
- --libdir=/usr/${LIBDIRSUFFIX} \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-nmcompat \
--enable-polkit \
--enable-openvpn \
+ --enable-client \
--build=${ARCH}-slackware-linux
make OPTS="$SLKCFLAGS"
@@ -95,6 +93,8 @@ install -m644 AUTHORS COPYING ChangeLog INSTALL README TODO doc/*.txt \
mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}/api
mv ${PKG}/usr/doc/${PRGNAM}-${VERSION}/{*-api.txt,api/}
+cp -av $PWD/client/connmanctl $PKG/usr/sbin/
+
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/network/connman/netdev.patch b/network/connman/netdev.patch
deleted file mode 100644
index b125472e4b0cf..0000000000000
--- a/network/connman/netdev.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur connman-1.20.orig/src/connman-dbus.conf connman-1.20/src/connman-dbus.conf
---- connman-1.20.orig/src/connman-dbus.conf 2011-04-18 09:03:56.000000000 +0000
-+++ connman-1.20/src/connman-dbus.conf 2014-01-01 07:52:53.758797399 +0000
-@@ -8,6 +8,11 @@
- <allow send_interface="net.connman.Counter"/>
- <allow send_interface="net.connman.Notification"/>
- </policy>
-+ <policy group="netdev">
-+ <allow send_destination="net.connman"/>
-+ <allow send_interface="net.connman.Agent"/>
-+ <allow send_interface="net.connman.Counter"/>
-+ </policy>
- <policy at_console="true">
- <allow send_destination="net.connman"/>
- </policy>