sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 78983 by Sergey A. Lipnevich for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 78983 by Sergey A. Lipnevich for review
Date: Sun, 7 May 2006 19:40:00 +0100 (BST)

Change 78983 by sergey_lipnevich@laptop on 2006/05/07 19:39:32

Bugfixes in http and related updates

Affected files ...

... //sgl/grimoires/devel/http/apachetop/DEPENDS#2 edit
... //sgl/grimoires/devel/http/apachetop/DETAILS#4 edit
... //sgl/grimoires/devel/http/apachetop/HISTORY#6 edit
... //sgl/grimoires/devel/http/mod_dav/DEPENDS#3 edit
... //sgl/grimoires/devel/http/mod_dav/DETAILS#4 edit
... //sgl/grimoires/devel/http/mod_dav/HISTORY#7 edit
... //sgl/grimoires/devel/http/mod_dav/POST_INSTALL#2 delete
... //sgl/grimoires/devel/http/mod_python/DEPENDS#2 edit
... //sgl/grimoires/devel/http/mod_python/DETAILS#7 edit
... //sgl/grimoires/devel/http/mod_python/HISTORY#12 edit
... //sgl/grimoires/devel/http/mod_python/PREPARE#3 edit
... //sgl/grimoires/devel/http/mod_throttle/BUILD#2 edit
... //sgl/grimoires/devel/http/mod_throttle/DEPENDS#3 edit
... //sgl/grimoires/devel/http/mod_throttle/DETAILS#4 edit
... //sgl/grimoires/devel/http/mod_throttle/HISTORY#7 edit
... //sgl/grimoires/devel/http/mod_throttle/POST_INSTALL#2 delete
... //sgl/grimoires/devel/http/spyce/BUILD#2 edit
... //sgl/grimoires/devel/http/spyce/DEPENDS#2 edit
... //sgl/grimoires/devel/http/spyce/DETAILS#4 edit
... //sgl/grimoires/devel/http/spyce/HISTORY#6 edit
... //sgl/grimoires/devel/http/spyce/INSTALL#1 add
... //sgl/grimoires/devel/http/w3m/DEPENDS#2 edit
... //sgl/grimoires/devel/http/w3m/HISTORY#7 edit
... //sgl/grimoires/devel/libs/apr-util0/DETAILS#10 edit
... //sgl/grimoires/devel/libs/apr-util0/HISTORY#11 edit
... //sgl/grimoires/devel/libs/apr0/DETAILS#11 edit
... //sgl/grimoires/devel/libs/apr0/HISTORY#14 edit

Differences ...

==== //sgl/grimoires/devel/http/apachetop/DEPENDS#2 (xtext) ====

@@ -1,17 +1,18 @@
+# Technically, Apache is not required to build Apachetop
depends APACHE &&
+
depends readline &&
depends ncurses &&

-optional_depends pcre \
- "--with-pcre" \
- "--without-pcre" \
- "Enable support for Perl compatible regular
-expressions." &&
-optional_depends FAM \
- "--with-fam" \
- "--without-fam" \
- "Support for File alteration" &&
-optional_depends adns \
- "--with-adns" \
- "--without-adns" \
- "Support for asynchronous-capable DNS library"
+optional_depends pcre \
+ '--with-pcre' \
+ '--without-pcre' \
+ 'Support for Perl compatible regular expressions' &&
+optional_depends FAM \
+ '--with-fam' \
+ '--without-fam' \
+ 'Support for file alteration' &&
+optional_depends adns \
+ '--with-adns' \
+ '--without-adns' \
+ 'Support for asynchronous-capable DNS library'

==== //sgl/grimoires/devel/http/apachetop/DETAILS#4 (xtext) ====

@@ -1,18 +1,19 @@
- SPELL=apachetop
- VERSION=0.12
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION/
- SOURCE_URL[0]=http://clueful.shagged.org/apachetop/files/$SOURCE
- WEB_SITE=http://clueful.shagged.org/apachetop/
- ENTERED=20040716
- UPDATED=20040716
-
SOURCE_HASH=sha512:954bd46984b88f1aba219b62dd42b805e8b10f8eb59570562645cddaea6b75edfc00b36ff0be50e6af16c688f7095112d8464aa049ca89d61350b8a35960359d
- LICENSE[0]=GPL
-KEYWORDS="http"
- SHORT="ApacheTop is a Top like monitor for Apache"
+ SPELL=apachetop
+ VERSION=0.12.6
+
SOURCE_HASH='sha512:35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a'
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION/
+ SOURCE_URL[0]=http://www.webta.org/$SPELL/$SOURCE
+ WEB_SITE=http://www.webta.org/projects/$SPELL/
+ ENTERED=20040716
+ UPDATED=20040716
+ BUILD_API=2
+ GCC_VERSION=3.4
+ LICENSE[0]=GPL
+ KEYWORDS='http'
+ SHORT='ApacheTop is a Top like monitor for Apache'
cat <<EOF
ApacheTop was written because there are no other realtime tools (that I
could find) to display what your Apache server is doing in a concise
helpful display
EOF
-

==== //sgl/grimoires/devel/http/apachetop/HISTORY#6 (text) ====

@@ -1,3 +1,7 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: use GCC 3.4; update URLs;
+ * DETAILS,DEPENDS: remove tabs.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/http/mod_dav/DEPENDS#3 (xtext) ====

@@ -1,6 +1,1 @@
-if spell_ok apache ; then depends apache ;
-elif spell_ok apache-mod_ssl; then depends apache-mod_ssl;
-else
- message "${PROBLEM_COLOR}Apache 1.3.x must be present as one of spells:
apache or apache-mod_ssl${DEFAULT_COLOR}"
- return 1
-fi
+depends APACHE1

==== //sgl/grimoires/devel/http/mod_dav/DETAILS#4 (xtext) ====

@@ -6,9 +6,9 @@

SOURCE_HASH=sha512:9f2320a1862278fb668120d617742bf6dd688b4355de76782c214b9e82066573430d0c9099f4a25050b0e3032ca399e96c4cd0ac4af686d813e4eb8f6beb19ab
LICENSE[0]=BSD
WEB_SITE=http://www.webdav.org/mod_dav/
- MAINTAINER=sam AT sourcemage.sk
ENTERED=20030312
UPDATED=20030403
+ BUILD_API=2
KEYWORDS="web http"
SHORT='Apache module to provide DAV capabilities (RFC 2518) for
your Apache web server'
cat << EOF

==== //sgl/grimoires/devel/http/mod_dav/HISTORY#7 (text) ====

@@ -1,3 +1,8 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DEPENDS: use provider tag APACHE1;
+ * DETAILS: build API 2;
+ * POST_INSTALL: obsolete.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/http/mod_python/DEPENDS#2 (xtext) ====

@@ -1,2 +1,6 @@
-depends APACHE &&
+if [[ "$MODPY_APACHE" =~ 1 ]]; then
+ depends APACHE1
+else
+ depends APACHE2
+fi &&
depends python

==== //sgl/grimoires/devel/http/mod_python/DETAILS#7 (xtext) ====

@@ -1,5 +1,5 @@
SPELL=mod_python
-if [[ "$MOD_PYTHON_BRANCH" == 2 ]]; then
+if [[ "$MODPY_APACHE" =~ 1 ]]; then
VERSION=2.7.11
MD5[0]='2d3db408f5dff50098d312b88e59226b'
else

==== //sgl/grimoires/devel/http/mod_python/HISTORY#12 (text) ====

@@ -1,3 +1,6 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * PREPARE,DEPENDS,DETAILS: change Apache dependency mechanism.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/http/mod_python/PREPARE#3 (xtext) ====

@@ -1,9 +1,1 @@
-if httpd -v | grep -q "Apache/2\."; then
- MOD_PYTHON_BRANCH=3
-elif httpd -v | grep -q "Apache/1\."; then
- MOD_PYTHON_BRANCH=2
-else
- message "${PROBLEM_COLOR}Could not determine Apache
version!${DEFAULT_COLOR}"
- return 1
-fi
-persistent_add MOD_PYTHON_BRANCH
+config_query_list MODPY_APACHE 'Select Apache version' Apache1 Apache2

==== //sgl/grimoires/devel/http/mod_throttle/BUILD#2 (xtext) ====

@@ -1,7 +1,1 @@
-(
-
- make &&
- prepare_install &&
- make install
-
-) >$C_FIFO 2>&1
+make

==== //sgl/grimoires/devel/http/mod_throttle/DEPENDS#3 (xtext) ====

@@ -1,6 +1,1 @@
-if spell_ok apache ; then depends apache ;
-elif spell_ok apache-mod_ssl; then depends apache-mod_ssl;
-else
- message "${PROBLEM_COLOR}Apache 1.3.x must be present as one of spells:
apache or apache-mod_ssl${DEFAULT_COLOR}"
- return 1
-fi
+depends APACHE1

==== //sgl/grimoires/devel/http/mod_throttle/DETAILS#4 (xtext) ====

@@ -9,6 +9,7 @@
MAINTAINER=sam AT sourcemage.sk
ENTERED=20030312
UPDATED=20030403
+ BUILD_API=2
KEYWORDS="http"
SHORT='mod_throttle is a module to provide virtual server
throttling for Apache 1.3.x'
cat << EOF

==== //sgl/grimoires/devel/http/mod_throttle/HISTORY#7 (text) ====

@@ -1,3 +1,8 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DEPENDS: use APACHE1 dependency;
+ * DETAILS,BUILD: use API 2;
+ * POST_INSTALL: obsolete.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/http/spyce/BUILD#2 (xtext) ====

@@ -1,1 +1,1 @@
-make
+true

==== //sgl/grimoires/devel/http/spyce/DEPENDS#2 (xtext) ====

@@ -1,3 +1,3 @@
-depends mod_python &&
+depends python &&

-optional_depends 'Cheetah' '' '' 'for the Python template engine'
+optional_depends cheetah '' '' 'for the Python template engine'

==== //sgl/grimoires/devel/http/spyce/DETAILS#4 (xtext) ====

@@ -1,7 +1,7 @@
SPELL=spyce
- VERSION=1.3.11-1
- SOURCE=$SPELL-$VERSION.tgz
-
SOURCE_HASH=sha512:8d5dde5e351ea55ebfd8bbfb66d5bd6dd558078dd1f9eb97e1a1f701f6a394dc0ed4c45552e682d0670f001534e1b5a9e7ad9d1a0125598ae6ae6826501fc6fc
+ VERSION=2.0.3-1
+
SOURCE_HASH='sha512:666885b80917e87ea4c42469c1cd2aa18350e218156dc1e6232749fd5b1611a359f8e5b53339152e156d975c00c91ed95c5d03b161d0a04b931a40be136c28b9'
+ SOURCE=$SPELL-$VERSION.tar.gz
LICENSE[0]=Apache
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/-*/}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

==== //sgl/grimoires/devel/http/spyce/HISTORY#6 (text) ====

@@ -1,3 +1,8 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 2.0.3-1;
+ * DEPENDS: remove mod_python and add python; lo-case cheetah;
+ * BUILD,INSTALL: simply copy files as spyce site suggests.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/http/w3m/DEPENDS#2 (xtext) ====

@@ -1,6 +1,3 @@
-depends ncurses &&
-depends libgc &&
-optional_depends "openssl" \
- "--with-ssl" \
- "--without-ssl" \
- "for https, secure socket layer, encryption"
+depends ncurses &&
+depends libgc &&
+depends openssl '--with-ssl'

==== //sgl/grimoires/devel/http/w3m/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DEPENDS: requires OpenSSL.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/libs/apr-util0/DETAILS#10 (xtext) ====

@@ -1,8 +1,8 @@
source $DEPENDS_CONFIG/apr0.p

SPELL=apr-util0
- VERSION=0.9.7
-
SOURCE_HASH='sha512:013751ed542b6020cdec8203d4b435a754d7be0ee87d2ce641266332ddb353de8993b958a651a52c5239bdd5fd225118d0cf876948760064a60ce6a2eb033e0b'
+ VERSION=0.9.12
+
SOURCE_HASH='sha512:1dcf0e851469fc1e91e2df2690340274aff88837c34311ae205e6594d553f47c9f43adb475fb3e278df662e55e2b2ffebd9b6a745bffb0759faaa8005927291a'
REPOS_URI=branches/0.9.x
if [[ "$APR_LATEST" == y ]]; then
VERSION=${VERSION%\.*}-HEAD
@@ -12,7 +12,7 @@
fi
SOURCE=apr-util-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-util-$VERSION
-
SOURCE_URL[0]=${SOURCE_URL[0]:-http://download.sourcemage.org/mirror/$SOURCE}
+ SOURCE_URL[0]=http://www.apache.org/dist/apr/$SOURCE
WEB_SITE=http://apr.apache.org/
LICENSE[0]=APACHE
BUILD_API=2

==== //sgl/grimoires/devel/libs/apr-util0/HISTORY#11 (text) ====

@@ -1,3 +1,9 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 0.9.12.
+
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * 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 it's so
old
apache doesn't have it anymore

==== //sgl/grimoires/devel/libs/apr0/DETAILS#11 (xtext) ====

@@ -1,6 +1,6 @@
SPELL=apr0
- VERSION=0.9.7
-
SOURCE_HASH='sha512:411eb2b5b4e31b5418db253cd0849612d3b925895e25e23b26a14e344896576c77e9f835496b588015e8dda8ad957099946504207111c54940ecbdf58bafd763'
+ VERSION=0.9.12
+
SOURCE_HASH='sha512:5cd7dab6bc62e8e7c6fe36f36149acc175d6038690abb48471edb0f3865dcfb5e8efa1e462ef3ceee5aa0c39ab3d005fc698c6bf2abeb2cdb364b4327f1bba80'
REPOS_URI=branches/0.9.x
if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
VERSION=${VERSION%\.*}-HEAD
@@ -10,7 +10,7 @@
fi
SOURCE=apr-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-$VERSION
-
SOURCE_URL[0]=${SOURCE_URL[0]:-http://download.sourcemage.org/mirror/$SOURCE}
+ SOURCE_URL[0]=http://www.apache.org/dist/apr/$SOURCE
WEB_SITE=http://apr.apache.org/
LICENSE[0]=APACHE
BUILD_API=2

==== //sgl/grimoires/devel/libs/apr0/HISTORY#14 (text) ====

@@ -1,3 +1,9 @@
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 0.9.12.
+
+2006-05-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * 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
it's so old apache doesn't even have it

[SM-Commit] PERFORCE change 78983 by Sergey A. Lipnevich for review, Perforce Review Daemon, 05/07/2006
- Re: [SM-Commit] PERFORCE change 78983 by Sergey A. Lipnevich for review, Arwed von Merkatz, 05/07/2006