Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2d634f12696b7a402c2db48fe4697ff5ba7ba6bf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2d634f12696b7a402c2db48fe4697ff5ba7ba6bf)
  • Date: Sat, 14 May 2011 13:59:26 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

disk/fuse/DETAILS | 1 +
disk/fuse/HISTORY | 5 +++++
disk/fuse/PRE_BUILD | 2 ++
disk/fuse/init.patch | 11 +++++++++++
net/wicd/DEPENDS | 16 +++++++++++-----
net/wicd/DETAILS | 2 +-
net/wicd/HISTORY | 5 +++++
net/wicd/init.d/wicd | 15 +++++++++------
8 files changed, 45 insertions(+), 12 deletions(-)

New commits:
commit 2d634f12696b7a402c2db48fe4697ff5ba7ba6bf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wicd: corrected dependencies and fixed init script

commit 49a1fc6931a9d1fd0efae3ae0abd1fc315bc67b8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fuse: dont install extra init script

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 62f8f45..278be17 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,6 +1,7 @@
SPELL=fuse
if [ "$CVS" != "y" ]; then
VERSION=2.8.5
+ PATCHLEVEL=1

SOURCE_HASH=sha512:83f668c5c02f591a1f6e5cb6f95abb7227248ba80fab940395ee5ec07ce44743dae07c3cfd865327143fe5cbe3bbee4aa1c4e856e55aa80cb8b6892f9683efad
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 24c899e..c93d9bf 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,8 @@
+2011-05-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply the patch
+ * init.patch: added, not to install extra init script
+
2011-02-04 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS, DEPENDS, PREPARE: CVS -> git

diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index 4387110..8dd8ec1 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,6 +2,8 @@ default_pre_build &&

cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/init.patch" &&
+
if [ "$CVS" = "y" ]; then
./makeconf.sh
fi
diff --git a/disk/fuse/init.patch b/disk/fuse/init.patch
new file mode 100644
index 0000000..5f3b3b2
--- /dev/null
+++ b/disk/fuse/init.patch
@@ -0,0 +1,11 @@
+--- util/Makefile.in.orig 2010-09-28 13:23:54.000000000 +0400
++++ util/Makefile.in 2011-05-14 22:35:20.612452475 +0400
+@@ -593,8 +593,6 @@
+ install-exec-local:
+ $(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)
+ $(INSTALL_PROGRAM) $(srcdir)/mount.fuse
$(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+- $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+- $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+ @if test -x /usr/sbin/update-rc.d; then \
+ echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 .
|| true"; \
+ /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . ||
true; \
diff --git a/net/wicd/DEPENDS b/net/wicd/DEPENDS
index 65a0ca3..e1c925b 100755
--- a/net/wicd/DEPENDS
+++ b/net/wicd/DEPENDS
@@ -1,8 +1,14 @@
+depends python &&
depends dbus &&
depends dbus-python &&
-depends pygtk2 &&

-suggest_depends urwid "" "" "To enable use of wicd-curses" &&
+optional_depends pygtk2 \
+ "" "--no-install-gtk" \
+ "for GTK+2 graphical user interface" &&
+
+optional_depends urwid \
+ "" "--no-install-ncurses" \
+ "for ncurses client" &&

optional_depends acpid "--resume=${INSTALL_ROOT}/etc/acpi/resume.d/ \
--suspend=${INSTALL_ROOT}/etc/acpi/suspend.d/" \
@@ -13,9 +19,9 @@ optional_depends pm-utils
"--pmutils=${INSTALL_ROOT}/usr/lib/pm-utils/sleep.d/"
"--no-install-pmutils" \
"to install pm-utils hooks" &&

-optional_depends notify-python "" \
- "" \
- "for notification popups in wicd-client" &&
+suggest_depends notify-python \
+ "" "--no-use-notifications" \
+ "for notification popups in wicd-client" &&

if [[ $WICD_KDEVER == "3.x" ]]; then
depends kdebase
diff --git a/net/wicd/DETAILS b/net/wicd/DETAILS
index 581bccf..7ca4e62 100755
--- a/net/wicd/DETAILS
+++ b/net/wicd/DETAILS
@@ -1,6 +1,6 @@
SPELL=wicd
VERSION=1.7.0
- PATCHLEVEL=1
+ PATCHLEVEL=2
BRANCH="${SPELL}-${VERSION}"
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/wicd-stable/${BRANCH}/${SOURCE}
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index ad74fc9..5297272 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,3 +1,8 @@
+2011-05-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * DEPENDS: corrected dependencies and flags
+ * init.d/wicd: properly handle pid file and output correct statuses
+
2010-10-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD, wicd-no-deepcopy.patch.bz2:added
diff --git a/net/wicd/init.d/wicd b/net/wicd/init.d/wicd
index 989bfca..27f102e 100644
--- a/net/wicd/init.d/wicd
+++ b/net/wicd/init.d/wicd
@@ -2,11 +2,10 @@

PROGRAM="/usr/sbin/wicd"
RUNLEVEL=3
+PIDFILE="/var/run/wicd/wicd.pid"
NEEDS="+local_fs smgl-messagebus"
PROVIDES=network

-PIDFILE="/var/run/wicd/wicd.pid"
-
. /etc/init.d/smgl_init

start() {
@@ -15,12 +14,13 @@ start() {
# make sure there is actually a process there...
if [ -f $PIDFILE ]; then
echo "Found $PIDFILE doing extra checks..."
- if ! ps ax | grep "wicd " | grep -q $(cat $PIDFILE) ; then
+ if [ "$(pgrep -f 'wicd-daemon')" != $(cat $PIDFILE) ]; then
print_status warning "$PIDFILE exists, but wicd is not running under
this PID"
echo "Attempting cleanup and new startup..."
rm -f $PIDFILE
else
- echo "Seems to be running..."
+ $SET_WCOL
+ print_status warning running
return 0
fi
fi
@@ -31,10 +31,13 @@ start() {
}

stop() {
- echo "Stopping wicd daemon..."
+ echo "Stopping wicd..."
if [ -e $PIDFILE ]; then
kill $(cat $PIDFILE) 2>/dev/null
rm -f $PIDFILE 2>/dev/null
+ evaluate_retval
+ else
+ $SET_WCOL
+ print_status warning not_running
fi
- evaluate_retval
}



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2d634f12696b7a402c2db48fe4697ff5ba7ba6bf), Vlad Glagolev, 05/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page