New commits:
commit 9c44243b9b09b06fb288f86567fffdf16f569784
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn AT sourcemage.org>
pidgin: optional support for networkmanager
commit 4b42125d891900c2ec2c3de503e7d7263509949c
Author: Finn Haedicke <finn AT sourcemage.org>
Commit: Finn Haedicke <finn AT sourcemage.org>
new spell: network-manager-pptp 0.8.1
network-manager plugin for PPTP VPNs
commit e5965b0f5b4bb53d74219b701f65d208e5120167
Author: Finn Haedicke <finn AT sourcemage.org>
Commit: Finn Haedicke <finn AT sourcemage.org>
new spell: network-manager-applet 0.8.1
a GUI applet to control network manager
commit 57125c715f33b23283a4d67f132a69af69495aec
Author: Finn Haedicke <finn AT sourcemage.org>
Commit: Finn Haedicke <finn AT sourcemage.org>
new spell: network-manager 0.8.1
commit ed130ca3265b2017c4aa497fc3050b4f3fd2e3d3
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn AT sourcemage.org>
linux-initramfs: respect kernel args root= and init=
commit 35aad6523a4fac5edd0c8020bd61e0dd72e4e7d0
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn AT sourcemage.org>
linux-initramfs: use which to find lvm and cryptsetup binaries
commit e6428d5c6377fb7b5ab3335d00e5340602fb9fdb
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn AT sourcemage.org>
gst-plugins-good: optionally depends on pulseaudio
diff --git a/ChangeLog b/ChangeLog
index 4bc59cd..946e05a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-16 Finn Haedicke <finn AT sourcemage.org>
+ * net/network-manager: new spell, network connection daemon
+ * net/network-manager-applet: new spell, gui applet for
+ network-manager
+ * net/network-manager-pptp: new spell, PPTP VPN plugin for
+ network-manager
+
2010-08-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics/bins: new spell, a web photo album generator
diff --git a/chat-im/pidgin/BUILD b/chat-im/pidgin/BUILD
index b0720f5..7a7daaf 100755
--- a/chat-im/pidgin/BUILD
+++ b/chat-im/pidgin/BUILD
@@ -1,7 +1,6 @@
### had to cook up some pkg-config files for nss and nspr
CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include"
export
PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr"
&&
-OPTS="--disable-nm $OPTS" &&
make_single &&
default_build &&
make_normal &&
diff --git a/chat-im/pidgin/DEPENDS b/chat-im/pidgin/DEPENDS
index 8c06b9a..fafbc95 100755
--- a/chat-im/pidgin/DEPENDS
+++ b/chat-im/pidgin/DEPENDS
@@ -102,6 +102,11 @@ optional_depends meanwhile
\
'--disable-meanwhile' \
'for Lotus Instant Messenger/Sametime protocol' &&
+optional_depends network-manager \
+ '--enable-nm' \
+ '--disable-nm' \
+ 'for NetworkManager support' &&
+
optional_depends gettext \
'--enable-nls' \
'--disable-nls' \
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index a4bfc37..5180b4d 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 Finn Haedicke <finn AT sourcemage.org>
+ * BUILD,DEPENDS: optionally depends on network-manager
+
2010-08-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.7.3
diff --git a/net/network-manager-applet/DEPENDS
b/net/network-manager-applet/DEPENDS
new file mode 100755
index 0000000..317d93d
--- /dev/null
+++ b/net/network-manager-applet/DEPENDS
@@ -0,0 +1,11 @@
+depends network-manager &&
+depends gtk+2 &&
+depends gconf2 &&
+depends glib2 &&
+depends libgnomeui &&
+depends gnome-keyring &&
+depends gnome-panel &&
+depends wpa_supplicant &&
+depends policykit &&
+
+optional_depends gnome-bluetooth "" "" "for bluetooth support"
diff --git a/net/network-manager-applet/DETAILS
b/net/network-manager-applet/DETAILS
new file mode 100755
index 0000000..8603b17
--- /dev/null
+++ b/net/network-manager-applet/DETAILS
@@ -0,0 +1,33 @@
+ SPELL=network-manager-applet
+if [[ $NETWORK_MANAGER_APPLET_SCM == y ]]; then
+ if [[ $NETWORK_MANAGER_APPLET_SCM_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE="$SPELL-svn.tar.bz2"
+ SOURCE_URL[0]=svn://svn.gnome.org/svn/$SPELL/trunk:$SPELL-svn
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-svn"
+ FORCE_DOWNLOAD=1
+else
+ VERSION=0.8.1
+ BRANCH=${VERSION:0:3}
+ SOURCE="$SPELL-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/$SPELL/${BRANCH}/${SOURCE}
+
SOURCE_HASH=sha512:fa199700486d6bd36a20e35fd936b7234dc4c5d459203520157fd0615406d20a245bc8c834a2aa64e7189e2df488c60288b6ac898e217a543d80433fbcfe39c3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
+ WEB_SITE="http://www.gnome.org/projects/NetworkManager/ "
+ LICENSE[0]=GNU General Public License v2
+ ENTERED=20080624
+ SHORT="A set of simple network interface control tools."
+cat << EOF
+The GNOME NetworkManager is a set of co-operative tools that make networking
+simple and straightforward. Whether wireless or wired, NetworkManager allows
+you to quickly move from one network to another: once a network has been
+configured and joined once, it can be detected and re-joined automatically at
+a later date. It was designed to auto-detect as much information as possible,
+seamlessly switches connections when necessary, and provides immediate
feedback
+of the network state to users and applications. It utilizes D-Bus and HAL.
+EOF
diff --git a/net/network-manager-applet/HISTORY
b/net/network-manager-applet/HISTORY
new file mode 100644
index 0000000..33d855a
--- /dev/null
+++ b/net/network-manager-applet/HISTORY
@@ -0,0 +1,3 @@
+2010-08-16 Finn Haedicke <finn AT sourcemage.org>
+ * DEPENDS, DETAILS, DEPENDS, HISTORY, PREPARE: spell created
+
diff --git a/net/network-manager-applet/PREPARE
b/net/network-manager-applet/PREPARE
new file mode 100755
index 0000000..29a759b
--- /dev/null
+++ b/net/network-manager-applet/PREPARE
@@ -0,0 +1,7 @@
+
+config_query NETWORK_MANAGER_APPLET_SCM "Build latest version from
development tree?" n &&
+
+if [[ $NETWORK_MANAGER_APPLET_SCM == y ]]; then
+ config_query NETWORK_MANAGER_APPLET_SCM_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/net/network-manager-applet/PRE_BUILD
b/net/network-manager-applet/PRE_BUILD
new file mode 100755
index 0000000..c82c303
--- /dev/null
+++ b/net/network-manager-applet/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ "$NETWORK_MANAGER_APPLET_SCM" == "y" ]]; then
+ sedit 's@^ *\./configure@true@' autogen.sh &&
+ ./autogen.sh
+fi &&
+sed -i 's/-Werror//' configure
diff --git a/net/network-manager-pptp/DEPENDS
b/net/network-manager-pptp/DEPENDS
new file mode 100755
index 0000000..c80ff98
--- /dev/null
+++ b/net/network-manager-pptp/DEPENDS
@@ -0,0 +1,8 @@
+depends dbus &&
+depends gconf2 &&
+depends glade3 &&
+depends glib2 &&
+depends gnome-keyring &&
+depends gtk+2 &&
+depends network-manager &&
+depends pptp-linux
diff --git a/net/network-manager-pptp/DETAILS
b/net/network-manager-pptp/DETAILS
new file mode 100755
index 0000000..3533cea
--- /dev/null
+++ b/net/network-manager-pptp/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=network-manager-pptp
+ VERSION=0.8.1
+ SOURCE="NetworkManager-pptp-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/${VERSION:0:3}/${SOURCE}
+
SOURCE_HASH=sha512:c0253656b6ab96d250f95c4d3b32c9928352960d77b94d561c1d7e10a1713e92eb7d7654f41006a8b81e913ada1a26fba93f96d8810137a1aef4dd71fd959937
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-pptp-${VERSION}"
+ WEB_SITE="http://projects.gnome.org/NetworkManager/"
+ LICENSE[0]=GPL
+ ENTERED=20100414
+ SHORT="PPTP-VPN extension for NetworkManager"
+cat << EOF
+The GNOME NetworkManager is a set of co-operative tools that make networking
+simple and straightforward. Whether wireless or wired, NetworkManager allows
+you to quickly move from one network to another: once a network has been
+configured and joined once, it can be detected and re-joined automatically at
+a later date. It was designed to auto-detect as much information as possible,
+seamlessly switches connections when necessary, and provides immediate
feedback
+of the network state to users and applications. It utilizes D-Bus and HAL.
+
+This package provides PPTP support for NetworkManager
+
+
+EOF
diff --git a/net/network-manager-pptp/HISTORY
b/net/network-manager-pptp/HISTORY
new file mode 100644
index 0000000..aa0bc17
--- /dev/null
+++ b/net/network-manager-pptp/HISTORY
@@ -0,0 +1,3 @@
+2010-08-16 Finn Haedicke <finn AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/net/network-manager/BUILD b/net/network-manager/BUILD
new file mode 100755
index 0000000..37c2781
--- /dev/null
+++ b/net/network-manager/BUILD
@@ -0,0 +1,2 @@
+OPTS=" $OPTS --with-distro=debian"
+default_build
diff --git a/net/network-manager/DEPENDS b/net/network-manager/DEPENDS
new file mode 100755
index 0000000..b8218c7
--- /dev/null
+++ b/net/network-manager/DEPENDS
@@ -0,0 +1,19 @@
+depends dhcpcd &&
+depends gconf2 &&
+depends gettext &&
+depends glib2 &&
+depends hal &&
+depends intltool &&
+depends iproute2 &&
+depends libnl &&
+depends nss &&
+depends policykit &&
+depends ppp &&
+depends -sub EXTRAS udev &&
+depends wpa_supplicant &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "use gtk-doc to build documentation"
+
diff --git a/net/network-manager/DETAILS b/net/network-manager/DETAILS
new file mode 100755
index 0000000..a8c73d8
--- /dev/null
+++ b/net/network-manager/DETAILS
@@ -0,0 +1,34 @@
+ SPELL=network-manager
+if [[ $NETWORK_MANAGER_SCM == y ]]; then
+ if [[ $NETWORK_MANAGER_SCM_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE="NetworkManager-git.tar.bz2"
+
SOURCE_URL[0]=git://anongit.freedesktop.org/NetworkManager/NetworkManager.git
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-git"
+ FORCE_DOWNLOAD=1
+else
+ VERSION=0.8.1
+ BRANCH=${VERSION:0:3}
+ SOURCE="NetworkManager-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/${BRANCH}/${SOURCE}
+
SOURCE_HASH=sha512:c00831600ab6c1ff2d8150efa41d49015d8756130856d274dde698d4822678bb81371057f14a1e8da8780b0cef1baec9d038a23d25ba8c70e18c896c1597a51e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-${VERSION}"
+fi
+ WEB_SITE="http://www.gnome.org/projects/NetworkManager/ "
+ LICENSE[0]=GPL
+ ENTERED=20080624
+ SHORT="A set of simple network interface control tools."
+cat << EOF
+The GNOME NetworkManager is a set of co-operative tools that make networking
+simple and straightforward. Whether wireless or wired, NetworkManager allows
+you to quickly move from one network to another: once a network has been
+configured and joined once, it can be detected and re-joined automatically at
+a later date. It was designed to auto-detect as much information as possible,
+seamlessly switches connections when necessary, and provides immediate
feedback
+of the network state to users and applications. It utilizes D-Bus and HAL.
+EOF
+
diff --git a/net/network-manager/HISTORY b/net/network-manager/HISTORY
new file mode 100644
index 0000000..ae5ca7d
--- /dev/null
+++ b/net/network-manager/HISTORY
@@ -0,0 +1,3 @@
+2010-08-16 Finn Haedicke <finn AT sourcemage.org>
+ * DEPENDS, DETAILS, HISTORY, BUILD, PRE_BUILD, PREPARE: spell created
+
diff --git a/net/network-manager/PREPARE b/net/network-manager/PREPARE
new file mode 100755
index 0000000..3440a6b
--- /dev/null
+++ b/net/network-manager/PREPARE
@@ -0,0 +1,6 @@
+config_query NETWORK_MANAGER_SCM "Build latest version from development
tree?" n &&
+
+if [[ $NETWORK_MANAGER_SCM == y ]]; then
+ config_query NETWORK_MANAGER_APPLET_SCM_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/net/network-manager/PRE_BUILD b/net/network-manager/PRE_BUILD
new file mode 100755
index 0000000..e838326
--- /dev/null
+++ b/net/network-manager/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+if [[ "$NETWORK_MANAGER_SCM" == "y" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ sedit 's@^ *\./configure@true@' autogen.sh &&
+ ./autogen.sh
+fi
diff --git a/net/network-manager/init.d/NetworkManager
b/net/network-manager/init.d/NetworkManager
new file mode 100755
index 0000000..2ee3504
--- /dev/null
+++ b/net/network-manager/init.d/NetworkManager
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/NetworkManager
+RUNLEVEL=3
+NEEDS="smgl-messagebus hald"
+PROVIDES="network"
+
+. /etc/init.d/smgl_init
+
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 964226b..84dda13 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,7 @@
+2010-07-28 Finn Haedicke <finn AT sourcemage.org>
+ * mkinitrd: use which to find static dmsetup, lvm, cryptsetup
+ * mkinitrd: read /proc/cmdline for root= and init=
+
2010-06-20 Finn Haedicke <finn AT sourcemage.org>
* DEPENDS: depends on busybox instead of klibc
* mkinitrd: use busybox_parts instead of klibc_parts
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index dfcaaaf..75ce834 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -110,8 +110,10 @@ function linuxrc_post()
local rootdev;
rootdev=$(awk '$2=="/" {print $1}' /etc/fstab)
cat <<-EOF
-/bin/mount $rootdev /root
-exec /bin/switch_root /root /sbin/init
+ROOTDEV=\$(busybox sed -n 's:^.*root=\([^ ]*\).*$:\1:p' /proc/cmdline )
+/bin/mount \${ROOTDEV:-$rootdev} /root
+INIT=\$(busybox sed -n 's:^.*init=\([^ ]*\).*$:\1:p' /proc/cmdline )
+exec /bin/switch_root /root \${INIT:-/sbin/init}
EOF
}
@@ -1107,7 +1109,7 @@ function lvm_parts()
cat <<-EOF
dir /etc/lvm 0755 0 0
file /etc/lvm/lvm.conf /etc/lvm/lvm.conf 0644 0 0
-file /bin/lvm /usr/sbin/lvm.static 0755 0 0
+file /bin/lvm $(which lvm.static) 0755 0 0
EOF
local link
for link in lvs pvs vgs vgck lvconvert lvdisplay pvchange pvcreate \
@@ -1120,7 +1122,7 @@ EOF
do
echo "link /bin/$link /bin/lvm 0755 0 0"
done
- echo "file /bin/dmsetup /sbin/dmsetup.static 0755 0 0"
+ echo "file /bin/dmsetup $(which dmsetup.static 2>/dev/null) 0755 0 0"
fi
}