Skip to Content.
Sympa Menu

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

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 (41e7561970afaf7f97d7014b6eed94d7263c67c1)
  • Date: Sat, 20 Mar 2010 09:56:14 -0500

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

ruby-raa/mysql-ruby/DETAILS | 8 ++++----
ruby-raa/mysql-ruby/HISTORY | 3 +++
ruby-raa/passenger/BUILD | 15 +++++++++------
ruby-raa/passenger/DEPENDS | 15 +++++++++++----
ruby-raa/passenger/DETAILS | 15 ++++++++-------
ruby-raa/passenger/HISTORY | 5 +++++
ruby-raa/passenger/INSTALL | 12 ++++++++++--
ruby-raa/ruby-1.8/BUILD | 2 +-
ruby-raa/ruby-1.8/DETAILS | 8 ++++----
ruby-raa/ruby-1.8/HISTORY | 3 +++
10 files changed, 58 insertions(+), 28 deletions(-)

New commits:
commit 41e7561970afaf7f97d7014b6eed94d7263c67c1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ruby-1.8: => 1.8.7-p249 [security update]

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

mysql-ruby: => 2.8.2

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

passenger: => 2.2.11; give the spell some more love

diff --git a/ruby-raa/mysql-ruby/DETAILS b/ruby-raa/mysql-ruby/DETAILS
index 450810e..dbe09d1 100755
--- a/ruby-raa/mysql-ruby/DETAILS
+++ b/ruby-raa/mysql-ruby/DETAILS
@@ -1,15 +1,15 @@
SPELL=mysql-ruby
- VERSION=2.7.3
+ VERSION=2.8.2
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.tmtm.org/downloads/mysql/ruby/$SOURCE
WEB_SITE=http://www.tmtm.org/en/mysql/ruby/README.html
-
SOURCE_HASH=sha512:d9fbb40cea668825fb63e6a0d3d3cb4bf6cc1193cab667e6657d0670a8c97ed39281ee4ff944177a9962bc69b068862b9a62a18bc3a0dc6c36788d6ec2ce70eb
+
SOURCE_HASH=sha512:f39bba5679031bab2d78bc5cb44bb00e7818c1f94e20af374e7b843ced85981e82f185f7442962728165abf9afa9f4d384e3ff6ca22c32320cf4bfa3af84c0e6
LICENSE[0]=GPL
ENTERED=20050506
DOCS="README.html COPYING tommy.css"
KEYWORDS="mysql ruby database"
- SHORT="This is MySQL API module for Ruby."
+ SHORT="MySQL API module for Ruby"
cat << EOF
This is MySQL API module for Ruby. It provides the same functions for
Ruby programs that the MySQL C API does for C programs
diff --git a/ruby-raa/mysql-ruby/HISTORY b/ruby-raa/mysql-ruby/HISTORY
index 33721fe..27f73b4 100644
--- a/ruby-raa/mysql-ruby/HISTORY
+++ b/ruby-raa/mysql-ruby/HISTORY
@@ -1,3 +1,6 @@
+2010-03-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.2; quoting paths; corrected desc
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/ruby-raa/passenger/BUILD b/ruby-raa/passenger/BUILD
index 5b8b0c0..1d1dc92 100755
--- a/ruby-raa/passenger/BUILD
+++ b/ruby-raa/passenger/BUILD
@@ -1,8 +1,11 @@
-# the hack with this is it has to be installed somewhere then built there,
then kept around :/
+if list_find "$OPTS" "APACHE=1"; then
+ rake apache2
+fi &&

-unpack_file &&
-cd $SOURCE_DIRECTORY &&
-# apply hax to the Rakefile
-sed -i -e "s|-I/usr/local/include|-I/usr/local/include
-I/usr/include/apr-1|" Rakefile &&
-rake clean apache2
+if is_depends_enabled $SPELL nginx; then
+ rake nginx
+fi &&

+rm -rf old.binaries old.libraries &&
+
+find "$SOURCE_DIRECTORY" -name '*.[a|o]' -delete
diff --git a/ruby-raa/passenger/DEPENDS b/ruby-raa/passenger/DEPENDS
index 5ca7e59..8faede4 100755
--- a/ruby-raa/passenger/DEPENDS
+++ b/ruby-raa/passenger/DEPENDS
@@ -1,4 +1,11 @@
-depends RUBY &&
-depends rubygems &&
-depends rake &&
-depends APACHE
+depends ruby-1.8 &&
+depends rubygems &&
+depends rake &&
+
+# use fake flags to check dependency
+optional_depends APACHE2 \
+ "APACHE=1" \
+ "APACHE=0" \
+ "to build Apache 2 module" &&
+
+optional_depends nginx "" "" "to build Nginx module"
diff --git a/ruby-raa/passenger/DETAILS b/ruby-raa/passenger/DETAILS
index 7cb6046..f5001f7 100755
--- a/ruby-raa/passenger/DETAILS
+++ b/ruby-raa/passenger/DETAILS
@@ -1,15 +1,16 @@
SPELL=passenger
- VERSION=2.2.5
- RAAID=63009
+ VERSION=2.2.11
+ RAAID=69546
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://rubyforge.org/frs/download.php/$RAAID/$SOURCE
WEB_SITE=http://www.modrails.com/
-
SOURCE_HASH=sha512:c4e778455d7fa4b7e120b1a38a81574847b40001a5f78a9341593563caf558af781af702a8d6c2946cab18bd81c131d8bf0ecc3e2231a75d47765aa1cb04c880
+
SOURCE_HASH=sha512:364a1234e821f58a65eeba42568a952f13b67b8420bd4b5e303fa10cfa6bbac6332c88bc32f13160f0b52ea236615a37ff485003e3209aca18c857fe06dcac17
LICENSE[0]=GPL
ENTERED=20080628
- KEYWORDS="ruby rails apache"
- SHORT="The mod_rails for apache"
+ KEYWORDS="ruby rails apache nginx"
+ SHORT="mod_rails for apache/nginx webservers"
cat << EOF
-Passenger provides a way to integrate ruby on rails apps with apache
+Easy and robust deployment of Ruby on Rails applications on Apache and Nginx
+webservers.
EOF
diff --git a/ruby-raa/passenger/HISTORY b/ruby-raa/passenger/HISTORY
index ce8f8dd..f57b7a1 100644
--- a/ruby-raa/passenger/HISTORY
+++ b/ruby-raa/passenger/HISTORY
@@ -1,3 +1,8 @@
+2010-03-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.11; quoting paths; updated
descriptions
+ * DEPENDS: cleaned up; depends on ruby-1.8
+ * BUILD, INSTALL: correctly build and install the modules
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/ruby-raa/passenger/INSTALL b/ruby-raa/passenger/INSTALL
index c7cecb4..c25773e 100755
--- a/ruby-raa/passenger/INSTALL
+++ b/ruby-raa/passenger/INSTALL
@@ -1,2 +1,10 @@
-mkdir -p $INSTALL_ROOT/usr/lib/passenger &&
-cp -av $SOURCE_DIRECTORY/* $INSTALL_ROOT/usr/lib/passenger
+local INSTALL_DIR="$INSTALL_ROOT/usr/lib/passenger" &&
+
+mkdir -vp "$INSTALL_DIR" &&
+
+cp -av "$SOURCE_DIRECTORY"/* "$INSTALL_DIR" &&
+
+if list_find "$OPTS" "APACHE=1"; then
+ ln -vsf "$INSTALL_DIR/ext/apache2/mod_passenger.so" \
+ "$INSTALL_ROOT/usr/libexec/mod_passenger.so"
+fi
diff --git a/ruby-raa/ruby-1.8/BUILD b/ruby-raa/ruby-1.8/BUILD
index 2789a74..c78087c 100755
--- a/ruby-raa/ruby-1.8/BUILD
+++ b/ruby-raa/ruby-1.8/BUILD
@@ -1,3 +1,3 @@
-OPTS="$OPTS --enable-shared --enable-pthread" &&
+OPTS="$OPTS --enable-shared --enable-pthread" &&
CFLAGS="${CFLAGS/-fomit-frame-pointer/}" &&
default_build
diff --git a/ruby-raa/ruby-1.8/DETAILS b/ruby-raa/ruby-1.8/DETAILS
index ac86787..a225335 100755
--- a/ruby-raa/ruby-1.8/DETAILS
+++ b/ruby-raa/ruby-1.8/DETAILS
@@ -1,12 +1,12 @@
SPELL=ruby-1.8
PACKAGE=ruby
- VERSION=1.8.7-p174
+ VERSION=1.8.7-p249
SOURCE=$PACKAGE-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:183994aab4a75ca74676c20b850a63b365634c35d02378be006cf28def3efe33b7894720fa160d794086c3405b76344f7fff166e955d53a50274fe414c9181b1
- SECURITY_PATCH=6
+
SOURCE_HASH=sha512:106a6ffdd9b3d646b900294a8f20af084204ee6051255a593d155a984adde897a2195b9fa32171cd834d7e11d8ffedd28f5c96cb0a73fc0af134148da07f4686
+ SECURITY_PATCH=7
SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/stable/$SOURCE
SOURCE_URL[1]=ftp://www.ibiblio.org/pub/languages/ruby/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$PACKAGE-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$PACKAGE-$VERSION"
LICENSE[0]=GPL
KEYWORDS="devel"
WEB_SITE=http://www.ruby-lang.org/
diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index fda24d5..323c0da 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,6 @@
+2010-03-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.7-p249; SECURITY_PATCH++; quoting
paths
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL: copied from ruby
* CONFIGURE: use RUBY_DOC var from original ruby spell as default



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (41e7561970afaf7f97d7014b6eed94d7263c67c1), Vlad Glagolev, 03/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page