summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-12-23 00:42:25 -0600
committerNiels Horn <niels.horn@slackbuilds.org>2010-12-27 20:06:57 -0200
commitb6a2b6dcfed85fedd9540c3a6912b6b43f87a19e (patch)
treee79f1cb209b00872134792f72f9baf9c2d060e35
parent85b563d5c8dcd7d78ce875411d298fa3c02a6006 (diff)
downloadslackbuilds-b6a2b6dcfed85fedd9540c3a6912b6b43f87a19e.tar.gz
network/NetworkManager: Really fix rc.networkmanager this time
Thanks to Angel Montanez for pointing this out :-) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--network/NetworkManager/NetworkManager.SlackBuild4
-rw-r--r--network/NetworkManager/patches/fixup_rc.networkmanager.patch46
-rw-r--r--network/NetworkManager/patches/rc.networkmanager_restart.patch11
3 files changed, 48 insertions, 13 deletions
diff --git a/network/NetworkManager/NetworkManager.SlackBuild b/network/NetworkManager/NetworkManager.SlackBuild
index 7e526d528e..01660386f0 100644
--- a/network/NetworkManager/NetworkManager.SlackBuild
+++ b/network/NetworkManager/NetworkManager.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=NetworkManager
VERSION=${VERSION:-0.8.2}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,7 +69,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-patch -p1 < $CWD/patches/rc.networkmanager_restart.patch
+patch -p1 < $CWD/patches/fixup_rc.networkmanager.patch
patch -p1 < $CWD/patches/fix_crash_in_glib_with_time.patch
patch -p1 < $CWD/patches/ignore_temp_files.patch
diff --git a/network/NetworkManager/patches/fixup_rc.networkmanager.patch b/network/NetworkManager/patches/fixup_rc.networkmanager.patch
new file mode 100644
index 0000000000..6315b73e7b
--- /dev/null
+++ b/network/NetworkManager/patches/fixup_rc.networkmanager.patch
@@ -0,0 +1,46 @@
+diff -Nur NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager
+--- NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager 2010-11-03 15:11:32.000000000 -0500
++++ NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager 2010-12-23 00:39:39.858508485 -0600
+@@ -27,11 +27,6 @@
+ return
+ fi
+
+- if [ "`pgrep hald`" = "" ]; then
+- echo "HAL must be running to start NetworkManager"
+- return
+- fi
+-
+ # Just in case the pidfile is still there, we may need to nuke it.
+ if [ -e "$PIDFILE" ]; then
+ rm -f $PIDFILE
+@@ -67,6 +62,7 @@
+ nm_restart()
+ {
+ nm_stop
++ sleep 2
+ nm_start
+ }
+
+diff -Nur NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager.in NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager.in
+--- NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager.in 2009-12-23 12:30:29.000000000 -0600
++++ NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager.in 2010-12-23 00:39:52.207382807 -0600
+@@ -27,11 +27,6 @@
+ return
+ fi
+
+- if [ "`pgrep hald`" = "" ]; then
+- echo "HAL must be running to start NetworkManager"
+- return
+- fi
+-
+ # Just in case the pidfile is still there, we may need to nuke it.
+ if [ -e "$PIDFILE" ]; then
+ rm -f $PIDFILE
+@@ -67,6 +62,7 @@
+ nm_restart()
+ {
+ nm_stop
++ sleep 2
+ nm_start
+ }
+
diff --git a/network/NetworkManager/patches/rc.networkmanager_restart.patch b/network/NetworkManager/patches/rc.networkmanager_restart.patch
deleted file mode 100644
index dc43fab86d..0000000000
--- a/network/NetworkManager/patches/rc.networkmanager_restart.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager
---- NetworkManager-0.8.2.orig//initscript/Slackware/rc.networkmanager 2010-11-03 15:11:32.000000000 -0500
-+++ NetworkManager-0.8.2/initscript/Slackware/rc.networkmanager 2010-12-18 15:41:06.884120091 -0600
-@@ -67,6 +67,7 @@
- nm_restart()
- {
- nm_stop
-+ sleep 2
- nm_start
- }
-