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
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
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() {
}