Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f40d12e3ed49a8910482140e93233709e4671f9c)

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 devel-xorg-modular grimoire by Vlad Glagolev (f40d12e3ed49a8910482140e93233709e4671f9c)
  • Date: Sat, 14 May 2011 13:59:26 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

cluster/atlas/BUILD | 17 +++++++++--------
cluster/atlas/CONFIGURE | 5 +----
cluster/atlas/DETAILS | 2 +-
cluster/atlas/HISTORY | 12 ++++++++++++
cluster/atlas/INSTALL | 17 +++++++++++++----
cluster/atlas/PRE_BUILD | 1 +
cluster/atlas/configure.patch | 12 ++++++++++++
collab/webmin/DETAILS | 4 ++--
collab/webmin/HISTORY | 3 +++
devel/phpmyadmin/DETAILS | 4 ++--
devel/phpmyadmin/HISTORY | 3 +++
disk/fuse/DETAILS | 1 +
disk/fuse/HISTORY | 5 +++++
disk/fuse/PRE_BUILD | 2 ++
disk/fuse/init.patch | 11 +++++++++++
ftp/proftpd/DETAILS | 4 ++--
ftp/proftpd/HISTORY | 3 +++
graphics/imagemagick/DETAILS | 4 ++--
graphics/imagemagick/HISTORY | 3 +++
http/squid/DETAILS | 4 ++--
http/squid/HISTORY | 3 +++
mail/thunderbird/DETAILS | 4 ++--
mail/thunderbird/HISTORY | 3 +++
net/wicd/DEPENDS | 16 +++++++++++-----
net/wicd/DETAILS | 2 +-
net/wicd/HISTORY | 5 +++++
net/wicd/init.d/wicd | 15 +++++++++------
27 files changed, 124 insertions(+), 41 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

commit 8547ce59911b6ee8a7f740fdcaf8adfea65884b1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

thunderbird: Updatated to version 3.1.10. SECURITY_PATCH++

commit 9950e71d94088846c4e0ef6b30a8bfa7e08e75de
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

webmin: Updated to version 1.550

commit 8852cefc284742add53f9f81774b2b40ed127613
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

squid: Updated to version 3.1.12

commit 49fcf12760fde84d21605afe6d170e749870a3b9
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

proftpd: Updated to version 1.3.3e

commit 20c8fd778b8332a936df955c67d08bfb5631b322
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

imagemagick: Updated to version 6.6.9-8

commit 4ff038e2629765fdf91105d4edf8ffac3d21d095
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

phpmyadmin: Updated to version 3.4.0

commit 18373637d59174a1a89f57d23349c65b1c0c5256
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

atlas: shared library is no longer an option (practically)

shared library is common practice and required by nearly all dependents;
so it is no longer an option, and shared library is built nonetheless;
and pt libraries will never be used if they are named thus, so decide
what kind of libraries will be used at compilation time; I trust you can
make the choice if you really care how atlas performs

commit 3e06e9b979131cf2208b4237bab45aeb924d05d3
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

atlas: patch for configure for compatibility with lapack

diff --git a/cluster/atlas/BUILD b/cluster/atlas/BUILD
index 6935078..6fe1c64 100755
--- a/cluster/atlas/BUILD
+++ b/cluster/atlas/BUILD
@@ -11,14 +11,15 @@ sedit '/RANLIB/s/echo/ranlib/' Make.inc &&

make_single &&
make &&
-if [ $SHARED_LIB == y ]; then
- cd lib &&
+cd lib &&
+if [ $PT_LIB == y ]; then
+ make ptshared &&
+ # newer versions will have ptshared dependent on fat_ptshared
+ make fat_ptshared
+else
make shared &&
- cd ..
+ # newer versions will have shared dependent on fat_shared
+ make fat_shared
fi &&
-if [ $PTSHARED_LIB == y ]; then
- cd lib &&
- make ptshared &&
- cd ..
-fi &&
+cd .. &&
make_normal
diff --git a/cluster/atlas/CONFIGURE b/cluster/atlas/CONFIGURE
index 13ae5e6..3751a6f 100755
--- a/cluster/atlas/CONFIGURE
+++ b/cluster/atlas/CONFIGURE
@@ -1,4 +1 @@
-config_query SHARED_LIB "Do you want shared libraries to be built?" y
-if [ $SHARED_LIB == y ]; then
- config_query PTSHARED_LIB "Do you want parallelized shared libraries to be
built?" y
-fi
+config_query PT_LIB "Do you want parallelized libraries over serialized
libraries?" y
diff --git a/cluster/atlas/DETAILS b/cluster/atlas/DETAILS
index ba91f46..071e758 100755
--- a/cluster/atlas/DETAILS
+++ b/cluster/atlas/DETAILS
@@ -1,6 +1,6 @@
SPELL=atlas
VERSION=3.8.3
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=${SPELL}$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ATLAS
SOURCE_URL[0]=$SOURCEFORGE_URL/math-atlas/$SOURCE
diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 4c8c9d8..bc1bade 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,15 @@
+2011-05-14 Peng Chang (Charles) <chp AT sourcemage.org>
+ * BUILD, CONFIGURE, INSTALL: shared library is common practice and
+ required by nearly all dependents; so it is no longer an option,
+ and shared library is built nonetheless; and pt libraries will
+ never be used if they are named thus, so decide what kind of
libraries
+ will be used at compilation time; I trust you can make the choice
+ if you really care how atlas performs
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: patching configure, removing duplicate object file from
+ liblapack.a
+ * configure.patch: the patch
+
2011-05-13 Peng Chang (Charles) <chp AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* BUILD, CONFIGURE: clean up ineffective options
diff --git a/cluster/atlas/INSTALL b/cluster/atlas/INSTALL
index b007c00..3fe412b 100755
--- a/cluster/atlas/INSTALL
+++ b/cluster/atlas/INSTALL
@@ -1,4 +1,13 @@
-make install &&
-if [ $SHARED_LIB == y ]; then
- cp -v lib/*.so $INSTALL_ROOT/usr/lib
-fi
+make install &&
+
+if [ $PT_LIB == y ]; then
+ mv -v lib/libptf77blas.so lib/libf77blas.so &&
+ mv -v lib/libptcblas.so lib/libcblas.so &&
+ mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a
$INSTALL_ROOT/usr/lib/libf77blas.a &&
+ mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a
+else
+ rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a &&
+ rm -v $INSTALL_ROOT/usr/lib/libptcblas.a
+fi &&
+
+cp -v lib/*.so $INSTALL_ROOT/usr/lib
diff --git a/cluster/atlas/PRE_BUILD b/cluster/atlas/PRE_BUILD
index ce52e77..1486f51 100755
--- a/cluster/atlas/PRE_BUILD
+++ b/cluster/atlas/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
mkdir $SOURCE_DIRECTORY/bld &&

cd $SOURCE_DIRECTORY &&
+patch configure $SPELL_DIRECTORY/configure.patch &&
patch tune/blas/gemm/emit_mm.c $SPELL_DIRECTORY/emit_mm.patch
diff --git a/cluster/atlas/configure.patch b/cluster/atlas/configure.patch
new file mode 100644
index 0000000..f457d5b
--- /dev/null
+++ b/cluster/atlas/configure.patch
@@ -0,0 +1,12 @@
+--- configure 2009-02-19 02:47:35.000000000 +0800
++++ configure 2011-05-14 16:49:30.470003020 +0800
+@@ -262,7 +262,8 @@
+ if test $flapack != "ATL_NoOverride"
+ then
+ cp -f $flapack lib/liblapack.a
+- ar d lib/liblapack.a lsame.o xerbla.o csrot.o zdrot.o
++ ar d lib/liblapack.a lsame.o xerbla.o csrot.o zdrot.o \
++ spotrf.o cpotrs.o cgetrs.o cpotrf.o cgetrf.o
+ fi
+ echo "DONE configure"
+ #
diff --git a/collab/webmin/DETAILS b/collab/webmin/DETAILS
index e60f7d5..f1eeea3 100755
--- a/collab/webmin/DETAILS
+++ b/collab/webmin/DETAILS
@@ -1,9 +1,9 @@
SPELL=webmin
- VERSION=1.530
+ VERSION=1.550
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/webadmin/$SOURCE
-
SOURCE_HASH=sha512:da2766693ebfe840838b49ff3778bad38e403b4340a0219ed7af4300214d97de737aefc196d75134939900b081567d572d3074e68cf5289fcb1813f4db03925f
+
SOURCE_HASH=sha512:9c5b5dcd0da6165bab7d89d93e718243013cd3388acaec5540fb58db8c6173362712882a3070fd1a776be4ee74b8e48dea8561b3a24ec3478063f9e308807fdc
WEB_SITE=http://www.webmin.com/
ENTERED=20020415
ARCHIVE="off"
diff --git a/collab/webmin/HISTORY b/collab/webmin/HISTORY
index bd3bc63..41fd557 100644
--- a/collab/webmin/HISTORY
+++ b/collab/webmin/HISTORY
@@ -1,3 +1,6 @@
+2011-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.550
+
2010-12-04 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.530

diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index 18936e3..2f1c5b2 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
SPELL=phpmyadmin
- VERSION=3.3.10
+ VERSION=3.4.0
SECURITY_PATCH=17
-
SOURCE_HASH=sha512:896b5382f9d04bf76d7a647a1b976489229fb6241930288e6cc74aa459b74d2793eac6b36ce267bd593952f0f2dddf6bb946c1372789d363ff00cdee31e798bb
+
SOURCE_HASH=sha512:1fb18c45bb6fbc9f03dabad83a1c1d4570723caeacb8be9123aca936d782e398d2b55436106bcaef4ee36f271f612a6d547b440ab5abc758cd26ccb9d5383690
SOURCE=phpMyAdmin-$VERSION-all-languages.tar.bz2
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpMyAdmin-$VERSION-all-languages
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 7b64464..a9522e6 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,6 @@
+2011-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.4.0
+
2011-03-19 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.3.10

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/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 3e25cf7..1b9c756 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,7 +1,7 @@
SPELL=proftpd
- VERSION=1.3.3d
+ VERSION=1.3.3e
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:d9baa488fb562630687353f1ff62bf164297aff8cbb716c16fce23b051e3a33d4c31f253d3d5778b4ba69648c48c9bbab2f4db2a4c0478c24d9f80ad79450f1b
+
SOURCE_HASH=sha512:68027c917a77ea3eba710f1667759da1c3be0851a985e7a5e3ce8841ef177ed74752d8486fdd1a32cc8971e8cfa6bfd154cc6a85ab87bab76bb3cb4a194fe0cd
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.proftpd.org/distrib/source/$SOURCE
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 19c028f..cdbf6e8 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2011-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.3.3e
+
2010-12-18 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.3.3d

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index ed66b2a..1cf7648 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.6.8-8
+ VERSION=6.6.9-8
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
SOURCE_HASH=sha512:6f4d7cce805b2a488e138b06061906dff06eca8af52ff200a3e894ce31e633c07598fcd9395abef1099d14882c4e47405992182fc1cff2a9b46d9fa4592775ff
+
SOURCE_HASH=sha512:51cf70292a325ecdcbb88d322a16321eb28e13277c1adbac455bb1c363ffff38cee33e742b94a05d9a6e548315c9593982b52fe1c6089b74586d287bd4ce8e30
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 9eda833..293f361 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2011-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.6.9-8
+
2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.6.8-8

diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index e889104..0f7612a 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,12 +1,12 @@
SPELL=squid
- VERSION=3.1.11
+ VERSION=3.1.12
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE
#
SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
# SOURCE_GPG=squid.gpg:$SOURCE2
-
SOURCE_HASH=sha512:9455a0401dadd07def13dd1ceba8e441f15b522d755b17d7c5fd5e7178239a968aa418c368477321b37f70516d32b48f7b2ea9a27661886354b500c08bf215c4
+
SOURCE_HASH=sha512:ce30620ab7bb0c71e6714a022f5db61adff6dc6afa035ff5a41e7306a482b54c9638295910da33cfe10c010cb60a5d3ac71a107166d6978195f77b0a4c922d60
WEB_SITE=http://www.squid-cache.org/
ENTERED=20011214
SECURITY_PATCH=1
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 679681b..4de6ed7 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,6 @@
+2011-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.1.12
+
2011-03-04 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.1.11

diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 530a507..98f1b40 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=3.1.9
+ VERSION=3.1.10
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=25
+ SECURITY_PATCH=26
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 51d9797..97ab93f 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2011-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.1.10. SECURITY_PATCH++
+
2011-03-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.1.9
* thunderbird.gpg: added F6C242EC, new key of Mozilla Messaging Inc.
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 devel-xorg-modular grimoire by Vlad Glagolev (f40d12e3ed49a8910482140e93233709e4671f9c), Vlad Glagolev, 05/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page