[Lunar-commits] <moonbase> apache2: version bumped to 2.2.15.

[Florin Braescu]

commit d21a7e5e8146add37121af2d4f966a2842b22380
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sat Mar 6 09:38:13 2010 +0200

    apache2: version bumped to 2.2.15.
    
    Security release, with many bugfixes.
---
 web/apache2/BUILD     |    8 ++++----
 web/apache2/CONFLICTS |    2 +-
 web/apache2/DEPENDS   |    3 ++-
 web/apache2/DETAILS   |    6 +++---
 web/apache2/services  |   12 ++++++------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/web/apache2/BUILD b/web/apache2/BUILD
index b6aad34..d6f2506 100644
--- a/web/apache2/BUILD
+++ b/web/apache2/BUILD
@@ -29,10 +29,10 @@
     OPTS="$OPTS --with-mpm=worker"
   fi
 
-  echo "CFLAGS=$CFLAGS"     &&
-  echo "OPTS=$OPTS"         &&
-  ./configure $OPTS         &&
-  default_make              &&
+  echo "CFLAGS=$CFLAGS"  &&
+  echo "OPTS=$OPTS"      &&
+  ./configure $OPTS      &&
+  default_make           &&
 
   if [ ! -e /usr/sbin/httpsd ] ; then
     ln -s httpd /usr/sbin/httpsd
diff --git a/web/apache2/CONFLICTS b/web/apache2/CONFLICTS
index d458f2d..dfb9084 100644
--- a/web/apache2/CONFLICTS
+++ b/web/apache2/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts  apache-mod_ssl  &&
+conflicts  apache-mod_ssl
 conflicts  apache
diff --git a/web/apache2/DEPENDS b/web/apache2/DEPENDS
index 1ddde3e..e085fe8 100644
--- a/web/apache2/DEPENDS
+++ b/web/apache2/DEPENDS
@@ -9,5 +9,6 @@ optional_depends  "db"                     \
 optional_depends  "gdbm"            \
                   "--with-gdbm"     \
                   "--without-gdbm"  \
-                  "for gdbm support"        
+                  "for gdbm support"
+
 
diff --git a/web/apache2/DETAILS b/web/apache2/DETAILS
index a6d9586..82d4c2e 100644
--- a/web/apache2/DETAILS
+++ b/web/apache2/DETAILS
@@ -1,13 +1,13 @@
           MODULE=apache2
-         VERSION=2.2.14
+         VERSION=2.2.15
         BASENAME=httpd
           SOURCE=$BASENAME-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$BASENAME-$VERSION
       SOURCE_URL=http://www.apache.org/dist/$BASENAME
-      SOURCE_VFY=sha1:eacd04c87b489231ae708c84a77dc8e9ee176fd2
+      SOURCE_VFY=sha1:5f0e973839ed2e38a4d03adba109ef5ce3381bc2
         WEB_SITE=http://www.apache.org
          ENTERED=20020710
-         UPDATED=20091004
+         UPDATED=20100307
            SHORT="A popular HTTP server"
 
 cat << EOF
diff --git a/web/apache2/services b/web/apache2/services
index d3a6a6c..fbb18f2 100644
--- a/web/apache2/services
+++ b/web/apache2/services
@@ -1,6 +1,6 @@
-www		80/tcp
-www		80/udp
-http		80/tcp
-http		80/udp
-https		443/tcp
-https		443/udp
+www             80/tcp
+www             80/udp
+http            80/tcp
+http            80/udp
+https           443/tcp
+https           443/udp