[SM-Commit] GIT changes to master grimoire by Eric Sandall (027747e71db04fc9dfa7d38abb3eb9dadb320251)

Eric Sandall scm at sourcemage.org
Fri Nov 30 02:27:43 EST 2007


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                            |    3 +++
 apache.gpg                           |binary
 dev/null                             |binary
 http/apache2/DETAILS                 |   26 +++++++++++++++-----------
 http/apache2/HISTORY                 |    4 ++++
 http/apache2/httpd-2.0.61.tar.gz.asc |    7 -------
 http/apache2/httpd.gpg               |    0 
 libs/apr-util0/DETAILS               |   13 ++++++++-----
 libs/apr-util0/HISTORY               |    8 ++++++--
 libs/apr0/DETAILS                    |   12 +++++++-----
 libs/apr0/HISTORY                    |    7 ++++++-
 11 files changed, 49 insertions(+), 31 deletions(-)

New commits:
commit 027747e71db04fc9dfa7d38abb3eb9dadb320251
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    apr0: Cleanup HISTORY formatting

commit 0515ed6ec8d136abf645e3490e6e77e23b7936c0
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    apr-util0: Cleanup HISTORY formatting

commit 70fe864074019bf9ead50db203db6066ddb66ff1
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    apr-util0: Updated to 0.9.15 and use upstream apache.gpg

commit 4c36e45b55c3d09a2039bc05db0cda2fc42db5ab
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    apr0: Updated to 0.9.17 and use apache.gpg

commit 5f610c39e1bc49d198e494b39c1da9ff91eb9815
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    apache2: Clean up extra spaces

commit aa6226b96ac27bf863e26c0fd10d83ddd45842fb
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    * Move httpd.gpg from http/apache to grimoire-level apache.gpg
    * apache2: Use upstream key in apache.gpg

diff --git a/ChangeLog b/ChangeLog
index 05a4499..a4aa32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-11-29 Eric Sandall <sandalle at sourcemage.org>
+	* httpd/apache2/httpd.gpg: Moved to grimoire level apache.gpg
+
 2007-11-29 Ismael Luceno <ismael at sourcemage.org>
 	* smgl/initng: new spell, the next generation init system
 	* smgl/initng-ifiles: new spell, initng scripts
diff --git a/apache.gpg b/apache.gpg
new file mode 100644
index 0000000..80be0d2
Binary files /dev/null and b/apache.gpg differ
diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS
index f658e6a..5561be2 100755
--- a/http/apache2/DETAILS
+++ b/http/apache2/DETAILS
@@ -1,10 +1,14 @@
            SPELL=apache2
          VERSION=2.0.61
           SOURCE=httpd-$VERSION.tar.gz
-     SOURCE_GPG="httpd.gpg:${SOURCE}.asc:UPSTREAM_KEY"
+         SOURCE2=$SOURCE.asc
+     SOURCE_GPG="apache.gpg:${SOURCE}.asc:UPSTREAM_KEY"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
    SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
    SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
+  SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
+  SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2
+  SOURCE2_IGNORE=signature
   SECURITY_PATCH=2
       PATCHLEVEL=0
       LICENSE[0]=APACHE
@@ -13,18 +17,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
          ENTERED=20020422
            SHORT="Apache 2 HTTP server"
 cat << EOF
-The Apache Group is proud to announce the release the first GA release of 
-Apache 2.0. Apache 2.0 has been running on the Apache.org website since 
+The Apache Group is proud to announce the release the first GA release of
+Apache 2.0. Apache 2.0 has been running on the Apache.org website since
 December of 2000 and has proven to be very reliable.
 
-Apache 2.0 offers numerous enhancements, improvements and performance 
-boosts over the 1.3 codebase. The most visible and noteworthy addition 
-is the ability to run Apache in a hybrid thread/process mode on any 
-platform that supports both threads and processes. This has shown to 
-improve the scalability of the Apache HTTP Server significantly in our 
-testing. Apache 2.0 also includes support for filtered I/O. This allows 
-modules to modify the output of other modules before it is sent to the 
-client. We have also included support for IPv6 on any platform that 
+Apache 2.0 offers numerous enhancements, improvements and performance
+boosts over the 1.3 codebase. The most visible and noteworthy addition
+is the ability to run Apache in a hybrid thread/process mode on any
+platform that supports both threads and processes. This has shown to
+improve the scalability of the Apache HTTP Server significantly in our
+testing. Apache 2.0 also includes support for filtered I/O. This allows
+modules to modify the output of other modules before it is sent to the
+client. We have also included support for IPv6 on any platform that
 supports IPv6.
 
 Apache is the world's most popular HTTP server, being quite possibly
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 6abdb03..274fb0f 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,7 @@
+2007-11-29 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Use upstream apache.gpg
+	  Cleaned up extra spaces in long description
+
 2007-09-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.61, SECURITY_PATCH=2
 	  CVE-2007-3847, CVE-2007-1863, CVE-2006-5752, CVE-2007-3304
diff --git a/http/apache2/httpd-2.0.61.tar.gz.asc b/http/apache2/httpd-2.0.61.tar.gz.asc
deleted file mode 100644
index b51c800..0000000
--- a/http/apache2/httpd-2.0.61.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (Darwin)
-
-iD8DBQBG3bjkizpgHwjJdeURAnqeAJ0dZrvd6Iu2q1kNoZ7B+mRdF6izYQCeM1Li
-Yqkmoz1yEtTEdzst6S+Zf0s=
-=sysN
------END PGP SIGNATURE-----
diff --git a/http/apache2/httpd.gpg b/http/apache2/httpd.gpg
deleted file mode 100644
index 80be0d2..0000000
Binary files a/http/apache2/httpd.gpg and /dev/null differ
diff --git a/libs/apr-util0/DETAILS b/libs/apr-util0/DETAILS
index 3969faf..51645da 100755
--- a/libs/apr-util0/DETAILS
+++ b/libs/apr-util0/DETAILS
@@ -3,8 +3,7 @@ if [ -f $DEPENDS_CONFIG/apr0.p ]; then
 fi
 
            SPELL=apr-util0
-         VERSION=0.9.12
-     SOURCE_HASH='sha512:1dcf0e851469fc1e91e2df2690340274aff88837c34311ae205e6594d553f47c9f43adb475fb3e278df662e55e2b2ffebd9b6a745bffb0759faaa8005927291a'
+         VERSION=0.9.15
        REPOS_URI=branches/0.9.x
 if [[ "$APR_LATEST" == y ]]; then
          VERSION=${VERSION%\.*}-HEAD
@@ -13,13 +12,17 @@ if [[ "$APR_LATEST" == y ]]; then
    SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION
 fi
           SOURCE=apr-util-$VERSION.tar.bz2
+         SOURCE2=$SOURCE.asc
+      SOURCE_GPG="apache.gpg:$SOURCE.asc:UPSTREAM_KEY"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-util-$VERSION
    SOURCE_URL[0]=http://archive.apache.org/dist/apr/$SOURCE
-        WEB_SITE=http://apr.apache.org/
-      LICENSE[0]=APACHE
-         ENTERED=20030302
+  SOURCE2_URL[0]=http://archive.apache.org/dist/apr/$SOURCE2
+  SOURCE2_IGNORE=signature
       PATCHLEVEL=1
+      LICENSE[0]=APACHE
+        WEB_SITE=http://apr.apache.org/
         KEYWORDS="libs"
+         ENTERED=20030302
            SHORT='Apache Portable Runtime Utility (APU) Library'
 cat << EOF
 Apache Portable Runtime Utility library provides various services
diff --git a/libs/apr-util0/HISTORY b/libs/apr-util0/HISTORY
index e8b6e91..2a96f81 100644
--- a/libs/apr-util0/HISTORY
+++ b/libs/apr-util0/HISTORY
@@ -1,9 +1,13 @@
+2007-11-29 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.9.15
+	  Use upstream apache.gpg key and signatures
+
 2007-02-22 David Kowis <dkowis at shlrm.org>
 	* DEPENDS: delinting, put source statement in an if
 
 2006-10-20 Juuso Alasuutari <iuso at sourcemage.org>
-	* TRIGGERS: Substituted broken conditional with 
-	  is_depends_enabled, changed 'on_cast db cast_self' to 
+	* TRIGGERS: Substituted broken conditional with
+	  is_depends_enabled, changed 'on_cast db cast_self' to
 	  check_self, added PATCHLEVEL=1, removed UPDATED.
 
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
diff --git a/libs/apr0/DETAILS b/libs/apr0/DETAILS
index 09159a1..c22c623 100755
--- a/libs/apr0/DETAILS
+++ b/libs/apr0/DETAILS
@@ -1,6 +1,5 @@
            SPELL=apr0
-         VERSION=0.9.12
-     SOURCE_HASH='sha512:5cd7dab6bc62e8e7c6fe36f36149acc175d6038690abb48471edb0f3865dcfb5e8efa1e462ef3ceee5aa0c39ab3d005fc698c6bf2abeb2cdb364b4327f1bba80'
+         VERSION=0.9.17
        REPOS_URI=branches/0.9.x
 if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
          VERSION=${VERSION%\.*}-HEAD
@@ -9,14 +8,17 @@ if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
    SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION
 fi
           SOURCE=apr-$VERSION.tar.bz2
+         SOURCE2=$SOURCE.asc
+      SOURCE_GPG="apache.gpg:$SOURCE.asc:UPSTREAM_KEY"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-$VERSION
    SOURCE_URL[0]=http://www.apache.org/dist/apr/$SOURCE
-        WEB_SITE=http://apr.apache.org/
+  SOURCE2_URL[0]=http://www.apache.org/dist/apr/$SOURCE2
+  SOURCE2_IGNORE=signature
       LICENSE[0]=APACHE
       MAKE_NJOBS=1
-         ENTERED=20030302
-         UPDATED=20050122
+        WEB_SITE=http://apr.apache.org/
         KEYWORDS="libs"
+         ENTERED=20030302
            SHORT='The Apache Portable Runtime (APR) library'
 cat << EOF
 The mission of the Apache Portable Runtime (APR) is to provide a free library
diff --git a/libs/apr0/HISTORY b/libs/apr0/HISTORY
index 542ba09..879315f 100644
--- a/libs/apr0/HISTORY
+++ b/libs/apr0/HISTORY
@@ -1,3 +1,8 @@
+2007-11-29 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.9.17
+	  Use upstream apache.gpg key and signatures
+	  Removed UPDATED
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* PROVIDES: [automated] Fixed invalid entries.
 
@@ -8,7 +13,7 @@
 	* DETAILS: upgrade to 0.9.12.
 
 2006-04-27 David Kowis <dkowis at shlrm.org>
-	* DETAILS: changed source URL to point to our mirror because 
+	* DETAILS: changed source URL to point to our mirror because
 	  it's so old apache doesn't even have it
 
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>



More information about the SM-Commit mailing list