[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jan-2009 11:31:43
Branch: HEAD Handle: 2009012510314200
Modified files:
openpkg-src/apache apache.spec
Log:
add more proxy sub-modules and enable logio module for %I/%O logging
specifiers
Summary:
RevisionChanges Path
1.444 +4 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.443 -r1.444 apache.spec
--- openpkg-src/apache/apache.spec24 Jan 2009 21:53:28 - 1.443
+++ openpkg-src/apache/apache.spec25 Jan 2009 10:31:42 - 1.444
@@ -32,7 +32,7 @@
Group:Web
License: ASF
Version: 2.2.11
-Release: 20090124
+Release: 20090125
# package options
%option with_mpm_prefork yes
@@ -213,6 +213,8 @@
--enable-proxy-connect \
--enable-proxy-http \
--enable-proxy-ftp \
+--enable-proxy-ajp \
+--enable-proxy-balancer \
%endif
%if %{with_mod_cache} == yes
--enable-cache \
@@ -242,6 +244,7 @@
--enable-authz-dbm \
--enable-authz-owner \
--enable-unique-id \
+--enable-logio \
--disable-shared
# build package
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 24-Jan-2009 22:53:29
Branch: HEAD Handle: 2009012421532800
Modified files:
openpkg-src/apache apache.spec
Log:
enable mod_dbd (uses APR DBD API and for run-time one has to build APR
with some DBD drivers enabled, of course)
Summary:
RevisionChanges Path
1.443 +6 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.442 -r1.443 apache.spec
--- openpkg-src/apache/apache.spec14 Dec 2008 10:07:08 - 1.442
+++ openpkg-src/apache/apache.spec24 Jan 2009 21:53:28 - 1.443
@@ -32,7 +32,7 @@
Group:Web
License: ASF
Version: 2.2.11
-Release: 20081214
+Release: 20090124
# package options
%option with_mpm_prefork yes
@@ -47,6 +47,7 @@
%option with_mod_ssl no
%option with_mod_dav no
%option with_mod_ldap no
+%option with_mod_dbd no
%option with_mod_proxyno
%option with_mod_cacheno
%option with_mod_diskcacheno
@@ -203,6 +204,10 @@
--enable-ldap \
--enable-authnz-ldap \
%endif
+%if %{with_mod_dbd} == yes
+--enable-dbd \
+--enable-authn-dbd \
+%endif
%if %{with_mod_proxy} == yes
--enable-proxy \
--enable-proxy-connect \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Nov-2008 09:38:51
Branch: HEAD Handle: 2008111008385000
Modified files:
openpkg-src/apache apache.spec rc.apache
Log:
provide daily cache expiring
Summary:
RevisionChanges Path
1.439 +1 -0 openpkg-src/apache/apache.spec
1.28+6 -0 openpkg-src/apache/rc.apache
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.438 -r1.439 apache.spec
--- openpkg-src/apache/apache.spec10 Nov 2008 08:25:03 - 1.438
+++ openpkg-src/apache/apache.spec10 Nov 2008 08:38:50 - 1.439
@@ -281,6 +281,7 @@
# install run-command script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
+-e 's;with_mod_filecache;%{with_mod_filecache};g' \
%{SOURCE rc.apache} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ .
patch -p0 '@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.27 -r1.28 rc.apache
--- openpkg-src/apache/rc.apache 27 Jul 2007 16:07:03 - 1.27
+++ openpkg-src/apache/rc.apache 10 Nov 2008 08:38:50 - 1.28
@@ -23,9 +23,11 @@
apache_cgi_rotcomplevel=9
apache_cgi_rotprolog=true
apache_cgi_rotepilog=true
+apache_cachesize=10M
%common
apache_pidfile=@l_prefix@/var/apache/run/apache.pid
+apache_cachedir=@l_prefix@/var/apache/run/apache.cache
apache_signal () {
[ -f $apache_pidfile ] kill -$1 `cat $apache_pidfile`
}
@@ -87,6 +89,10 @@
-P $apache_cgi_rotprolog \
-E $apache_cgi_rotepilog; echo 1 $hintfile \
${apache_cgi_files}
+if [ [EMAIL PROTECTED]@ = .yes ]; then
+@l_prefix@/sbin/htcacheclean \
+-n -t -l $apache_cachesize -p $apache_cachedir
+fi
if [ -s $hintfile ]; then
@l_prefix@/sbin/apache -k graceful
fi
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Nov-2008 08:52:44
Branch: HEAD Handle: 200807524300
Modified files:
openpkg-src/apache apache.spec
Log:
one dependency check too many and fix subst
Summary:
RevisionChanges Path
1.441 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.440 -r1.441 apache.spec
--- openpkg-src/apache/apache.spec11 Nov 2008 07:51:06 - 1.440
+++ openpkg-src/apache/apache.spec11 Nov 2008 07:52:43 - 1.441
@@ -67,7 +67,7 @@
%undefine with_mpm_prefork
%undefine with_mpm_worker
%endif
-%if %{with_mod_memcache} == yes || %{with_mod_diskcache} == yes ||
%{with_mod_filecache} == yes
+%if %{with_mod_memcache} == yes || %{with_mod_diskcache} == yes
%undefine with_mod_cache
%define with_mod_cacheyes
%endif
@@ -281,7 +281,7 @@
# install run-command script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
--e 's;with_mod_filecache;%{with_mod_filecache};g' \
+-e 's;@with_mod_filecache@;%{with_mod_filecache};g' \
%{SOURCE rc.apache} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 15-Oct-2008 08:14:37 Branch: HEAD Handle: 2008101507143600 Modified files: openpkg-src/apache apache.spec Log: upgrading package: apache 2.2.9 - 2.2.10 Summary: RevisionChanges Path 1.437 +2 -2 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.436 -r1.437 apache.spec --- openpkg-src/apache/apache.spec26 Jul 2008 18:38:54 - 1.436 +++ openpkg-src/apache/apache.spec15 Oct 2008 06:14:36 - 1.437 @@ -31,8 +31,8 @@ Class:BASE Group:Web License: ASF -Version: 2.2.9 -Release: 20080726 +Version: 2.2.10 +Release: 20081015 # package options %option with_mpm_prefork yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Apr-2008 11:50:34
Branch: HEAD Handle: 2008040210503300
Modified files:
openpkg-src/apache apache.spec
Log:
use bzip2 compressed tarball
Summary:
RevisionChanges Path
1.434 +3 -3 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.433 -r1.434 apache.spec
--- openpkg-src/apache/apache.spec29 Feb 2008 10:47:20 - 1.433
+++ openpkg-src/apache/apache.spec2 Apr 2008 09:50:33 - 1.434
@@ -32,7 +32,7 @@
Group:Web
License: ASF
Version: 2.2.8
-Release: 20080229
+Release: 20080402
# package options
%option with_mpm_prefork yes
@@ -73,7 +73,7 @@
%endif
# list of sources
-Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
+Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: rc.apache
Source2: apache.base
Source3: apache.conf
@@ -121,7 +121,7 @@
prog apache = {
version = %{version}
url = http://www.apache.org/dist/httpd/
-regex = httpd-(2\.\d*[02468]\.\d+)\.tar\.gz
+regex = httpd-(2\.\d*[02468]\.\d+)\.tar\.(bz2|gz)
}
%prep
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Feb-2008 11:47:21
Branch: HEAD Handle: 2008022910472000
Modified files:
openpkg-src/apache apache.spec
Log:
add optional support for mod_ext_filter
Summary:
RevisionChanges Path
1.433 +4 -0 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.432 -r1.433 apache.spec
--- openpkg-src/apache/apache.spec29 Feb 2008 10:42:18 - 1.432
+++ openpkg-src/apache/apache.spec29 Feb 2008 10:47:20 - 1.433
@@ -42,6 +42,7 @@
%option with_suexec_caller%{l_nusr}
%option with_suexec_userdir public_html
%option with_mod_deflate no
+%option with_mod_ext_filter no
%option with_mod_substitute no
%option with_mod_ssl no
%option with_mod_dav no
@@ -184,6 +185,9 @@
--enable-deflate \
--with-z=%{l_prefix} \
%endif
+%if %{with_mod_ext_filter} == yes
+--enable-ext-filter \
+%endif
%if %{with_mod_substitute} == yes
--enable-substitute \
%endif
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Jan-2008 08:19:51 Branch: HEAD Handle: 2008011807195000 Modified files: openpkg-src/apache apache.spec Log: upgrading package: apache 2.2.6 - 2.2.8 Summary: RevisionChanges Path 1.431 +2 -2 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.430 -r1.431 apache.spec --- openpkg-src/apache/apache.spec1 Jan 2008 14:50:41 - 1.430 +++ openpkg-src/apache/apache.spec18 Jan 2008 07:19:50 - 1.431 @@ -31,8 +31,8 @@ Class:BASE Group:Web License: ASF -Version: 2.2.6 -Release: 20080101 +Version: 2.2.8 +Release: 20080118 # package options %option with_mpm_prefork yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Nov-2007 10:50:25
Branch: HEAD Handle: 2007112109502500
Modified files:
openpkg-src/apache apache.spec
Log:
Added with_mod_authn_alias option which is needed for the splitted
mail/uid access on Kolab servers.
Summary:
RevisionChanges Path
1.428 +5 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.427 -r1.428 apache.spec
--- openpkg-src/apache/apache.spec10 Sep 2007 18:20:04 - 1.427
+++ openpkg-src/apache/apache.spec21 Nov 2007 09:50:25 - 1.428
@@ -33,7 +33,7 @@
Group:Web
License: ASF
Version: 2.2.6
-Release: 20070910
+Release: 20071121
# package options
%option with_mpm_prefork yes
@@ -51,6 +51,7 @@
%option with_mod_diskcacheno
%option with_mod_memcache no
%option with_mod_filecacheno
+%option with_mod_authn_alias no
# fixing implicit inter-module dependencies and correlations
%if %{with_mpm_prefork} == yes
@@ -213,6 +214,9 @@
%if %{with_mod_filecache} == yes
--enable-file-cache \
%endif
+%if %{with_mod_authn_alias} == yes
+--enable-authn-alias
+%endif
--enable-expires \
--enable-so \
--enable-speling \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Nov-2007 11:01:35
Branch: HEAD Handle: 2007112110013400
Modified files:
openpkg-src/apache apache.spec
Log:
fix line break
Summary:
RevisionChanges Path
1.429 +1 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.428 -r1.429 apache.spec
--- openpkg-src/apache/apache.spec21 Nov 2007 09:50:25 - 1.428
+++ openpkg-src/apache/apache.spec21 Nov 2007 10:01:34 - 1.429
@@ -215,7 +215,7 @@
--enable-file-cache \
%endif
%if %{with_mod_authn_alias} == yes
---enable-authn-alias
+--enable-authn-alias \
%endif
--enable-expires \
--enable-so \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 30-Jul-2007 15:53:43 Branch: HEAD Handle: 2007073014534200 Modified files: openpkg-src/apache apache.spec Log: there is no official apache13 package Summary: RevisionChanges Path 1.424 +1 -2 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.423 -r1.424 apache.spec --- openpkg-src/apache/apache.spec27 Jul 2007 16:07:03 - 1.423 +++ openpkg-src/apache/apache.spec30 Jul 2007 13:53:42 - 1.424 @@ -33,7 +33,7 @@ Group:Web License: ASF Version: 2.2.4 -Release: 20070727 +Release: 20070730 # package options %option with_mpm_prefork yes @@ -103,7 +103,6 @@ %endif AutoReq: no AutoReqProv: no -Conflicts:apache13 %description The Apache Project is a collaborative software development effort @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Jul-2007 09:58:44
Branch: HEAD Handle: 2007072308584300
Modified files:
openpkg-src/apache apache.spec
Log:
fix tracking
Summary:
RevisionChanges Path
1.422 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.421 -r1.422 apache.spec
--- openpkg-src/apache/apache.spec19 Jul 2007 17:47:01 - 1.421
+++ openpkg-src/apache/apache.spec23 Jul 2007 07:58:43 - 1.422
@@ -33,7 +33,7 @@
Group:Web
License: ASF
Version: 2.2.4
-Release: 20070719
+Release: 20070723
# package options
%option with_mpm_prefork yes
@@ -120,7 +120,7 @@
prog apache = {
version = %{version}
url = http://www.apache.org/dist/httpd/
-regex = httpd-(2.[02468]\.\d+)\.tar\.gz
+regex = httpd-(2\.\d*[02468]\.\d+)\.tar\.gz
}
%prep
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Jun-2007 20:49:58 Branch: HEAD Handle: 2007062819495800 Modified files: openpkg-src/apache apache.spec Log: enable digest authentication and ownership authentication to be available by default, please Summary: RevisionChanges Path 1.418 +3 -1 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.417 -r1.418 apache.spec --- openpkg-src/apache/apache.spec26 Jun 2007 19:38:59 - 1.417 +++ openpkg-src/apache/apache.spec28 Jun 2007 18:49:58 - 1.418 @@ -33,7 +33,7 @@ Group:Web License: ASF Version: 2.2.4 -Release: 20070626 +Release: 20070628 # package options %option with_mpm_prefork yes @@ -222,8 +222,10 @@ --enable-info \ --enable-mime-magic \ --enable-vhost-alias \ +--enable-auth-digest \ --enable-auth-dbm \ --enable-authz-dbm \ +--enable-authz-owner \ --enable-unique-id \ --disable-shared @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jun-2007 21:38:59
Branch: HEAD Handle: 2007062620385900
Modified files:
openpkg-src/apache apache.spec
Log:
fix RDF indexing and 'openpkg build': non-boolean %options are allowed
in OpenPKG packages, but never when used for conditional prerequisites
Summary:
RevisionChanges Path
1.417 +32 -37 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.416 -r1.417 apache.spec
--- openpkg-src/apache/apache.spec25 Jun 2007 20:21:44 - 1.416
+++ openpkg-src/apache/apache.spec26 Jun 2007 19:38:59 - 1.417
@@ -33,17 +33,15 @@
Group:Web
License: ASF
Version: 2.2.4
-Release: 20070625
+Release: 20070626
-# package options (generic)
-%option with_mpm prefork
-
-# package options (suexec related)
+# package options
+%option with_mpm_prefork yes
+%option with_mpm_worker no
+%option with_mpm_eventno
%option with_suexec yes
%option with_suexec_caller%{l_nusr}
%option with_suexec_userdir public_html
-
-# package options (additionally used Apache modules)
%option with_mod_deflate no
%option with_mod_ssl no
%option with_mod_dav no
@@ -55,6 +53,18 @@
%option with_mod_filecacheno
# fixing implicit inter-module dependencies and correlations
+%if %{with_mpm_prefork} == yes
+%undefine with_mpm_worker
+%undefine with_mpm_event
+%endif
+%if %{with_mpm_worker} == yes
+%undefine with_mpm_prefork
+%undefine with_mpm_event
+%endif
+%if %{with_mpm_event} == yes
+%undefine with_mpm_prefork
+%undefine with_mpm_worker
+%endif
%if %{with_mod_memcache} == yes || %{with_mod_diskcache} == yes
%undefine with_mod_cache
%define with_mod_cacheyes
@@ -75,7 +85,7 @@
PreReq: OpenPKG, openpkg = 20060823, perl
BuildPreReq: apr, pcre
PreReq: apr, pcre
-%if %{with_mpm} == worker || %{with_mpm} == event ||
%{with_mod_memcache} == yes
+%if %{with_mpm_worker} == yes || %{with_mpm_event} == yes ||
%{with_mod_memcache} == yes
BuildPreReq: apr::with_threads = yes
PreReq: apr::with_threads = yes
%endif
@@ -114,17 +124,6 @@
}
%prep
-# some pre-flight checks on options specified
-%if %{with_mpm} != prefork %{with_mpm} != worker %{with_mpm}
!= event
-( echo Invalid value specified for option 'with_mpm'. Currently the
- echo only supported Multi-Processing Modules (MPMs) are ...
- echo - 'prefork' -- non-threaded, pre-forking web server (default)
- echo - 'worker' -- hybrid multi-threaded multi-process web server
- echo - 'event' -- event-based I/O multiplexing web server
-) | %{l_rpmtool} msg -b -t error
-exit 1
-%endif
-
# unpack Apache distribution
%setup -q -n httpd-%{version}
%patch -p0
@@ -144,11 +143,6 @@
case %{l_platform -t} in
*-sunos* ) LIBS=$LIBS -lrt ;;
esac
-%if %{with_mpm} == worker || %{with_mpm} == event ||
%{with_mod_memcache} == yes
-THREADS=--enable-threads
-%else
-THREADS=--disable-threads
-%endif
%if %{with_mod_ldap} == yes
LIBS=$LIBS -lssl -lcrypto
%endif
@@ -162,11 +156,23 @@
--includedir=%{l_prefix}/include/apache \
--datadir=%{l_prefix}/share/apache \
--localstatedir=%{l_prefix}/var/apache \
---with-mpm=%{with_mpm} \
--with-apr=%{l_prefix}/bin/apr-1-config \
--with-apr-util=%{l_prefix}/bin/apu-1-config \
--with-pcre=%{l_prefix} \
-$THREADS \
+%if %{with_mpm_prefork} == yes
+--with-mpm=prefork \
+%endif
+%if %{with_mpm_worker} == yes
+--with-mpm=worker \
+%endif
+%if %{with_mpm_event} == yes
+--with-mpm=event \
+%endif
+%if %{with_mpm_worker} == yes || %{with_mpm_event} == yes ||
%{with_mod_memcache} == yes
+--enable-threads \
+%else
+--disable-threads \
+%endif
%if %{with_suexec} == yes
--enable-suexec \
--with-suexec-bin=%{l_prefix}/sbin/suexec \
@@ -221,17 +227,6 @@
--enable-unique-id \
--disable-shared
-# check whether
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2007 22:21:45
Branch: HEAD Handle: 2007062521214400
Modified files:
openpkg-src/apache apache.spec
Log:
require APR with support for threads where needed
Summary:
RevisionChanges Path
1.416 +5 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.415 -r1.416 apache.spec
--- openpkg-src/apache/apache.spec23 Jun 2007 07:44:23 - 1.415
+++ openpkg-src/apache/apache.spec25 Jun 2007 20:21:44 - 1.416
@@ -33,7 +33,7 @@
Group:Web
License: ASF
Version: 2.2.4
-Release: 20070623
+Release: 20070625
# package options (generic)
%option with_mpm prefork
@@ -75,6 +75,10 @@
PreReq: OpenPKG, openpkg = 20060823, perl
BuildPreReq: apr, pcre
PreReq: apr, pcre
+%if %{with_mpm} == worker || %{with_mpm} == event ||
%{with_mod_memcache} == yes
+BuildPreReq: apr::with_threads = yes
+PreReq: apr::with_threads = yes
+%endif
%if %{with_mod_ldap} == yes
BuildPreReq: apr::with_ldap = yes
PreReq: apr::with_ldap = yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 23-Jun-2007 09:44:24 Branch: HEAD Handle: 2007062308442300 Modified files: openpkg-src/apache apache.spec rc.apache Log: we already check whether apache is already running or not so we don't need to pass '-k start' Summary: RevisionChanges Path 1.415 +1 -1 openpkg-src/apache/apache.spec 1.26+1 -1 openpkg-src/apache/rc.apache patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.414 -r1.415 apache.spec --- openpkg-src/apache/apache.spec22 Jun 2007 19:28:44 - 1.414 +++ openpkg-src/apache/apache.spec23 Jun 2007 07:44:23 - 1.415 @@ -33,7 +33,7 @@ Group:Web License: ASF Version: 2.2.4 -Release: 20070622 +Release: 20070623 # package options (generic) %option with_mpm prefork @@ . patch -p0 '@@ .' Index: openpkg-src/apache/rc.apache $ cvs diff -u -r1.25 -r1.26 rc.apache --- openpkg-src/apache/rc.apache 22 Jun 2007 17:36:08 - 1.25 +++ openpkg-src/apache/rc.apache 23 Jun 2007 07:44:23 - 1.26 @@ -46,7 +46,7 @@ ( cd @l_prefix@/var/apache/run [ -e @l_prefix@/etc/apache/apache.sh ] . @l_prefix@/etc/apache/apache.sh - @l_prefix@/sbin/apache -k start + @l_prefix@/sbin/apache ) || exit $? %stop -u @l_susr@ @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2007 17:25:39
Branch: HEAD Handle: 2007062216253800
Modified files:
openpkg-src/apache apache.spec
Log:
we currently have options here for very special things and mod_expires
is main-stream nowadays anyway
Summary:
RevisionChanges Path
1.410 +0 -3 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.409 -r1.410 apache.spec
--- openpkg-src/apache/apache.spec22 Jun 2007 14:50:01 - 1.409
+++ openpkg-src/apache/apache.spec22 Jun 2007 15:25:38 - 1.410
@@ -53,7 +53,6 @@
%option with_mod_diskcacheno
%option with_mod_memcache no
%option with_mod_filecacheno
-%option with_mod_expires no
# fixing implicit inter-module dependencies and correlations
%if %{with_mod_memcache} == yes || %{with_mod_diskcache} == yes
@@ -205,9 +204,7 @@
%if %{with_mod_filecache} == yes
--enable-file-cache \
%endif
-%if %{with_mod_expires} == yes
--enable-expires \
-%endif
--enable-so \
--enable-speling \
--enable-rewrite \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2007 21:06:50
Branch: HEAD Handle: 2007062220065000
Modified files:
openpkg-src/apache apache.spec
Log:
cleanup the packaging a little but further by shrinking dependencies
and removing more installed files
Summary:
RevisionChanges Path
1.413 +6 -4 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.412 -r1.413 apache.spec
--- openpkg-src/apache/apache.spec22 Jun 2007 16:42:07 - 1.412
+++ openpkg-src/apache/apache.spec22 Jun 2007 19:06:50 - 1.413
@@ -73,8 +73,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20060823, perl, make
PreReq: OpenPKG, openpkg = 20060823, perl
-BuildPreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
-PreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
+BuildPreReq: apr, apr::with_db = yes, pcre
+PreReq: apr, apr::with_db = yes, pcre
%if %{with_mod_ldap} == yes
BuildPreReq: apr::with_ldap = yes
PreReq: apr::with_ldap = yes
@@ -235,8 +235,6 @@
# install Apache
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.conf
-rm -fr $RPM_BUILD_ROOT%{l_prefix}/etc/apache/{extra,original}
# adjust permissions
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars
@@ -275,6 +273,10 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# strip down installation
+find $RPM_BUILD_ROOT%{l_prefix}/share/apache -name *.orig -print |
xargs rm -f
+rm -f $RPM_BUILD_ROOT%{l_prefix}/share/apache/htdocs/apache_pb*
+rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/{extra,original}
+rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/apache
rm -f $RPM_BUILD_ROOT%{l_prefix}/cgi/test-cgi
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* /dev/null 21 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* /dev/null 21 || true
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2007 21:28:44
Branch: HEAD Handle: 2007062220284400
Modified files:
openpkg-src/apache apache.spec
Log:
Apache's htdbm can select was is available
Summary:
RevisionChanges Path
1.414 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.413 -r1.414 apache.spec
--- openpkg-src/apache/apache.spec22 Jun 2007 19:06:50 - 1.413
+++ openpkg-src/apache/apache.spec22 Jun 2007 19:28:44 - 1.414
@@ -73,8 +73,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20060823, perl, make
PreReq: OpenPKG, openpkg = 20060823, perl
-BuildPreReq: apr, apr::with_db = yes, pcre
-PreReq: apr, apr::with_db = yes, pcre
+BuildPreReq: apr, pcre
+PreReq: apr, pcre
%if %{with_mod_ldap} == yes
BuildPreReq: apr::with_ldap = yes
PreReq: apr::with_ldap = yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Jun-2007 08:57:55
Branch: HEAD Handle: 2007060807575400
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070601 - 20070608
Summary:
RevisionChanges Path
1.406 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.405 -r1.406 apache.spec
--- openpkg-src/apache/apache.spec1 Jun 2007 17:30:14 - 1.405
+++ openpkg-src/apache/apache.spec8 Jun 2007 06:57:54 - 1.406
@@ -52,7 +52,7 @@
%define V_mod_php_suhosin_p 5.2.3-0.9.6.2
%define V_mod_relocate 1.0
%define V_mod_roaming1.0.2
-%define V_mod_security 1.9.4
+%define V_mod_security 1.9.5
%define V_mod_ssl2.8.28-1.3.37
%define V_mod_throttle 312
%define V_suphp 0.6.2
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070601
+Release: 20070608
# package options (Apache core related)
%option with_hard_server_limit256
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-Jun-2007 19:30:15 Branch: HEAD Handle: 2007060118301400 Modified files: openpkg-src/apache apache.spec Log: modifying package: apache-1.3.37 20070601 again Summary: RevisionChanges Path 1.405 +1 -1 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.404 -r1.405 apache.spec --- openpkg-src/apache/apache.spec1 Jun 2007 09:52:57 - 1.404 +++ openpkg-src/apache/apache.spec1 Jun 2007 17:30:14 - 1.405 @@ -49,7 +49,7 @@ %define V_mod_php5.2.3 %define V_mod_php_hardened 5.1.6-0.4.15 %define V_mod_php_suhosin_e 0.9.20 -%define V_mod_php_suhosin_p 5.2.2-0.9.6.2 +%define V_mod_php_suhosin_p 5.2.3-0.9.6.2 %define V_mod_relocate 1.0 %define V_mod_roaming1.0.2 %define V_mod_security 1.9.4 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-May-2007 09:05:31
Branch: HEAD Handle: 2007052008053000
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070507 - 20070520
Summary:
RevisionChanges Path
1.403 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.402 -r1.403 apache.spec
--- openpkg-src/apache/apache.spec7 May 2007 15:54:02 - 1.402
+++ openpkg-src/apache/apache.spec20 May 2007 07:05:30 - 1.403
@@ -48,7 +48,7 @@
%define V_mod_perl 1.30
%define V_mod_php5.2.2
%define V_mod_php_hardened 5.1.6-0.4.15
-%define V_mod_php_suhosin_e 0.9.19
+%define V_mod_php_suhosin_e 0.9.20
%define V_mod_php_suhosin_p 5.2.2-0.9.6.2
%define V_mod_relocate 1.0
%define V_mod_roaming1.0.2
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070507
+Release: 20070520
# package options (Apache core related)
%option with_hard_server_limit256
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-May-2007 17:54:03
Branch: HEAD Handle: 2007050716540200
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070504 - 20070507
Summary:
RevisionChanges Path
1.402 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.401 -r1.402 apache.spec
--- openpkg-src/apache/apache.spec4 May 2007 06:10:44 - 1.401
+++ openpkg-src/apache/apache.spec7 May 2007 15:54:02 - 1.402
@@ -49,7 +49,7 @@
%define V_mod_php5.2.2
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_php_suhosin_e 0.9.19
-%define V_mod_php_suhosin_p 5.2.1-0.9.6.2
+%define V_mod_php_suhosin_p 5.2.2-0.9.6.2
%define V_mod_relocate 1.0
%define V_mod_roaming1.0.2
%define V_mod_security 1.9.4
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070504
+Release: 20070507
# package options (Apache core related)
%option with_hard_server_limit256
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-May-2007 08:10:45
Branch: HEAD Handle: 2007050407104400
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070501 - 20070504
Summary:
RevisionChanges Path
1.401 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.400 -r1.401 apache.spec
--- openpkg-src/apache/apache.spec1 May 2007 18:12:47 - 1.400
+++ openpkg-src/apache/apache.spec4 May 2007 06:10:44 - 1.401
@@ -46,7 +46,7 @@
%define V_mod_layout 3.4
%define V_mod_macro 1.1.2
%define V_mod_perl 1.30
-%define V_mod_php5.2.1
+%define V_mod_php5.2.2
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_php_suhosin_e 0.9.19
%define V_mod_php_suhosin_p 5.2.1-0.9.6.2
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070501
+Release: 20070504
# package options (Apache core related)
%option with_hard_server_limit256
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-May-2007 20:12:48
Branch: HEAD Handle: 2007050119124700
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070419 - 20070501
Summary:
RevisionChanges Path
1.400 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.399 -r1.400 apache.spec
--- openpkg-src/apache/apache.spec19 Apr 2007 16:05:56 - 1.399
+++ openpkg-src/apache/apache.spec1 May 2007 18:12:47 - 1.400
@@ -48,7 +48,7 @@
%define V_mod_perl 1.30
%define V_mod_php5.2.1
%define V_mod_php_hardened 5.1.6-0.4.15
-%define V_mod_php_suhosin_e 0.9.18
+%define V_mod_php_suhosin_e 0.9.19
%define V_mod_php_suhosin_p 5.2.1-0.9.6.2
%define V_mod_relocate 1.0
%define V_mod_roaming1.0.2
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070419
+Release: 20070501
# package options (Apache core related)
%option with_hard_server_limit256
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-src/php/ php.sp...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Apr-2007 21:59:47
Branch: HEAD Handle: 2007041620594601
Modified files:
openpkg-src/apache apache.spec
openpkg-src/php php.spec
Log:
make sure PHP detects our PostgreSQL 8.x as such and not as an ancient
PostgreSQL 6.x. This especially makes sure all the additional PHP
functions like pg_escape_string() are available.
Summary:
RevisionChanges Path
1.398 +4 -1 openpkg-src/apache/apache.spec
1.149 +4 -1 openpkg-src/php/php.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.397 -r1.398 apache.spec
--- openpkg-src/apache/apache.spec15 Apr 2007 16:13:05 - 1.397
+++ openpkg-src/apache/apache.spec16 Apr 2007 19:59:46 - 1.398
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070415
+Release: 20070416
# package options (Apache core related)
%option with_hard_server_limit256
@@ -785,6 +785,9 @@
%if %{with_mod_php_bdb} == yes
LIBS=$LIBS -ldb
%endif
+%if %{with_mod_php_pgsql} == yes
+ LIBS=$LIBS `pg_config --libs`
+%endif
%if %{with_mod_php_oci8} == yes
ORACLE_HOME=`%{l_rc} --query oracle_home`
export ORACLE_HOME
@@ .
patch -p0 '@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.148 -r1.149 php.spec
--- openpkg-src/php/php.spec 12 Apr 2007 07:55:50 - 1.148
+++ openpkg-src/php/php.spec 16 Apr 2007 19:59:47 - 1.149
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070412
+Release: 20070416
# package options
%option with_suhosin no
@@ -321,6 +321,9 @@
%if %{with_bdb} == yes
libs=$libs -ldb
%endif
+%if %{with_pgsql} == yes
+libs=$libs `pg_config --libs`
+%endif
%if %{with_oci8} == yes
ORACLE_HOME=`%{l_rc} --query oracle_home`
export ORACLE_HOME
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-src/php/ php.sp...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Apr-2007 09:55:52
Branch: HEAD Handle: 2007041208555001
Modified files:
openpkg-src/apache apache.spec
openpkg-src/php php.spec
Log:
added PHP SimpleXML support
Summary:
RevisionChanges Path
1.394 +13 -1 openpkg-src/apache/apache.spec
1.148 +13 -1 openpkg-src/php/php.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.393 -r1.394 apache.spec
--- openpkg-src/apache/apache.spec11 Apr 2007 06:41:37 - 1.393
+++ openpkg-src/apache/apache.spec12 Apr 2007 07:55:51 - 1.394
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070411
+Release: 20070412
# package options (suexec related)
%option with_suexec yes
@@ -141,6 +141,7 @@
%option with_mod_php_pcre no
%option with_mod_php_pgsqlno
%option with_mod_php_sendmail no
+%option with_mod_php_simplexmlno
%option with_mod_php_snmp no
%option with_mod_php_sqlite no
%option with_mod_php_ssl no
@@ -378,6 +379,10 @@
BuildPreReq: MTA
PreReq: MTA
%endif
+%if %{with_mod_php_simplexml} == yes
+BuildPreReq: libxml
+PreReq: libxml
+%endif
%if %{with_mod_php_snmp} == yes
BuildPreReq: snmp
PreReq: snmp
@@ -875,6 +880,13 @@
--with-imap=%{l_prefix} \
--with-imap-ssl=%{l_prefix} \
%endif
+%if %{with_mod_php_simplexml} == yes
+ --enable-simplexml \
+ --enable-libxml \
+ --with-libxml-dir=%{l_prefix} \
+%else
+ --disable-simplexml \
+%endif
%if %{with_mod_php_xml} == yes
--enable-xml \
--enable-libxml \
@@ .
patch -p0 '@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.147 -r1.148 php.spec
--- openpkg-src/php/php.spec 6 Mar 2007 17:07:38 - 1.147
+++ openpkg-src/php/php.spec 12 Apr 2007 07:55:50 - 1.148
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070306
+Release: 20070412
# package options
%option with_suhosin no
@@ -74,6 +74,7 @@
%option with_pear no
%option with_pgsqlno
%option with_sendmail no
+%option with_simplexmlno
%option with_snmp no
%option with_sqlite no
%option with_ssl no
@@ -233,6 +234,10 @@
BuildPreReq: MTA
PreReq: MTA
%endif
+%if %{with_simplexml} == yes
+BuildPreReq: libxml
+PreReq: libxml
+%endif
AutoReq: no
AutoReqProv: no
@@ -460,6 +465,13 @@
%else
--without-pear \
%endif
+%if %{with_simplexml} == yes
+--enable-simplexml \
+--enable-libxml \
+--with-libxml-dir=%{l_prefix} \
+%else
+--disable-simplexml \
+%endif
%if %{with_snmp} == yes
--with-snmp=%{l_prefix} \
--with-openssl-dir=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Apr-2007 08:41:38
Branch: HEAD Handle: 2007041107413700
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070410 - 20070411
Summary:
RevisionChanges Path
1.393 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.392 -r1.393 apache.spec
--- openpkg-src/apache/apache.spec10 Apr 2007 12:08:30 - 1.392
+++ openpkg-src/apache/apache.spec11 Apr 2007 06:41:37 - 1.393
@@ -43,7 +43,7 @@
%define V_mod_evasive1.10.1
%define V_mod_fastcgi2.4.2
%define V_mod_gzip 1.3.26.1a
-%define V_mod_layout 3.3
+%define V_mod_layout 3.4
%define V_mod_macro 1.1.2
%define V_mod_perl 1.30
%define V_mod_php5.2.1
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070410
+Release: 20070411
# package options (suexec related)
%option with_suexec yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Mar-2007 10:06:25
Branch: HEAD Handle: 2007032409062500
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070314 - 20070324
Summary:
RevisionChanges Path
1.388 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.387 -r1.388 apache.spec
--- openpkg-src/apache/apache.spec14 Mar 2007 19:26:08 - 1.387
+++ openpkg-src/apache/apache.spec24 Mar 2007 09:06:25 - 1.388
@@ -43,7 +43,7 @@
%define V_mod_evasive1.10.1
%define V_mod_fastcgi2.4.2
%define V_mod_gzip 1.3.26.1a
-%define V_mod_layout 3.2.1
+%define V_mod_layout 3.3
%define V_mod_macro 1.1.2
%define V_mod_perl 1.29
%define V_mod_php5.2.1
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070314
+Release: 20070324
# package options (suexec related)
%option with_suexec yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Mar-2007 12:13:42
Branch: HEAD Handle: 2007030911134100
Modified files:
openpkg-src/apache apache.spec
Log:
add optional support for building against QDBM for NDBM support (not
storage compatible to GDBM's NDBM, of course)
Summary:
RevisionChanges Path
1.385 +16 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.384 -r1.385 apache.spec
--- openpkg-src/apache/apache.spec6 Mar 2007 17:05:00 - 1.384
+++ openpkg-src/apache/apache.spec9 Mar 2007 11:13:41 - 1.385
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070306
+Release: 20070309
# package options (suexec related)
%option with_suexec yes
@@ -153,6 +153,7 @@
# package options (braindead ones only)
%option with_gdbm_ndbmyes
+%option with_qdbm_ndbmno
%option with_shared_core no
%option with_shared_chain no
@@ -242,6 +243,10 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20060823
PreReq: OpenPKG, openpkg = 20060823
+%if %{with_qdbm_ndbm} == yes
+BuildPreReq: qdbm
+PreReq: qdbm
+%endif
%if %{with_gdbm_ndbm} == yes
BuildPreReq: gdbm, gdbm::with_ndbm = yes
PreReq: gdbm, gdbm::with_ndbm = yes
@@ -1166,8 +1171,17 @@
ldflags=$ldflags %{l_ldflags}
libs=$libs -lndbm -lgdbm
%endif
+%if %{with_qdbm_ndbm} == yes
+ cflags=$cflags %{l_cppflags qdbm .}
+ ldflags=$ldflags %{l_ldflags}
+ libs=$libs -lqdbm
+ %{l_shtool} subst \
+ -e 's;ndbm\.h;qdbm/relic.h;g' \
+ src/modules/standard/mod_auth_dbm.c \
+ src/modules/standard/mod_rewrite.c
+%endif
%if %{with_mod_php} == yes %{with_mod_php_mssql} == yes
- ldflags=$ldflags %{l_ldflags freetds}
+ ldflags=$ldflags %{l_ldflags freetds}
%endif
%if %{with_mod_php} == yes %{with_mod_php_oci8} == yes
# workaround Oracle inter-library depencency by explicitly
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Mar-2007 18:05:00
Branch: HEAD Handle: 200703061705
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070305 - 20070306
Summary:
RevisionChanges Path
1.384 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.383 -r1.384 apache.spec
--- openpkg-src/apache/apache.spec5 Mar 2007 06:34:18 - 1.383
+++ openpkg-src/apache/apache.spec6 Mar 2007 17:05:00 - 1.384
@@ -48,7 +48,7 @@
%define V_mod_perl 1.29
%define V_mod_php5.2.1
%define V_mod_php_hardened 5.1.6-0.4.15
-%define V_mod_php_suhosin_e 0.9.17
+%define V_mod_php_suhosin_e 0.9.18
%define V_mod_php_suhosin_p 5.2.1-0.9.6.2
%define V_mod_relocate 1.0
%define V_mod_roaming1.0.2
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070305
+Release: 20070306
# package options (suexec related)
%option with_suexec yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Feb-2007 14:22:58
Branch: HEAD Handle: 2007022413225700
Modified files:
openpkg-src/apache apache.spec
Log:
apply the same GCC optimization bug workaround as in the PHP package
Summary:
RevisionChanges Path
1.381 +6 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.380 -r1.381 apache.spec
--- openpkg-src/apache/apache.spec23 Feb 2007 14:39:19 - 1.380
+++ openpkg-src/apache/apache.spec24 Feb 2007 13:22:57 - 1.381
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070223
+Release: 20070224
# package options (suexec related)
%option with_suexec yes
@@ -732,7 +732,11 @@
CPPFLAGS=%{l_cflags} -g %{l_cppflags}; export CPPFLAGS
LDFLAGS=%{l_cflags} -g %{l_ldflags}; export LDFLAGS
%else
- CFLAGS=%{l_cflags -O} %{l_cppflags}; export CFLAGS
+ case %{l_platform -t} in
+ *-sunos5.10 ) CFLAGS=%{l_cflags} %{l_cppflags};;
+ * ) CFLAGS=%{l_cflags -O} %{l_cppflags} ;;
+ esac
+ export CFLAGS
CPPFLAGS=%{l_cflags -O} %{l_cppflags}; export CPPFLAGS
LDFLAGS=%{l_cflags -O} %{l_ldflags}; export LDFLAGS
%endif
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Feb-2007 19:35:26
Branch: HEAD Handle: 2007022418352600
Modified files:
openpkg-src/apache apache.spec
Log:
fix building of PHP again
Summary:
RevisionChanges Path
1.382 +10 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.381 -r1.382 apache.spec
--- openpkg-src/apache/apache.spec24 Feb 2007 13:22:57 - 1.381
+++ openpkg-src/apache/apache.spec24 Feb 2007 18:35:26 - 1.382
@@ -733,12 +733,17 @@
LDFLAGS=%{l_cflags} -g %{l_ldflags}; export LDFLAGS
%else
case %{l_platform -t} in
- *-sunos5.10 ) CFLAGS=%{l_cflags} %{l_cppflags};;
- * ) CFLAGS=%{l_cflags -O} %{l_cppflags} ;;
+ *-sunos5.10 )
+ CFLAGS=%{l_cflags} %{l_cppflags}; export CFLAGS
+ CPPFLAGS=%{l_cflags} %{l_cppflags}; export CPPFLAGS
+ LDFLAGS=%{l_cflags} %{l_ldflags}; export LDFLAGS
+ ;;
+ * )
+ CFLAGS=%{l_cflags -O} %{l_cppflags}; export CFLAGS
+ CPPFLAGS=%{l_cflags -O} %{l_cppflags}; export CPPFLAGS
+ LDFLAGS=%{l_cflags -O} %{l_ldflags}; export LDFLAGS
+ ;;
esac
- export CFLAGS
- CPPFLAGS=%{l_cflags -O} %{l_cppflags}; export CPPFLAGS
- LDFLAGS=%{l_cflags -O} %{l_ldflags}; export LDFLAGS
%endif
LIBS=; export LIBS
%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Feb-2007 15:39:20
Branch: HEAD Handle: 2007022314391900
Modified files:
openpkg-src/apache apache.spec
Log:
option --with-sqlite is for the ancient, deprecated and buggy SQLite
2.x. This should be not promoted at all any longer. Option
--with-pdo-sqlite is for the current SQLite 3.x in conjunction with
PHP's PDO framework. This should be the only one we promote at this
time.
Summary:
RevisionChanges Path
1.380 +3 -3 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.379 -r1.380 apache.spec
--- openpkg-src/apache/apache.spec8 Feb 2007 21:03:09 - 1.379
+++ openpkg-src/apache/apache.spec23 Feb 2007 14:39:19 - 1.380
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070208
+Release: 20070223
# package options (suexec related)
%option with_suexec yes
@@ -783,11 +783,11 @@
%if %{with_mod_php_calendar} == yes
--enable-calendar \
%endif
+ --without-sqlite \
%if %{with_mod_php_sqlite} == yes
- --with-sqlite=%{l_prefix} \
--with-pdo-sqlite=%{l_prefix} \
%else
- --without-sqlite \
+ --without-pdo-sqlite \
%endif
%if %{with_mod_php_mssql} == yes
--with-mssql=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Feb-2007 09:32:21
Branch: HEAD Handle: 2007020808322100
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20070206 - 20070208
Summary:
RevisionChanges Path
1.378 +3 -3 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.377 -r1.378 apache.spec
--- openpkg-src/apache/apache.spec6 Feb 2007 07:34:23 - 1.377
+++ openpkg-src/apache/apache.spec8 Feb 2007 08:32:21 - 1.378
@@ -46,10 +46,10 @@
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
%define V_mod_perl 1.29
-%define V_mod_php5.2.0
+%define V_mod_php5.2.1
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_php_suhosin_e 0.9.16
-%define V_mod_php_suhosin_p 5.2.0-0.9.6.2
+%define V_mod_php_suhosin_p 5.2.1-0.9.6.2
%define V_mod_relocate 1.0
%define V_mod_roaming1.0.2
%define V_mod_security 1.9.4
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070206
+Release: 20070208
# package options (suexec related)
%option with_suexec yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Feb-2007 10:52:18
Branch: HEAD Handle: 2007020509521700
Modified files:
openpkg-src/apache apache.spec
Log:
rename option 'with_mod_php_xslt' to 'with_mod_php_xsl', since it
specifies a group of functions listed as 'XSL functions' in the PHP
documentation (http://www.php.net/manual/en/ref.xsl.php). Furthermore
it has nothing to do with another group called 'XSLT functions'
(http://www.php.net/manual/en/ref.xslt.php). Thus this option was
mistakable in the past.
Summary:
RevisionChanges Path
1.373 +12 -6 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.372 -r1.373 apache.spec
--- openpkg-src/apache/apache.spec30 Jan 2007 14:10:33 - 1.372
+++ openpkg-src/apache/apache.spec5 Feb 2007 09:52:17 - 1.373
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070130
+Release: 20070205
# package options (suexec related)
%option with_suexec yes
@@ -148,7 +148,7 @@
%option with_mod_php_versioning no
%option with_mod_php_wddx no
%option with_mod_php_xml no
-%option with_mod_php_xslt no
+%option with_mod_php_xsl no
%option with_mod_php_zlib no
# package options (braindead ones only)
@@ -183,6 +183,12 @@
%undefine with_gdbm_ndbm
%define with_gdbm_ndbmyes
%endif
+%if %{with_mod_php_xsl} == yes
+%undefine with_mod_php_dom
+%undefine with_mod_php_xml
+%define with_mod_php_dom yes
+%define with_mod_php_xml yes
+%endif
%endif
%if %{with_mod_ssl} == yes
%undefine with_mod_define
@@ -333,9 +339,9 @@
BuildPreReq: libxml
PreReq: libxml
%endif
-%if %{with_mod_php_xslt} == yes
-BuildPreReq: libxslt
-PreReq: libxslt
+%if %{with_mod_php_xsl} == yes
+BuildPreReq: libxml, libxslt
+PreReq: libxml, libxslt
%endif
%if %{with_mod_php_dom} == yes
BuildPreReq: libxml, libxslt
@@ -860,7 +866,7 @@
%else
--disable-xml \
%endif
-%if %{with_mod_php_xslt} == yes
+%if %{with_mod_php_xsl} == yes
--with-xsl=%{l_prefix} \
%else
--without-xsl \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Feb-2007 07:30:46
Branch: HEAD Handle: 2007020606304500
Modified files:
openpkg-src/apache apache.spec
Log:
with_mod_php_suhosin and with_mod_php_hardened options only make sense
within the with_mod_php scope
Summary:
RevisionChanges Path
1.374 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.373 -r1.374 apache.spec
--- openpkg-src/apache/apache.spec5 Feb 2007 09:52:17 - 1.373
+++ openpkg-src/apache/apache.spec6 Feb 2007 06:30:45 - 1.374
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070205
+Release: 20070206
# package options (suexec related)
%option with_suexec yes
@@ -183,6 +183,10 @@
%undefine with_gdbm_ndbm
%define with_gdbm_ndbmyes
%endif
+%if %{with_mod_php_suhosin} == yes %{with_mod_php_hardened} == yes
+%undefine with_mod_php_hardened
+%define with_mod_php_hardened no
+%endif
%if %{with_mod_php_xsl} == yes
%undefine with_mod_php_dom
%undefine with_mod_php_xml
@@ -194,10 +198,6 @@
%undefine with_mod_define
%define with_mod_define yes
%endif
-%if %{with_mod_php_suhosin} == yes %{with_mod_php_hardened} == yes
-%undefine with_mod_php_hardened
-%define with_mod_php_hardened no
-%endif
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Feb-2007 08:16:20
Branch: HEAD Handle: 2007020607161800
Modified files:
openpkg-src/apache apache.spec
Log:
fix dependency of with_mod_dav by getting it out of the with_mod_php
scope
Summary:
RevisionChanges Path
1.375 +4 -4 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.374 -r1.375 apache.spec
--- openpkg-src/apache/apache.spec6 Feb 2007 06:30:45 - 1.374
+++ openpkg-src/apache/apache.spec6 Feb 2007 07:16:18 - 1.375
@@ -243,6 +243,10 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20060823
PreReq: OpenPKG, openpkg = 20060823
+%if %{with_mod_dav} == yes
+BuildPreReq: expat
+PreReq: expat
+%endif
%if %{with_mod_ssl} == yes
BuildPreReq: openssl, mm
PreReq: openssl, mm
@@ -331,10 +335,6 @@
BuildPreReq: imap, openssl
PreReq: imap, openssl
%endif
-%if %{with_mod_dav} == yes
-BuildPreReq: expat
-PreReq: expat
-%endif
%if %{with_mod_php_xml} == yes
BuildPreReq: libxml
PreReq: libxml
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Feb-2007 08:30:11
Branch: HEAD Handle: 2007020607301100
Modified files:
openpkg-src/apache apache.spec
Log:
trying to get the mess sorted a little bit by putting options in
alphabetical order (at least for description and dependency stuff)
Summary:
RevisionChanges Path
1.376 +117 -116 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.375 -r1.376 apache.spec
--- openpkg-src/apache/apache.spec6 Feb 2007 07:16:18 - 1.375
+++ openpkg-src/apache/apache.spec6 Feb 2007 07:30:11 - 1.376
@@ -83,34 +83,32 @@
%option with_suphp_ugid_check yes
# package options (additionally used Apache modules; can be enabled
without thinking)
-%option with_mod_ssl no
-%option with_mod_define no
-%option with_mod_perl no
-%option with_mod_php no
%option with_mod_dav no
+%option with_mod_define no
%option with_mod_layout no
%option with_mod_macrono
+%option with_mod_perl no
+%option with_mod_php no
+%option with_mod_ssl no
# package options (additionally used Apache modules; you have to know what
you do)
+%option with_mod_access_referer no
+%option with_mod_auth_kerbno
%option with_mod_auth_ldapno
-%option with_mod_auth_radius no
%option with_mod_auth_mysql no
%option with_mod_auth_pam no
-%option with_mod_auth_kerbno
-%option with_mod_gzip no
+%option with_mod_auth_radius no
+%option with_mod_evasive no
%option with_mod_fastcgi no
-%option with_mod_throttle no
-%option with_mod_access_referer no
+%option with_mod_gzip no
%option with_mod_owa no
-%option with_mod_roaming no
%option with_mod_relocate no
+%option with_mod_roaming no
%option with_mod_security no
-%option with_mod_evasive no
+%option with_mod_throttle no
# package options (optional PHP5 specific settings; requires
with_mod_php)
# please note the lack of an PEAR option since PEAR is provided by the
'php' package
-%option with_mod_php_suhosin no
-%option with_mod_php_hardened no
%option with_mod_php_bc no
%option with_mod_php_bdb no
%option with_mod_php_bzip2no
@@ -125,6 +123,7 @@
%option with_mod_php_gd no
%option with_mod_php_gdbm no
%option with_mod_php_gettext no
+%option with_mod_php_hardened no
%option with_mod_php_iconvno
%option with_mod_php_imap no
%option with_mod_php_mbregex no
@@ -144,6 +143,7 @@
%option with_mod_php_snmp no
%option with_mod_php_sqlite no
%option with_mod_php_ssl no
+%option with_mod_php_suhosin no
%option with_mod_php_t1libno
%option with_mod_php_versioning no
%option with_mod_php_wddx no
@@ -243,169 +243,170 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20060823
PreReq: OpenPKG, openpkg = 20060823
+%if %{with_gdbm_ndbm} == yes
+BuildPreReq: gdbm, gdbm::with_ndbm = yes
+PreReq: gdbm, gdbm::with_ndbm = yes
+%endif
+%if %{with_mod_auth_kerb} == yes
+BuildPreReq: kerberos
+PreReq: kerberos
+%endif
+%if %{with_mod_auth_ldap} == yes
+BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
+%endif
+%if %{with_mod_auth_mysql} == yes
+BuildPreReq: mysql
+PreReq: mysql
+%endif
+%if %{with_mod_auth_pam} == yes
+BuildPreReq: PAM
+PreReq: PAM
+%endif
%if %{with_mod_dav} == yes
BuildPreReq: expat
PreReq: expat
%endif
-%if %{with_mod_ssl} == yes
-BuildPreReq: openssl, mm
-PreReq: openssl, mm
+%if %{with_mod_owa} == yes
+BuildPreReq: oracle
+PreReq: oracle
%endif
%if %{with_mod_perl} == yes
BuildPreReq: perl
PreReq: perl
%endif
-%if
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 06-Feb-2007 08:34:23 Branch: HEAD Handle: 2007020607342300 Modified files: openpkg-src/apache apache.spec Log: sort version number section as well Summary: RevisionChanges Path 1.377 +17 -17 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.376 -r1.377 apache.spec --- openpkg-src/apache/apache.spec6 Feb 2007 07:30:11 - 1.376 +++ openpkg-src/apache/apache.spec6 Feb 2007 07:34:23 - 1.377 @@ -33,28 +33,28 @@ # package component versions %define V_apache 1.3.37 -%define V_mod_ssl2.8.28-1.3.37 -%define V_mod_perl 1.29 -%define V_mod_php5.2.0 -%define V_mod_php_suhosin_p 5.2.0-0.9.6.2 -%define V_mod_php_suhosin_e 0.9.16 -%define V_mod_php_hardened 5.1.6-0.4.15 -%define V_mod_dav1.0.3-1.3.6 -%define V_mod_layout 3.2.1 -%define V_mod_macro 1.1.2 -%define V_mod_auth_pam 1.1.1 +%define V_mod_access_referer 1.0.2 +%define V_mod_auth_kerb 5.3 %define V_mod_auth_ldap 2.4.2 -%define V_mod_auth_radius1.5.7 %define V_mod_auth_mysql 3.0.0 -%define V_mod_gzip 1.3.26.1a +%define V_mod_auth_pam 1.1.1 +%define V_mod_auth_radius1.5.7 +%define V_mod_dav1.0.3-1.3.6 +%define V_mod_evasive1.10.1 %define V_mod_fastcgi2.4.2 -%define V_mod_throttle 312 -%define V_mod_access_referer 1.0.2 -%define V_mod_roaming1.0.2 +%define V_mod_gzip 1.3.26.1a +%define V_mod_layout 3.2.1 +%define V_mod_macro 1.1.2 +%define V_mod_perl 1.29 +%define V_mod_php5.2.0 +%define V_mod_php_hardened 5.1.6-0.4.15 +%define V_mod_php_suhosin_e 0.9.16 +%define V_mod_php_suhosin_p 5.2.0-0.9.6.2 %define V_mod_relocate 1.0 +%define V_mod_roaming1.0.2 %define V_mod_security 1.9.4 -%define V_mod_evasive1.10.1 -%define V_mod_auth_kerb 5.3 +%define V_mod_ssl2.8.28-1.3.37 +%define V_mod_throttle 312 %define V_suphp 0.6.2 # package information @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jan-2007 15:10:33
Branch: HEAD Handle: 2007013014103300
Modified files:
openpkg-src/apache apache.spec
Log:
build time fix MS SQL-support
Summary:
RevisionChanges Path
1.372 +6 -10 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.371 -r1.372 apache.spec
--- openpkg-src/apache/apache.spec20 Jan 2007 23:15:44 - 1.371
+++ openpkg-src/apache/apache.spec30 Jan 2007 14:10:33 - 1.372
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070121
+Release: 20070130
# package options (suexec related)
%option with_suexec yes
@@ -572,14 +572,8 @@
ext/gd/config.m4
%if %{with_mod_php_mssql} == yes
%{l_shtool} subst \
- -e 's;\($PHP_MSSQL/include/\)\(tds.h\);\1freetds/\2;g' \
- -e
's;\($FREETDS_INSTALLATION_DIR/lib/\)\(libtds.a\);\1freetds/\2;g' \
- -e
's;\(MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include\);\1/freetds;' \
- -e 's;\(MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib\);\1/freetds;' \
+ -e
's;\($FREETDS_INSTALLATION_DIR/\)$PHP_LIBDIR/\(libtds.a\);\1/lib/freetds/\2;g' \
configure
- %{l_shtool} subst \
- -e 's;^typedef short SHORT\;;;' \
- ext/mssql/php_mssql.h
%endif
) || exit $?
%endif
@@ -792,7 +786,6 @@
%endif
%if %{with_mod_php_mssql} == yes
--with-mssql=%{l_prefix} \
- --with-pdo-mysql=%{l_prefix} \
%else
--without-mssql \
%endif
@@ -1159,7 +1152,10 @@
ldflags=$ldflags %{l_ldflags}
libs=$libs -lndbm -lgdbm
%endif
-%if %{with_mod_php_oci8} == yes
+%if %{with_mod_php} == yes %{with_mod_php_mssql} == yes
+ ldflags=$ldflags %{l_ldflags freetds}
+%endif
+%if %{with_mod_php} == yes %{with_mod_php_oci8} == yes
# workaround Oracle inter-library depencency by explicitly
# linking in all libraries
ldflags=$ldflags `%{l_rc} --query oracle_ldflags`
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jan-2007 15:12:11
Branch: HEAD Handle: 2007011214121000
Modified files:
openpkg-src/apache apache.spec
Log:
fix suPHP support
Summary:
RevisionChanges Path
1.369 +9 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.368 -r1.369 apache.spec
--- openpkg-src/apache/apache.spec1 Jan 2007 17:36:32 - 1.368
+++ openpkg-src/apache/apache.spec12 Jan 2007 14:12:10 - 1.369
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061227
+Release: 20070112
# package options (suexec related)
%option with_suexec yes
@@ -1063,7 +1063,8 @@
--disable-checkuid \
--disable-checkgid \
%endif
- --with-setid-mode=%{with_suphp_ugid_mode}
+ --with-setid-mode=%{with_suphp_ugid_mode} \
+ --disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
%endif
@@ -1137,6 +1138,12 @@
%endif
%if %{with_suphp} == yes
cflags=$cflags -DSUPHP_PATH_TO_SUPHP='\%{l_prefix}/sbin/suphp\'
+
+ # ugly hack to extract flags required for certain modes of
+ # operation of suPHP
+ cflags=$cflags \
+ `sed -n -e 's;^OPT_APACHEMOD_USERGROUP_DEF[]=\(.*\)$;\1;p'
\
+ ../suphp-%{V_suphp}/src/apache/Makefile`
%endif
CC=%{l_cc} \
CFLAGS=$cflags \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Dec-2006 15:35:28
Branch: HEAD Handle: 2006122714352700
Modified files:
openpkg-src/apache apache.spec
Log:
suPHP 0.6.x is a complete rewrite using C++ instead of C
Summary:
RevisionChanges Path
1.366 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.365 -r1.366 apache.spec
--- openpkg-src/apache/apache.spec25 Dec 2006 09:16:13 - 1.365
+++ openpkg-src/apache/apache.spec27 Dec 2006 14:35:27 - 1.366
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061225
+Release: 20061227
# package options (suexec related)
%option with_suexec yes
@@ -393,7 +393,7 @@
PreReq: gdbm, gdbm::with_ndbm = yes
%endif
%if %{with_suphp} == yes
-BuildPreReq: php, gcc
+BuildPreReq: php, gcc, gcc::with_cxx = yes
PreReq: php
%endif
AutoReq: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Dec-2006 18:11:34
Branch: HEAD Handle: 2006122717113400
Modified files:
openpkg-src/apache apache.spec
Log:
remove obsolete man pages as well (and resolve file conflicts with the
php package)
Summary:
RevisionChanges Path
1.367 +1 -0 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.366 -r1.367 apache.spec
--- openpkg-src/apache/apache.spec27 Dec 2006 14:35:27 - 1.366
+++ openpkg-src/apache/apache.spec27 Dec 2006 17:11:34 - 1.367
@@ -1296,6 +1296,7 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php /dev/null 21 || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/{php-config,phpextdist,phpize}
+rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/{php-config,phpize}.1
%endif
# optionally install suPHP wrapper binary
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Dec-2006 10:16:14
Branch: HEAD Handle: 2006122509161300
Modified files:
openpkg-src/apache apache.spec
Log:
fix indent
Summary:
RevisionChanges Path
1.365 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.364 -r1.365 apache.spec
--- openpkg-src/apache/apache.spec4 Dec 2006 18:21:09 - 1.364
+++ openpkg-src/apache/apache.spec25 Dec 2006 09:16:13 - 1.365
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061204
+Release: 20061225
# package options (suexec related)
%option with_suexec yes
@@ -1268,10 +1268,10 @@
# install shell environment script
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- -e 's;@l_path@;%{l_build_path};' \
- -e 's;@l_ld_library_path@;%{l_build_ldlp};' \
- %{SOURCE apache.sh} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/apache/
+-e 's;@l_path@;%{l_build_path};' \
+-e 's;@l_ld_library_path@;%{l_build_ldlp};' \
+%{SOURCE apache.sh} \
+$RPM_BUILD_ROOT%{l_prefix}/etc/apache/
%if %{with_mod_fastcgi} == yes
# provide mod_fastcgi IPC directory
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Dec-2006 19:21:09
Branch: HEAD Handle: 2006120418210900
Modified files:
openpkg-src/apache apache.spec
Log:
URL has changed
Summary:
RevisionChanges Path
1.364 +3 -3 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.363 -r1.364 apache.spec
--- openpkg-src/apache/apache.spec3 Dec 2006 10:42:18 - 1.363
+++ openpkg-src/apache/apache.spec4 Dec 2006 18:21:09 - 1.364
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061203
+Release: 20061204
# package options (suexec related)
%option with_suexec yes
@@ -211,7 +211,7 @@
Source16:
http://switch.dl.sourceforge.net/modauthmysql/mod_auth_mysql-%{V_mod_auth_mysql}.tar.gz
Source17: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
Source18:
http://www.modsecurity.org/download/modsecurity-apache_%{V_mod_security}.tar.gz
-Source19:
http://www.nuclearelephant.com/projects/mod_evasive/mod_evasive_%{V_mod_evasive}.tar.gz
+Source19:
http://www.zdziarski.com/projects/mod_evasive/mod_evasive_%{V_mod_evasive}.tar.gz
Source20: http://www.sharemation.com/~dmcmahon/unix_all.tgz
Source21:
http://www.hardened-php.net/suhosin/_media/suhosin-%{V_mod_php_suhosin_e}.tgz
Source22: apache.conf
@@ -517,7 +517,7 @@
}
prog apache:mod_evasive = {
version = %{V_mod_evasive}
-url = http://www.nuclearelephant.com/projects/mod_evasive/
+url = http://www.zdziarski.com/projects/mod_evasive/
regex = mod_evasive[._-](__VER__)\.tar\.gz
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Dec-2006 11:42:19
Branch: HEAD Handle: 2006120310421800
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20061129 - 20061203
Summary:
RevisionChanges Path
1.363 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.362 -r1.363 apache.spec
--- openpkg-src/apache/apache.spec29 Nov 2006 08:00:22 - 1.362
+++ openpkg-src/apache/apache.spec3 Dec 2006 10:42:18 - 1.363
@@ -37,7 +37,7 @@
%define V_mod_perl 1.29
%define V_mod_php5.2.0
%define V_mod_php_suhosin_p 5.2.0-0.9.6.2
-%define V_mod_php_suhosin_e 0.9.15
+%define V_mod_php_suhosin_e 0.9.16
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061129
+Release: 20061203
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Nov-2006 09:00:23
Branch: HEAD Handle: 2006112908002200
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20061122 - 20061129
Summary:
RevisionChanges Path
1.362 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.361 -r1.362 apache.spec
--- openpkg-src/apache/apache.spec22 Nov 2006 17:10:25 - 1.361
+++ openpkg-src/apache/apache.spec29 Nov 2006 08:00:22 - 1.362
@@ -37,7 +37,7 @@
%define V_mod_perl 1.29
%define V_mod_php5.2.0
%define V_mod_php_suhosin_p 5.2.0-0.9.6.2
-%define V_mod_php_suhosin_e 0.9.14
+%define V_mod_php_suhosin_e 0.9.15
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061122
+Release: 20061129
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Nov-2006 18:10:26
Branch: HEAD Handle: 2006112217102500
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20061121 - 20061122
Summary:
RevisionChanges Path
1.361 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.360 -r1.361 apache.spec
--- openpkg-src/apache/apache.spec21 Nov 2006 07:39:34 - 1.360
+++ openpkg-src/apache/apache.spec22 Nov 2006 17:10:25 - 1.361
@@ -37,7 +37,7 @@
%define V_mod_perl 1.29
%define V_mod_php5.2.0
%define V_mod_php_suhosin_p 5.2.0-0.9.6.2
-%define V_mod_php_suhosin_e 0.9.13
+%define V_mod_php_suhosin_e 0.9.14
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061121
+Release: 20061122
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Nov-2006 19:16:34
Branch: HEAD Handle: 2006111918163400
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20061115 - 20061119
Summary:
RevisionChanges Path
1.358 +3 -3 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.357 -r1.358 apache.spec
--- openpkg-src/apache/apache.spec15 Nov 2006 13:59:29 - 1.357
+++ openpkg-src/apache/apache.spec19 Nov 2006 18:16:34 - 1.358
@@ -54,7 +54,7 @@
%define V_mod_relocate 1.0
%define V_mod_security 1.9.4
%define V_mod_evasive1.10.1
-%define V_suphp 0.6.1
+%define V_suphp 0.6.2
# package information
Name: apache
@@ -67,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061115
+Release: 20061119
# package options (suexec related)
%option with_suexec yes
@@ -393,7 +393,7 @@
PreReq: gdbm, gdbm::with_ndbm = yes
%endif
%if %{with_suphp} == yes
-BuildPreReq: php, gcc
+BuildPreReq: php, gcc, libtool
PreReq: php
%endif
AutoReq: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Nov-2006 20:36:07
Branch: HEAD Handle: 2006111919360700
Modified files:
openpkg-src/apache apache.spec
Log:
The real problem is not that Libtool is required, but that Automake
wants to regenerate its files (and for this indirectly Libtool is
required). So we either have to require Automake, Autoconf and Libtool
all toegther or get rid of all dependencies by a little bit of
harmless cheating. Let's do the usual cheating for now...
Summary:
RevisionChanges Path
1.359 +5 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.358 -r1.359 apache.spec
--- openpkg-src/apache/apache.spec19 Nov 2006 18:16:34 - 1.358
+++ openpkg-src/apache/apache.spec19 Nov 2006 19:36:07 - 1.359
@@ -393,7 +393,7 @@
PreReq: gdbm, gdbm::with_ndbm = yes
%endif
%if %{with_suphp} == yes
-BuildPreReq: php, gcc, libtool
+BuildPreReq: php, gcc
PreReq: php
%endif
AutoReq: no
@@ -1048,6 +1048,10 @@
chmod +rx configure
CC=%{l_cc} \
CFLAGS=%{l_cflags -O} \
+ AUTOCONF=true \
+ AUTOHEADER=true \
+ AUTOMAKE=true \
+ ACLOCAL=true \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/apache \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Nov-2006 14:59:30
Branch: HEAD Handle: 2006111513592900
Modified files:
openpkg-src/apache apache.spec
Log:
add optional support for the PHP Suhosin patch extension from the
Hardened PHP project
Summary:
RevisionChanges Path
1.357 +49 -15 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.356 -r1.357 apache.spec
--- openpkg-src/apache/apache.spec11 Nov 2006 08:52:42 - 1.356
+++ openpkg-src/apache/apache.spec15 Nov 2006 13:59:29 - 1.357
@@ -36,6 +36,8 @@
%define V_mod_ssl2.8.28-1.3.37
%define V_mod_perl 1.29
%define V_mod_php5.2.0
+%define V_mod_php_suhosin_p 5.2.0-0.9.6.2
+%define V_mod_php_suhosin_e 0.9.12
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -65,7 +67,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 2006
+Release: 20061115
# package options (suexec related)
%option with_suexec yes
@@ -105,6 +107,8 @@
# package options (optional PHP5 specific settings; requires
with_mod_php)
# please note the lack of an PEAR option since PEAR is provided by the
'php' package
+%option with_mod_php_suhosin no
+%option with_mod_php_hardened no
%option with_mod_php_bc no
%option with_mod_php_bdb no
%option with_mod_php_bzip2no
@@ -119,7 +123,6 @@
%option with_mod_php_gd no
%option with_mod_php_gdbm no
%option with_mod_php_gettext no
-%option with_mod_php_hardened no
%option with_mod_php_iconvno
%option with_mod_php_imap no
%option with_mod_php_mbregex no
@@ -183,6 +186,10 @@
%undefine with_mod_define
%define with_mod_define yes
%endif
+%if %{with_mod_php_suhosin} == yes %{with_mod_php_hardened} == yes
+%undefine with_mod_php_hardened
+%define with_mod_php_hardened no
+%endif
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -206,17 +213,19 @@
Source18:
http://www.modsecurity.org/download/modsecurity-apache_%{V_mod_security}.tar.gz
Source19:
http://www.nuclearelephant.com/projects/mod_evasive/mod_evasive_%{V_mod_evasive}.tar.gz
Source20: http://www.sharemation.com/~dmcmahon/unix_all.tgz
-Source21: apache.conf
-Source22: apache.base
-Source23: apache.pl
-Source24: rc.apache
-Source25: apache.sh
-Source26: php.ini
+Source21:
http://www.hardened-php.net/suhosin/_media/suhosin-%{V_mod_php_suhosin_e}.tgz
+Source22: apache.conf
+Source23: apache.base
+Source24: apache.pl
+Source25: rc.apache
+Source26: apache.sh
+Source27: php.ini
Patch0: apache.patch
Patch1: apache.patch.modowa
Patch2:
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
-Patch3: apache.patch.suphp
-Patch4: apache.patch.php
+Patch3:
http://www.hardened-php.net/suhosin/_media/suhosin-patch-%{V_mod_php_suhosin_p}.patch.gz
+Patch4: apache.patch.suphp
+Patch5: apache.patch.php
# build information
Prefix: %{l_prefix}
@@ -237,6 +246,9 @@
%endif
%if %{with_mod_php} == yes
BuildPreReq: gcc, sed, flex, bison
+%if %{with_mod_php_suhosin} == yes
+BuildPreReq: autoconf
+%endif
%if %{with_mod_php_mssql} == yes
BuildPreReq: freetds, libiconv
PreReq: freetds, libiconv
@@ -461,6 +473,16 @@
url = http://www.hardened-php.net/downloads.13.html
regex = hardening-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
}
+prog apache:mod_php_suhosin-patch = {
+version = %{V_mod_php_suhosin_p}
+url = http://www.hardened-php.net/suhosin/download.html
+regex = suhosin-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
+}
+prog apache:mod_php_suhosin-ext = {
+version = %{V_mod_php_suhosin_e}
+url = http://www.hardened-php.net/suhosin/download.html
+regex = suhosin-(\d+(\.\d+)+)\.tgz
+}
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Nov-2006 09:52:42
Branch: HEAD Handle: 200608524200
Modified files:
openpkg-src/apache apache.spec
Log:
remember tracking issue
Summary:
RevisionChanges Path
1.356 +3 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.355 -r1.356 apache.spec
--- openpkg-src/apache/apache.spec8 Nov 2006 08:38:05 - 1.355
+++ openpkg-src/apache/apache.spec11 Nov 2006 08:52:42 - 1.356
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061108
+Release: 2006
# package options (suexec related)
%option with_suexec yes
@@ -477,6 +477,8 @@
regex = mod_ssl-(__VER__)\.tar\.gz
}
prog apache:mod_throttle = {
+disabled
+comment = rse: currently no longer publically available
version = %{V_mod_throttle}
url = http://www.snert.com/Software/mod_throttle/
regex = mod_throttle(__VER__)\.tgz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Nov-2006 21:35:18
Branch: HEAD Handle: 2006110320351800
Modified files:
openpkg-src/apache apache.spec
Log:
the hardened patch uses a prefix
Summary:
RevisionChanges Path
1.354 +1 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.353 -r1.354 apache.spec
--- openpkg-src/apache/apache.spec3 Nov 2006 07:55:26 - 1.353
+++ openpkg-src/apache/apache.spec3 Nov 2006 20:35:18 - 1.354
@@ -532,7 +532,7 @@
ext/mssql/php_mssql.h
%endif
%if %{with_mod_php_hardened} == yes
- %patch -p0 -P 2
+ %patch -p1 -P 2
%endif
) || exit $?
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Oct-2006 19:33:55
Branch: HEAD Handle: 2006101618335500
Modified files:
openpkg-src/apache apache.spec
Log:
track only Apache 1.3 version
Summary:
RevisionChanges Path
1.352 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.351 -r1.352 apache.spec
--- openpkg-src/apache/apache.spec13 Oct 2006 17:26:45 - 1.351
+++ openpkg-src/apache/apache.spec16 Oct 2006 17:33:55 - 1.352
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20061013
+Release: 20061016
# package options (suexec related)
%option with_suexec yes
@@ -488,7 +488,7 @@
prog apache:mod_security = {
version = %{V_mod_security}
url = http://www.modsecurity.org/download/
-regex = modsecurity-apache_(\d+\.\d+(\.\d+)*)\.tar\.gz
+regex = modsecurity-apache_(1\.\d+(\.\d+)*)\.tar\.gz
}
prog apache:mod_evasive = {
version = %{V_mod_evasive}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Sep-2006 09:44:20
Branch: HEAD Handle: 2006090908442000
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20060908 - 20060909
Summary:
RevisionChanges Path
1.349 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.348 -r1.349 apache.spec
--- openpkg-src/apache/apache.spec8 Sep 2006 06:05:12 - 1.348
+++ openpkg-src/apache/apache.spec9 Sep 2006 07:44:20 - 1.349
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.28-1.3.37
%define V_mod_perl 1.29
%define V_mod_php5.1.6
-%define V_mod_php_hardened 5.1.5-0.4.15
+%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060908
+Release: 20060909
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Sep-2006 08:05:13
Branch: HEAD Handle: 2006090807051200
Modified files:
openpkg-src/apache apache.spec
Log:
upgrade PHP hardened patch
Summary:
RevisionChanges Path
1.348 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.347 -r1.348 apache.spec
--- openpkg-src/apache/apache.spec25 Aug 2006 19:15:55 - 1.347
+++ openpkg-src/apache/apache.spec8 Sep 2006 06:05:12 - 1.348
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.28-1.3.37
%define V_mod_perl 1.29
%define V_mod_php5.1.6
-%define V_mod_php_hardened 5.1.5-0.4.14
+%define V_mod_php_hardened 5.1.5-0.4.15
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060825
+Release: 20060908
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Aug-2006 08:49:38
Branch: HEAD Handle: 2006082507493700
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20060818 - 20060825
Summary:
RevisionChanges Path
1.346 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.345 -r1.346 apache.spec
--- openpkg-src/apache/apache.spec18 Aug 2006 18:51:36 - 1.345
+++ openpkg-src/apache/apache.spec25 Aug 2006 06:49:37 - 1.346
@@ -35,7 +35,7 @@
%define V_apache 1.3.37
%define V_mod_ssl2.8.28-1.3.37
%define V_mod_perl 1.29
-%define V_mod_php5.1.5
+%define V_mod_php5.1.6
%define V_mod_php_hardened 5.1.5-0.4.14
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060818
+Release: 20060825
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Aug-2006 16:30:25
Branch: HEAD Handle: 2006081815302202
Modified files:
openpkg-src/apache apache.spec rc.apache
Log:
always switch into the Apache run-time directory as at least PHP with
MM based sessions store their session database into the _current
working directory_ which was active at the time Apache was started
Summary:
RevisionChanges Path
1.344 +1 -1 openpkg-src/apache/apache.spec
1.22+2 -1 openpkg-src/apache/rc.apache
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.343 -r1.344 apache.spec
--- openpkg-src/apache/apache.spec11 Aug 2006 15:39:03 - 1.343
+++ openpkg-src/apache/apache.spec18 Aug 2006 14:30:22 - 1.344
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060811
+Release: 20060818
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.21 -r1.22 rc.apache
--- openpkg-src/apache/rc.apache 5 Dec 2005 18:52:54 - 1.21
+++ openpkg-src/apache/rc.apache 18 Aug 2006 14:30:24 - 1.22
@@ -43,7 +43,8 @@
%start -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active yes exit 0
-( [ -e @l_prefix@/etc/apache/apache.sh ] \
+( cd @l_prefix@/var/apache/run
+ [ -e @l_prefix@/etc/apache/apache.sh ] \
. @l_prefix@/etc/apache/apache.sh
@l_prefix@/sbin/apache
) || exit $?
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Aug-2006 20:51:37 Branch: HEAD Handle: 2006081819513600 Modified files: openpkg-src/apache apache.spec Log: modifying package: apache-1.3.37 20060818 again Summary: RevisionChanges Path 1.345 +2 -2 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.344 -r1.345 apache.spec --- openpkg-src/apache/apache.spec18 Aug 2006 14:30:22 - 1.344 +++ openpkg-src/apache/apache.spec18 Aug 2006 18:51:36 - 1.345 @@ -35,8 +35,8 @@ %define V_apache 1.3.37 %define V_mod_ssl2.8.28-1.3.37 %define V_mod_perl 1.29 -%define V_mod_php5.1.4 -%define V_mod_php_hardened 5.1.4-0.4.14 +%define V_mod_php5.1.5 +%define V_mod_php_hardened 5.1.5-0.4.14 %define V_mod_dav1.0.3-1.3.6 %define V_mod_layout 3.2.1 %define V_mod_macro 1.1.2 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Aug-2006 17:39:04
Branch: HEAD Handle: 2006081116390300
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20060807 - 20060811
Summary:
RevisionChanges Path
1.343 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.342 -r1.343 apache.spec
--- openpkg-src/apache/apache.spec7 Aug 2006 17:49:40 - 1.342
+++ openpkg-src/apache/apache.spec11 Aug 2006 15:39:03 - 1.343
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.28-1.3.37
%define V_mod_perl 1.29
%define V_mod_php5.1.4
-%define V_mod_php_hardened 5.1.4-0.4.13
+%define V_mod_php_hardened 5.1.4-0.4.14
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060807
+Release: 20060811
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Aug-2006 19:49:40
Branch: HEAD Handle: 2006080718494000
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20060728 - 20060807
Summary:
RevisionChanges Path
1.342 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.341 -r1.342 apache.spec
--- openpkg-src/apache/apache.spec28 Jul 2006 14:07:11 - 1.341
+++ openpkg-src/apache/apache.spec7 Aug 2006 17:49:40 - 1.342
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.28-1.3.37
%define V_mod_perl 1.29
%define V_mod_php5.1.4
-%define V_mod_php_hardened 5.1.4-0.4.12
+%define V_mod_php_hardened 5.1.4-0.4.13
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060728
+Release: 20060807
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Jul-2006 16:07:11 Branch: HEAD Handle: 2006072815071100 Modified files: openpkg-src/apache apache.spec Log: When to the hell on this earth can I finally get of the burder of having to maintain mod_ssl all the time perhaps never, so here it is: mod_ssl 2.8.28 for Apache 1.3.37 Summary: RevisionChanges Path 1.341 +1 -1 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.340 -r1.341 apache.spec --- openpkg-src/apache/apache.spec28 Jul 2006 06:09:19 - 1.340 +++ openpkg-src/apache/apache.spec28 Jul 2006 14:07:11 - 1.341 @@ -33,7 +33,7 @@ # package component versions %define V_apache 1.3.37 -%define V_mod_ssl2.8.27-1.3.36 +%define V_mod_ssl2.8.28-1.3.37 %define V_mod_perl 1.29 %define V_mod_php5.1.4 %define V_mod_php_hardened 5.1.4-0.4.12 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 27-Jun-2006 16:46:46 Branch: HEAD Handle: 2006062715464500 Modified files: openpkg-src/apache apache.spec Log: one more PHP 4 - 5 Summary: RevisionChanges Path 1.338 +1 -1 openpkg-src/apache/apache.spec patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.337 -r1.338 apache.spec --- openpkg-src/apache/apache.spec27 Jun 2006 14:41:57 - 1.337 +++ openpkg-src/apache/apache.spec27 Jun 2006 14:46:45 - 1.338 @@ -103,7 +103,7 @@ %option with_mod_security no %option with_mod_evasive no -# package options (optional PHP4 specific settings; requires with_mod_php) +# package options (optional PHP5 specific settings; requires with_mod_php) # please note the lack of an PEAR option since PEAR is provided by the 'php' package %option with_mod_php_bc no %option with_mod_php_bdb no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-src/apache2/ ap...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2006 10:51:14
Branch: HEAD Handle: 2006062209510607
Modified files:
openpkg-src/apache apache.spec
openpkg-src/apache2 apache2.spec
openpkg-src/gcc3gcc3.spec
openpkg-src/gcc40 gcc40.spec
openpkg-src/gcc42 gcc42.spec
openpkg-src/lighttpdlighttpd.spec
openpkg-src/muttmutt.spec
openpkg-src/ngircd ngircd.spec
openpkg-src/openpkg build.sh install.sh rpmmacros
openpkg-src/openssh openssh.spec
Log:
upgrade to the newer world order of %{l_openpkg_release} macro
Summary:
RevisionChanges Path
1.336 +4 -4 openpkg-src/apache/apache.spec
1.75+4 -4 openpkg-src/apache2/apache2.spec
1.5 +4 -4 openpkg-src/gcc3/gcc3.spec
1.45+4 -4 openpkg-src/gcc40/gcc40.spec
1.24+4 -4 openpkg-src/gcc42/gcc42.spec
1.24+4 -4 openpkg-src/lighttpd/lighttpd.spec
1.72+4 -4 openpkg-src/mutt/mutt.spec
1.8 +4 -4 openpkg-src/ngircd/ngircd.spec
1.4 +2 -1 openpkg-src/openpkg/build.sh
1.11+2 -1 openpkg-src/openpkg/install.sh
1.77+1 -1 openpkg-src/openpkg/rpmmacros
1.162 +4 -4 openpkg-src/openssh/openssh.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.335 -r1.336 apache.spec
--- openpkg-src/apache/apache.spec9 Jun 2006 07:43:08 - 1.335
+++ openpkg-src/apache/apache.spec22 Jun 2006 08:51:07 - 1.336
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060609
+Release: 20060622
# package options (suexec related)
%option with_suexec yes
@@ -220,8 +220,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130
-PreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: OpenPKG, openpkg = 20060622
+PreReq: OpenPKG, openpkg = 20060622
%if %{with_mod_ssl} == yes
BuildPreReq: openssl, mm
PreReq: openssl, mm
@@ -501,7 +501,7 @@
%setup -q -c
%patch -p0
%{l_shtool} subst \
--e 's;Unix;%{l_openpkg_release -F OpenPKG/%%s};g' \
+-e 's;Unix;%{l_openpkg_release -F OpenPKG/%%t};g' \
apache_%{V_apache}/src/os/unix/os.h
# unpack optional extension modules
@@ .
patch -p0 '@@ .'
Index: openpkg-src/apache2/apache2.spec
$ cvs diff -u -r1.74 -r1.75 apache2.spec
--- openpkg-src/apache2/apache2.spec 30 Apr 2006 08:12:12 - 1.74
+++ openpkg-src/apache2/apache2.spec 22 Jun 2006 08:51:09 - 1.75
@@ -39,7 +39,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060430
+Release: 20060622
# package options (generic)
%option with_mpm prefork
@@ -71,8 +71,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, perl, make
-PreReq: OpenPKG, openpkg = 20040130, perl
+BuildPreReq: OpenPKG, openpkg = 20060622, perl, make
+PreReq: OpenPKG, openpkg = 20060622, perl
BuildPreReq: expat, libiconv, db
PreReq: expat, libiconv, db
%if %{with_mod_deflate} == yes
@@ -134,7 +134,7 @@
%setup -q -c
%patch -p0 -d httpd-%{V_apache}
%{l_shtool} subst \
--e 's;( PLATFORM );(%{l_openpkg_release -F OpenPKG/%%s});g' \
+-e 's;( PLATFORM );(%{l_openpkg_release -F OpenPKG/%%t});g' \
httpd-%{V_apache}/server/core.c
# unpack optional extension modules
@@ .
patch -p0 '@@ .'
Index: openpkg-src/gcc3/gcc3.spec
$ cvs diff -u -r1.4 -r1.5 gcc3.spec
--- openpkg-src/gcc3/gcc3.spec6 Mar 2006 07:14:05 - 1.4
+++ openpkg-src/gcc3/gcc3.spec22 Jun 2006 08:51:10 - 1.5
@@ -37,7 +37,7 @@
Group:Compiler
License: GPL
Version: %{V_full}
-Release: 20060306
+Release: 20060622
# package options
%option with_cxx yes
@@ -57,8 +57,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2006 09:09:17
Branch: HEAD Handle: 2006060908091600
Modified files:
openpkg-src/apache apache.spec
Log:
added an option for mod_define, which comes as part of the mod_ssl
distribution, to be installed solely without mod_ssl
Summary:
RevisionChanges Path
1.334 +33 -11 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.333 -r1.334 apache.spec
--- openpkg-src/apache/apache.spec8 Jun 2006 11:40:12 - 1.333
+++ openpkg-src/apache/apache.spec9 Jun 2006 07:09:16 - 1.334
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060608
+Release: 20060609
# package options (suexec related)
%option with_suexec yes
@@ -81,6 +81,7 @@
# package options (additionally used Apache modules; can be enabled
without thinking)
%option with_mod_ssl no
+%option with_mod_define no
%option with_mod_perl no
%option with_mod_php no
%option with_mod_dav no
@@ -178,6 +179,10 @@
%define with_gdbm_ndbmyes
%endif
%endif
+%if %{with_mod_ssl} == yes
+%undefine with_mod_define
+%define with_mod_define yes
+%endif
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -218,8 +223,10 @@
BuildPreReq: OpenPKG, openpkg = 20040130
PreReq: OpenPKG, openpkg = 20040130
%if %{with_mod_ssl} == yes
-BuildPreReq: openssl, mm
-PreReq: openssl, mm
+BuildPreReq: mm
+PreReq: mm
+BuildPreReq: openssl
+PreReq: openssl
%endif
%if %{with_mod_perl} == yes
BuildPreReq: perl
@@ -500,7 +507,7 @@
apache_%{V_apache}/src/os/unix/os.h
# unpack optional extension modules
-%if %{with_mod_ssl} == yes
+%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
%setup -q -T -D -a 1
%endif
%if %{with_mod_perl} == yes
@@ -590,11 +597,14 @@
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}
-# optionally prepare mod_ssl
-%if %{with_mod_ssl} == yes
+# optionally prepare mod_ssl or mod_define
+%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
( cd mod_ssl-%{V_mod_ssl}
./configure \
--with-apache=../apache_%{V_apache} \
+%if %{with_mod_ssl} != yes
+ --with-eapi-only \
+%endif
--expert --force
) || exit $?
%endif
@@ -609,7 +619,7 @@
CFLAGS=%{l_cflags -O} \
%endif
./configure \
-%if %{with_mod_ssl} == yes
+%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
--enable-rule=EAPI \
%endif
%if %{with_shared_core} == yes
@@ -676,7 +686,7 @@
LDFLAGS=%{l_cflags -O} %{l_ldflags}; export LDFLAGS
%endif
LIBS=; export LIBS
-%if %{with_mod_ssl} == yes
+%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
CFLAGS=$CFLAGS -DEAPI
%endif
%if %{with_mod_php_gd} == yes
@@ -866,13 +876,13 @@
( cd mod_dav-%{V_mod_dav}
CC=%{l_cc} \
%if %{with_debug} == yes
-%if %{with_mod_ssl} == yes
+%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
CFLAGS=%{l_cflags} -g -DEAPI \
%else
CFLAGS=%{l_cflags} -g \
%endif
%else
-%if %{with_mod_ssl} == yes
+%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
CFLAGS=%{l_cflags -O} -DEAPI \
%else
CFLAGS=%{l_cflags -O} \
@@ -988,6 +998,13 @@
) || exit $?
%endif
+# optionally prepare mod_define (if mod_ssl is disabled only)
+%if %{with_mod_define} == yes %{with_mod_ssl} != yes
+( cd mod_ssl-%{V_mod_ssl}/pkg.addon
+ cp mod_define.c ../../apache_%{V_apache}/src/modules/extra/
+) || exit $?
+%endif
+
# optionally prepare mod_suphp
%if %{with_suphp} == yes
( cd suphp-%{V_suphp}
@@ -1110,10 +1127,15 @@
%endif
--enable-module=most \
--with-perl=%{l_prefix}/bin/perl \
-%if %{with_mod_ssl} == yes
+%if %{with_mod_ssl} == yes || %{with_mod_define} == yes
--enable-rule=EAPI \
+%if %{with_mod_ssl} == yes
--enable-module=ssl \
%endif
+%if %{with_mod_define} == yes %{with_mod_ssl} != yes
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2006 09:43:08
Branch: HEAD Handle: 2006060908430800
Modified files:
openpkg-src/apache apache.spec
Log:
no need to place each dependency on its own extra dependency line
Summary:
RevisionChanges Path
1.335 +2 -4 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.334 -r1.335 apache.spec
--- openpkg-src/apache/apache.spec9 Jun 2006 07:09:16 - 1.334
+++ openpkg-src/apache/apache.spec9 Jun 2006 07:43:08 - 1.335
@@ -223,10 +223,8 @@
BuildPreReq: OpenPKG, openpkg = 20040130
PreReq: OpenPKG, openpkg = 20040130
%if %{with_mod_ssl} == yes
-BuildPreReq: mm
-PreReq: mm
-BuildPreReq: openssl
-PreReq: openssl
+BuildPreReq: openssl, mm
+PreReq: openssl, mm
%endif
%if %{with_mod_perl} == yes
BuildPreReq: perl
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Jun-2006 13:40:12
Branch: HEAD Handle: 2006060812401200
Modified files:
openpkg-src/apache apache.spec
Log:
Ops, since the earliest days the combination of
with_mod_ssl=yes/with_mod_dav=yes was broken because mod_dav was not
built with EAPI and this way could segfault. Discovered by Christoph
Schug.
Summary:
RevisionChanges Path
1.333 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.332 -r1.333 apache.spec
--- openpkg-src/apache/apache.spec28 May 2006 12:28:22 - 1.332
+++ openpkg-src/apache/apache.spec8 Jun 2006 11:40:12 - 1.333
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060528
+Release: 20060608
# package options (suexec related)
%option with_suexec yes
@@ -867,15 +867,15 @@
CC=%{l_cc} \
%if %{with_debug} == yes
%if %{with_mod_ssl} == yes
- CFLAGS=%{l_cflags} -g \
-%else
CFLAGS=%{l_cflags} -g -DEAPI \
+%else
+ CFLAGS=%{l_cflags} -g \
%endif
%else
%if %{with_mod_ssl} == yes
- CFLAGS=%{l_cflags -O} \
-%else
CFLAGS=%{l_cflags -O} -DEAPI \
+%else
+ CFLAGS=%{l_cflags -O} \
%endif
%endif
LDFLAGS=%{l_cflags -O} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-May-2006 09:33:53
Branch: HEAD Handle: 2006051408335200
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.35 20060511 - 20060514
Summary:
RevisionChanges Path
1.328 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.327 -r1.328 apache.spec
--- openpkg-src/apache/apache.spec11 May 2006 18:44:53 - 1.327
+++ openpkg-src/apache/apache.spec14 May 2006 07:33:52 - 1.328
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.26-1.3.35
%define V_mod_perl 1.29
%define V_mod_php4.4.2
-%define V_mod_php_hardened 4.4.2-0.4.10
+%define V_mod_php_hardened 4.4.2-0.4.11
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060511
+Release: 20060514
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-May-2006 20:44:54
Branch: HEAD Handle: 2006051119445300
Modified files:
openpkg-src/apache apache.spec
Log:
upgrade PHP hardening patch
Summary:
RevisionChanges Path
1.327 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.326 -r1.327 apache.spec
--- openpkg-src/apache/apache.spec8 May 2006 07:30:19 - 1.326
+++ openpkg-src/apache/apache.spec11 May 2006 18:44:53 - 1.327
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.26-1.3.35
%define V_mod_perl 1.29
%define V_mod_php4.4.2
-%define V_mod_php_hardened 4.4.2-0.4.9
+%define V_mod_php_hardened 4.4.2-0.4.10
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060508
+Release: 20060511
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-May-2006 09:30:19
Branch: HEAD Handle: 2006050808301900
Modified files:
openpkg-src/apache apache.spec
Log:
upgrade my mod_ssl
Summary:
RevisionChanges Path
1.326 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.325 -r1.326 apache.spec
--- openpkg-src/apache/apache.spec3 May 2006 06:19:06 - 1.325
+++ openpkg-src/apache/apache.spec8 May 2006 07:30:19 - 1.326
@@ -33,7 +33,7 @@
# package component versions
%define V_apache 1.3.35
-%define V_mod_ssl2.8.25-1.3.34
+%define V_mod_ssl2.8.26-1.3.35
%define V_mod_perl 1.29
%define V_mod_php4.4.2
%define V_mod_php_hardened 4.4.2-0.4.9
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060503
+Release: 20060508
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-May-2006 08:19:08
Branch: HEAD Handle: 2006050307190600
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.35 20060430 - 20060503
Summary:
RevisionChanges Path
1.325 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.324 -r1.325 apache.spec
--- openpkg-src/apache/apache.spec30 Apr 2006 17:36:04 - 1.324
+++ openpkg-src/apache/apache.spec3 May 2006 06:19:06 - 1.325
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
%define V_mod_php4.4.2
-%define V_mod_php_hardened 4.4.2-0.4.8
+%define V_mod_php_hardened 4.4.2-0.4.9
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060430
+Release: 20060503
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Apr-2006 09:08:14
Branch: HEAD Handle: 2006042108081400
Modified files:
openpkg-src/apache apache.spec
Log:
fix tracking of mod_security and upgrade to latest version
Summary:
RevisionChanges Path
1.323 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.322 -r1.323 apache.spec
--- openpkg-src/apache/apache.spec21 Feb 2006 18:38:34 - 1.322
+++ openpkg-src/apache/apache.spec21 Apr 2006 07:08:14 - 1.323
@@ -50,7 +50,7 @@
%define V_mod_access_referer 1.0.2
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
-%define V_mod_security 1.9.2
+%define V_mod_security 1.9.3
%define V_mod_evasive1.10.1
%define V_suphp 0.6.1
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060221
+Release: 20060421
# package options (suexec related)
%option with_suexec yes
@@ -200,7 +200,7 @@
Source15:
ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-%{V_mod_auth_radius}.tar
Source16:
http://osdn.dl.sourceforge.net/modauthmysql/mod_auth_mysql-%{V_mod_auth_mysql}.tar.gz
Source17: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
-Source18:
http://www.modsecurity.org/download/modsecurity-apache-%{V_mod_security}.tar.gz
+Source18:
http://www.modsecurity.org/download/modsecurity-apache_%{V_mod_security}.tar.gz
Source19:
http://www.nuclearelephant.com/projects/mod_evasive/mod_evasive_%{V_mod_evasive}.tar.gz
Source20: http://www.sharemation.com/~dmcmahon/unix_all.tgz
Source21: apache.conf
@@ -482,7 +482,7 @@
prog apache:mod_security = {
version = %{V_mod_security}
url = http://www.modsecurity.org/download/
-regex = modsecurity-apache-(\d+\.\d+(\.\d+)*)\.tar\.gz
+regex = modsecurity-apache_(\d+\.\d+(\.\d+)*)\.tar\.gz
}
prog apache:mod_evasive = {
version = %{V_mod_evasive}
@@ -1019,7 +1019,7 @@
# optionally prepare mod_security
%if %{with_mod_security} == yes
-( cd modsecurity-%{V_mod_security}/apache1
+( cd modsecurity-apache_%{V_mod_security}/apache1
cp mod_security.c ../../apache_%{V_apache}/src/modules/extra/
) || exit $?
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Feb-2006 19:38:34
Branch: HEAD Handle: 2006022118383400
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.34 20060119 - 20060221
Summary:
RevisionChanges Path
1.322 +4 -4 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.321 -r1.322 apache.spec
--- openpkg-src/apache/apache.spec19 Jan 2006 06:37:59 - 1.321
+++ openpkg-src/apache/apache.spec21 Feb 2006 18:38:34 - 1.322
@@ -50,7 +50,7 @@
%define V_mod_access_referer 1.0.2
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
-%define V_mod_security 1.8.7
+%define V_mod_security 1.9.2
%define V_mod_evasive1.10.1
%define V_suphp 0.6.1
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060119
+Release: 20060221
# package options (suexec related)
%option with_suexec yes
@@ -200,7 +200,7 @@
Source15:
ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-%{V_mod_auth_radius}.tar
Source16:
http://osdn.dl.sourceforge.net/modauthmysql/mod_auth_mysql-%{V_mod_auth_mysql}.tar.gz
Source17: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
-Source18:
http://www.modsecurity.org/download/modsecurity-%{V_mod_security}.tar.gz
+Source18:
http://www.modsecurity.org/download/modsecurity-apache-%{V_mod_security}.tar.gz
Source19:
http://www.nuclearelephant.com/projects/mod_evasive/mod_evasive_%{V_mod_evasive}.tar.gz
Source20: http://www.sharemation.com/~dmcmahon/unix_all.tgz
Source21: apache.conf
@@ -482,7 +482,7 @@
prog apache:mod_security = {
version = %{V_mod_security}
url = http://www.modsecurity.org/download/
-regex = modsecurity-(\d+\.\d+(\.\d+)*)\.tar\.gz
+regex = modsecurity-apache-(\d+\.\d+(\.\d+)*)\.tar\.gz
}
prog apache:mod_evasive = {
version = %{V_mod_evasive}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Jan-2006 07:37:59
Branch: HEAD Handle: 2006011906375900
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.34 20060113 - 20060119
Summary:
RevisionChanges Path
1.321 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.320 -r1.321 apache.spec
--- openpkg-src/apache/apache.spec13 Jan 2006 19:06:57 - 1.320
+++ openpkg-src/apache/apache.spec19 Jan 2006 06:37:59 - 1.321
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
%define V_mod_php4.4.2
-%define V_mod_php_hardened 4.4.1-0.4.8
+%define V_mod_php_hardened 4.4.2-0.4.8
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060113
+Release: 20060119
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Jan-2006 20:06:58
Branch: HEAD Handle: 2006011319065700
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.34 20051214 - 20060113
Summary:
RevisionChanges Path
1.320 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.319 -r1.320 apache.spec
--- openpkg-src/apache/apache.spec1 Jan 2006 13:11:56 - 1.319
+++ openpkg-src/apache/apache.spec13 Jan 2006 19:06:57 - 1.320
@@ -35,7 +35,7 @@
%define V_apache 1.3.34
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
-%define V_mod_php4.4.1
+%define V_mod_php4.4.2
%define V_mod_php_hardened 4.4.1-0.4.8
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051214
+Release: 20060113
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Dec-2005 19:52:54
Branch: HEAD Handle: 2005120518525400
Modified files:
openpkg-src/apache apache.spec rc.apache
Log:
The ssl.log should be also rotated, please.
Summary:
RevisionChanges Path
1.317 +1 -1 openpkg-src/apache/apache.spec
1.21+14 -0 openpkg-src/apache/rc.apache
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.316 -r1.317 apache.spec
--- openpkg-src/apache/apache.spec29 Nov 2005 15:41:25 - 1.316
+++ openpkg-src/apache/apache.spec5 Dec 2005 18:52:54 - 1.317
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051129
+Release: 20051205
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.20 -r1.21 rc.apache
--- openpkg-src/apache/rc.apache 16 Nov 2005 07:39:58 - 1.20
+++ openpkg-src/apache/rc.apache 5 Dec 2005 18:52:54 - 1.21
@@ -17,6 +17,12 @@
apache_err_numfiles=10
apache_err_minsize=1M
apache_err_complevel=9
+apache_ssl_files=@l_prefix@/var/apache/log/ssl.log
+apache_ssl_prolog=true
+apache_ssl_epilog=true
+apache_ssl_numfiles=10
+apache_ssl_minsize=1M
+apache_ssl_complevel=9
%common
apache_pidfile=@l_prefix@/var/apache/run/apache.pid
@@ -81,4 +87,12 @@
-E ${apache_err_epilog} rc apache reload \
$apache_err_files
fi
+if [ .$apache_ssl_files != . ]; then
+shtool rotate -f \
+-n ${apache_ssl_numfiles} -s ${apache_ssl_minsize} -d \
+-z ${apache_ssl_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+-P ${apache_ssl_prolog} \
+-E ${apache_ssl_epilog} rc apache reload \
+$apache_ssl_files
+fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Nov-2005 16:41:25
Branch: HEAD Handle: 2005112915412500
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.34 20051127 - 20051129
Summary:
RevisionChanges Path
1.316 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.315 -r1.316 apache.spec
--- openpkg-src/apache/apache.spec27 Nov 2005 08:55:03 - 1.315
+++ openpkg-src/apache/apache.spec29 Nov 2005 15:41:25 - 1.316
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
%define V_mod_php4.4.1
-%define V_mod_php_hardened 4.4.1-0.4.6
+%define V_mod_php_hardened 4.4.1-0.4.8
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051127
+Release: 20051129
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Nov-2005 09:55:03
Branch: HEAD Handle: 2005112708550300
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.34 20051126 - 20051127
Summary:
RevisionChanges Path
1.315 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.314 -r1.315 apache.spec
--- openpkg-src/apache/apache.spec26 Nov 2005 08:13:43 - 1.314
+++ openpkg-src/apache/apache.spec27 Nov 2005 08:55:03 - 1.315
@@ -52,7 +52,7 @@
%define V_mod_relocate 1.0
%define V_mod_security 1.8.7
%define V_mod_evasive1.10.1
-%define V_suphp 0.6.0
+%define V_suphp 0.6.1
# package information
Name: apache
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051126
+Release: 20051127
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Nov-2005 09:13:43
Branch: HEAD Handle: 2005112608134300
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.34 20051120 - 20051126
Summary:
RevisionChanges Path
1.314 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.313 -r1.314 apache.spec
--- openpkg-src/apache/apache.spec20 Nov 2005 13:41:01 - 1.313
+++ openpkg-src/apache/apache.spec26 Nov 2005 08:13:43 - 1.314
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
%define V_mod_php4.4.1
-%define V_mod_php_hardened 4.4.1-0.4.5
+%define V_mod_php_hardened 4.4.1-0.4.6
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051120
+Release: 20051126
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Nov-2005 08:39:58
Branch: HEAD Handle: 2005111607395800
Modified files:
openpkg-src/apache apache.spec rc.apache
Log:
increase delays on restarts (only) from 2 to 6 in total
Summary:
RevisionChanges Path
1.312 +1 -1 openpkg-src/apache/apache.spec
1.20+3 -1 openpkg-src/apache/rc.apache
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.311 -r1.312 apache.spec
--- openpkg-src/apache/apache.spec3 Nov 2005 07:24:59 - 1.311
+++ openpkg-src/apache/apache.spec16 Nov 2005 07:39:58 - 1.312
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051103
+Release: 20051116
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.19 -r1.20 rc.apache
--- openpkg-src/apache/rc.apache 28 Feb 2005 13:27:28 - 1.19
+++ openpkg-src/apache/rc.apache 16 Nov 2005 07:39:58 - 1.20
@@ -53,7 +53,9 @@
rcService apache enable yes || exit 0
rcService apache active no exit 0
@l_prefix@/sbin/apache -t || exit $?
-rc apache stop start
+rc apache stop
+sleep 4
+rc apache start
%reload -u @l_susr@
rcService apache enable yes || exit 0
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Nov-2005 08:25:00
Branch: HEAD Handle: 2005110307245900
Modified files:
openpkg-src/apache apache.spec
Log:
fix tracking of hardening patch and upgrade to latest version
Summary:
RevisionChanges Path
1.311 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.310 -r1.311 apache.spec
--- openpkg-src/apache/apache.spec31 Oct 2005 18:52:10 - 1.310
+++ openpkg-src/apache/apache.spec3 Nov 2005 07:24:59 - 1.311
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
%define V_mod_php4.4.1
-%define V_mod_php_hardened 4.3.11-0.2.7
+%define V_mod_php_hardened 4.4.1-0.4.5
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051031
+Release: 20051103
# package options (suexec related)
%option with_suexec yes
@@ -212,7 +212,7 @@
Patch0: apache.patch
Patch1: apache.patch.modowa
Patch2: apache.patch.php
-Patch3:
http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz
+Patch3:
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
Patch4: apache.patch.suphp
# build information
@@ -451,8 +451,8 @@
}
prog apache:mod_php_hardened = {
version = %{V_mod_php_hardened}
-url = http://www.hardened-php.net/download.php
-regex = hardened-php-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
+url = http://www.hardened-php.net/downloads.13.html
+regex = hardening-patch-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
}
prog apache:mod_relocate = {
version = %{V_mod_relocate}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Oct-2005 19:52:11
Branch: HEAD Handle: 2005103118521000
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.34 20051018 - 20051031
Summary:
RevisionChanges Path
1.310 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.309 -r1.310 apache.spec
--- openpkg-src/apache/apache.spec18 Oct 2005 06:46:26 - 1.309
+++ openpkg-src/apache/apache.spec31 Oct 2005 18:52:10 - 1.310
@@ -35,7 +35,7 @@
%define V_apache 1.3.34
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
-%define V_mod_php4.4.0
+%define V_mod_php4.4.1
%define V_mod_php_hardened 4.3.11-0.2.7
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051018
+Release: 20051031
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Oct-2005 08:51:18
Branch: HEAD Handle: 2005100907511800
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20051006 - 20051009
Summary:
RevisionChanges Path
1.308 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.307 -r1.308 apache.spec
--- openpkg-src/apache/apache.spec6 Oct 2005 07:29:20 - 1.307
+++ openpkg-src/apache/apache.spec9 Oct 2005 06:51:18 - 1.308
@@ -51,7 +51,7 @@
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
%define V_mod_security 1.8.7
-%define V_mod_evasive1.10
+%define V_mod_evasive1.10.1
%define V_suphp 0.6.0
# package information
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051006
+Release: 20051009
# package options (suexec related)
%option with_suexec yes
@@ -1026,8 +1026,8 @@
# optionally prepare mod_evasive
%if %{with_mod_evasive} == yes
-( cd mod_dosevasive
- cp mod_dosevasive.c ../apache_%{V_apache}/src/modules/extra/
+( cd mod_evasive
+ cp mod_evasive.c ../apache_%{V_apache}/src/modules/extra/
) || exit $?
%endif
@@ -1182,7 +1182,7 @@
--activate-module=src/modules/extra/mod_security.o \
%endif
%if %{with_mod_evasive} == yes
- --activate-module=src/modules/extra/mod_dosevasive.o \
+ --activate-module=src/modules/extra/mod_evasive.o \
%endif
--enable-module=so
%{l_make} %{l_mflags -O} build-quiet
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Oct-2005 09:29:20
Branch: HEAD Handle: 2005100608292000
Modified files:
openpkg-src/apache apache.spec
Log:
track only releases
Summary:
RevisionChanges Path
1.307 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.306 -r1.307 apache.spec
--- openpkg-src/apache/apache.spec28 Sep 2005 15:28:27 - 1.306
+++ openpkg-src/apache/apache.spec6 Oct 2005 07:29:20 - 1.307
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050928
+Release: 20051006
# package options (suexec related)
%option with_suexec yes
@@ -482,7 +482,7 @@
prog apache:mod_security = {
version = %{V_mod_security}
url = http://www.modsecurity.org/download/
-regex = modsecurity-(__VER__)\.tar\.gz
+regex = modsecurity-(\d+\.\d+(\.\d+)*)\.tar\.gz
}
prog apache:mod_evasive = {
version = %{V_mod_evasive}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Sep-2005 17:28:27
Branch: HEAD Handle: 2005092816282700
Modified files:
openpkg-src/apache apache.spec
Log:
simplify tracking
Summary:
RevisionChanges Path
1.306 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.305 -r1.306 apache.spec
--- openpkg-src/apache/apache.spec17 Sep 2005 17:42:37 - 1.305
+++ openpkg-src/apache/apache.spec28 Sep 2005 15:28:27 - 1.306
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050917
+Release: 20050928
# package options (suexec related)
%option with_suexec yes
@@ -442,7 +442,7 @@
prog apache:mod_perl = {
version = %{V_mod_perl}
url = http://perl.apache.org/dist/
-regex = mod_perl-(1\.[2-8]\d+)\.tar\.gz
+regex = mod_perl-(1\.\d+)\.tar\.gz
}
prog apache:mod_php = {
version = %{V_mod_php}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Sep-2005 19:42:37
Branch: HEAD Handle: 2005091718423700
Modified files:
openpkg-src/apache apache.spec
Log:
mod_dosevasive was renamed to mod_evasive although it is still the
same version and still uses mod_dosevasive as its internal module name
Summary:
RevisionChanges Path
1.305 +12 -12 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.304 -r1.305 apache.spec
--- openpkg-src/apache/apache.spec7 Sep 2005 16:53:01 - 1.304
+++ openpkg-src/apache/apache.spec17 Sep 2005 17:42:37 - 1.305
@@ -51,7 +51,7 @@
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
%define V_mod_security 1.8.7
-%define V_mod_dosevasive 1.10
+%define V_mod_evasive1.10
%define V_suphp 0.6.0
# package information
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050907
+Release: 20050917
# package options (suexec related)
%option with_suexec yes
@@ -100,7 +100,7 @@
%option with_mod_roaming no
%option with_mod_relocate no
%option with_mod_security no
-%option with_mod_dosevasive no
+%option with_mod_evasive no
# package options (optional PHP4 specific settings; requires
with_mod_php)
# please note the lack of an PEAR option since PEAR is provided by the
'php' package
@@ -201,7 +201,7 @@
Source16:
http://osdn.dl.sourceforge.net/modauthmysql/mod_auth_mysql-%{V_mod_auth_mysql}.tar.gz
Source17: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
Source18:
http://www.modsecurity.org/download/modsecurity-%{V_mod_security}.tar.gz
-Source19:
http://www.nuclearelephant.com/projects/dosevasive/mod_dosevasive_%{V_mod_dosevasive}.tar.gz
+Source19:
http://www.nuclearelephant.com/projects/mod_evasive/mod_evasive_%{V_mod_evasive}.tar.gz
Source20: http://www.sharemation.com/~dmcmahon/unix_all.tgz
Source21: apache.conf
Source22: apache.base
@@ -484,10 +484,10 @@
url = http://www.modsecurity.org/download/
regex = modsecurity-(__VER__)\.tar\.gz
}
-prog apache:mod_dosevasive = {
-version = %{V_mod_dosevasive}
-url = http://www.nuclearelephant.com/projects/dosevasive/
-regex = mod_dosevasive[._-](__VER__)\.tar\.gz
+prog apache:mod_evasive = {
+version = %{V_mod_evasive}
+url = http://www.nuclearelephant.com/projects/mod_evasive/
+regex = mod_evasive[._-](__VER__)\.tar\.gz
}
%prep
@@ -575,7 +575,7 @@
%if %{with_mod_security} == yes
%setup -q -T -D -a 18
%endif
-%if %{with_mod_dosevasive} == yes
+%if %{with_mod_evasive} == yes
%setup -q -T -D -a 19
%endif
%if %{with_mod_owa} == yes
@@ -1024,8 +1024,8 @@
) || exit $?
%endif
-# optionally prepare mod_dosevasive
-%if %{with_mod_dosevasive} == yes
+# optionally prepare mod_evasive
+%if %{with_mod_evasive} == yes
( cd mod_dosevasive
cp mod_dosevasive.c ../apache_%{V_apache}/src/modules/extra/
) || exit $?
@@ -1181,7 +1181,7 @@
%if %{with_mod_security} == yes
--activate-module=src/modules/extra/mod_security.o \
%endif
-%if %{with_mod_dosevasive} == yes
+%if %{with_mod_evasive} == yes
--activate-module=src/modules/extra/mod_dosevasive.o \
%endif
--enable-module=so
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Sep-2005 18:53:02
Branch: HEAD Handle: 2005090717530100
Modified files:
openpkg-src/apache apache.spec
Log:
allow suPHP to be further adjusted under build-time
Summary:
RevisionChanges Path
1.304 +8 -1 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.303 -r1.304 apache.spec
--- openpkg-src/apache/apache.spec7 Sep 2005 11:42:53 - 1.303
+++ openpkg-src/apache/apache.spec7 Sep 2005 16:53:01 - 1.304
@@ -76,6 +76,8 @@
%option with_suphpno
%option with_suphp_caller %{l_nusr}
%option with_suphp_phpcgi %{l_prefix}/cgi/php
+%option with_suphp_ugid_mode paranoid
+%option with_suphp_ugid_check yes
# package options (additionally used Apache modules; can be enabled
without thinking)
%option with_mod_ssl no
@@ -1005,7 +1007,12 @@
--with-apxs= \
--with-apache-user=%{with_suphp_caller} \
--with-php=%{with_suphp_phpcgi} \
- --with-logfile=%{l_prefix}/var/apache/log/suphp.log
+ --with-logfile=%{l_prefix}/var/apache/log/suphp.log \
+%if %{with_suphp_ugid_check} == no
+ --disable-checkuid \
+ --disable-checkgid \
+%endif
+ --with-setid-mode=%{with_suphp_ugid_mode}
%{l_make} %{l_mflags -O}
) || exit $?
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Sep-2005 23:10:32
Branch: HEAD Handle: 2005090222103100
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20050713 - 20050902
Summary:
RevisionChanges Path
1.301 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.300 -r1.301 apache.spec
--- openpkg-src/apache/apache.spec13 Jul 2005 11:44:43 - 1.300
+++ openpkg-src/apache/apache.spec2 Sep 2005 21:10:31 - 1.301
@@ -33,7 +33,7 @@
# package component versions
%define V_apache 1.3.33
-%define V_mod_ssl2.8.23-1.3.33
+%define V_mod_ssl2.8.24-1.3.33
%define V_mod_perl 1.29
%define V_mod_php4.4.0
%define V_mod_php_hardened 4.3.11-0.2.7
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050713
+Release: 20050902
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Jul-2005 13:44:44
Branch: HEAD Handle: 2005071312444300
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20050706 - 20050713
Summary:
RevisionChanges Path
1.300 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.299 -r1.300 apache.spec
--- openpkg-src/apache/apache.spec6 Jul 2005 12:54:18 - 1.299
+++ openpkg-src/apache/apache.spec13 Jul 2005 11:44:43 - 1.300
@@ -35,7 +35,7 @@
%define V_apache 1.3.33
%define V_mod_ssl2.8.23-1.3.33
%define V_mod_perl 1.29
-%define V_mod_php4.3.11
+%define V_mod_php4.4.0
%define V_mod_php_hardened 4.3.11-0.2.7
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050706
+Release: 20050713
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2005 20:28:24
Branch: HEAD Handle: 2005062219282100
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20050611 - 20050622
Summary:
RevisionChanges Path
1.298 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.297 -r1.298 apache.spec
--- openpkg-src/apache/apache.spec11 Jun 2005 18:08:51 - 1.297
+++ openpkg-src/apache/apache.spec22 Jun 2005 18:28:21 - 1.298
@@ -43,7 +43,7 @@
%define V_mod_auth_pam 1.1.1
%define V_mod_auth_ldap 2.4.2
%define V_mod_auth_radius1.5.7
-%define V_mod_auth_mysql 2.9.0
+%define V_mod_auth_mysql 3.0.0
%define V_mod_gzip 1.3.26.1a
%define V_mod_fastcgi2.4.2
%define V_mod_throttle 312
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050611
+Release: 20050622
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Jun-2005 20:08:51
Branch: HEAD Handle: 2005061119085100
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20050514 - 20050611
Summary:
RevisionChanges Path
1.297 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.296 -r1.297 apache.spec
--- openpkg-src/apache/apache.spec14 May 2005 20:41:42 - 1.296
+++ openpkg-src/apache/apache.spec11 Jun 2005 18:08:51 - 1.297
@@ -52,7 +52,7 @@
%define V_mod_relocate 1.0
%define V_mod_security 1.8.7
%define V_mod_dosevasive 1.10
-%define V_suphp 0.5.2
+%define V_suphp 0.6.0
# package information
Name: apache
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050514
+Release: 20050611
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Apr-2005 19:18:09
Branch: HEAD Handle: 2005040518180900
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20050401 - 20050405
Summary:
RevisionChanges Path
1.294 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.293 -r1.294 apache.spec
--- openpkg-src/apache/apache.spec1 Apr 2005 06:20:27 - 1.293
+++ openpkg-src/apache/apache.spec5 Apr 2005 17:18:09 - 1.294
@@ -36,7 +36,7 @@
%define V_mod_ssl2.8.22-1.3.33
%define V_mod_perl 1.29
%define V_mod_php4.3.11
-%define V_mod_php_hardened 4.3.10-0.2.6
+%define V_mod_php_hardened 4.3.11-0.2.6
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050401
+Release: 20050405
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Mar-2005 09:39:23
Branch: HEAD Handle: 2005033008392300
Modified files:
openpkg-src/apache apache.spec
Log:
fix building under with_mod_auth_mysql
Summary:
RevisionChanges Path
1.292 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.291 -r1.292 apache.spec
--- openpkg-src/apache/apache.spec25 Mar 2005 17:05:20 - 1.291
+++ openpkg-src/apache/apache.spec30 Mar 2005 07:39:23 - 1.292
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050325
+Release: 20050330
# package options (suexec related)
%option with_suexec yes
@@ -934,7 +934,7 @@
%if %{with_mod_auth_mysql} == yes
%{l_shtool} install -c -m 644 \
-e 's;^[ ]*MYSQL_LIB=.*$;;' \
-mod_auth_mysql.c \
+mod_auth_mysql-%{V_mod_auth_mysql}/mod_auth_mysql.c \
apache_%{V_apache}/src/modules/extra/
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Mar-2005 11:25:32
Branch: HEAD Handle: 2005030910253200
Modified files:
openpkg-src/apache apache.spec
Log:
modsecurity changed its name (no more underscore), and modifying
package: apache-1.3.33 20050301 - 20050308
Summary:
RevisionChanges Path
1.289 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.288 -r1.289 apache.spec
--- openpkg-src/apache/apache.spec1 Mar 2005 08:29:30 - 1.288
+++ openpkg-src/apache/apache.spec9 Mar 2005 10:25:32 - 1.289
@@ -51,7 +51,7 @@
%define V_mod_access_referer 1.0.2
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
-%define V_mod_security 1.8.6
+%define V_mod_security 1.8.7
%define V_mod_dosevasive 1.10
%define V_suphp 0.5.2
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050301
+Release: 20050309
# package options (suexec related)
%option with_suexec yes
@@ -199,7 +199,7 @@
Source15:
ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-%{V_mod_auth_radius}.tar
Source16:
http://osdn.dl.sourceforge.net/modauthmysql/mod_auth_mysql-%{V_mod_auth_mysql}.tar.gz
Source17: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
-Source18:
http://www.modsecurity.org/download/mod_security-%{V_mod_security}.tar.gz
+Source18:
http://www.modsecurity.org/download/modsecurity-%{V_mod_security}.tar.gz
Source19:
http://www.nuclearelephant.com/projects/dosevasive/mod_dosevasive_%{V_mod_dosevasive}.tar.gz
Source20: http://www.sharemation.com/~dmcmahon/unix_all.tgz
Source21: apache.conf
@@ -476,7 +476,7 @@
prog apache:mod_security = {
version = %{V_mod_security}
url = http://www.modsecurity.org/download/
-regex = mod_security-(__VER__)\.tar\.gz
+regex = modsecurity-(__VER__)\.tar\.gz
}
prog apache:mod_dosevasive = {
version = %{V_mod_dosevasive}
@@ -999,7 +999,7 @@
# optionally prepare mod_security
%if %{with_mod_security} == yes
-( cd mod_security-%{V_mod_security}/apache1
+( cd modsecurity-%{V_mod_security}/apache1
cp mod_security.c ../../apache_%{V_apache}/src/modules/extra/
) || exit $?
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Mar-2005 09:29:30
Branch: HEAD Handle: 2005030108293000
Modified files:
openpkg-src/apache apache.spec
Log:
synchronize gd/pdflib support with 'php' package
Summary:
RevisionChanges Path
1.288 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.287 -r1.288 apache.spec
--- openpkg-src/apache/apache.spec28 Feb 2005 13:27:28 - 1.287
+++ openpkg-src/apache/apache.spec1 Mar 2005 08:29:30 - 1.288
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050228
+Release: 20050301
# package options (suexec related)
%option with_suexec yes
@@ -669,7 +669,7 @@
%if %{with_mod_ssl} == yes
CFLAGS=$CFLAGS -DEAPI
%endif
-%if %{with_mod_php_gd} == yes
+%if %{with_mod_php_gd} == yes || %{with_mod_php_pdflib} == yes
LIBS=$LIBS -lpng -lz
%endif
%if %{with_mod_php_gettext} == yes || %{with_mod_php_mssql} == yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Feb-2005 14:27:29
Branch: HEAD Handle: 2005022813272800
Modified files:
openpkg-src/apache apache.spec rc.apache
Log:
return is only allowed within a function
Summary:
RevisionChanges Path
1.287 +1 -1 openpkg-src/apache/apache.spec
1.19+1 -1 openpkg-src/apache/rc.apache
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.286 -r1.287 apache.spec
--- openpkg-src/apache/apache.spec27 Feb 2005 21:54:44 - 1.286
+++ openpkg-src/apache/apache.spec28 Feb 2005 13:27:28 - 1.287
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050227
+Release: 20050228
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.18 -r1.19 rc.apache
--- openpkg-src/apache/rc.apache 13 Aug 2004 19:20:39 - 1.18
+++ openpkg-src/apache/rc.apache 28 Feb 2005 13:27:28 - 1.19
@@ -40,7 +40,7 @@
( [ -e @l_prefix@/etc/apache/apache.sh ] \
. @l_prefix@/etc/apache/apache.sh
@l_prefix@/sbin/apache
-) || return $?
+) || exit $?
%stop -u @l_susr@
rcService apache enable yes || exit 0
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Feb-2005 22:54:44
Branch: HEAD Handle: 2005022721544400
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20050207 - 20050227
Summary:
RevisionChanges Path
1.286 +3 -3 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.285 -r1.286 apache.spec
--- openpkg-src/apache/apache.spec7 Feb 2005 16:23:46 - 1.285
+++ openpkg-src/apache/apache.spec27 Feb 2005 21:54:44 - 1.286
@@ -44,7 +44,7 @@
%define V_mod_auth_pam 1.1.1
%define V_mod_auth_ldap 2.4.2
%define V_mod_auth_radius1.5.7
-%define V_mod_auth_mysql 2.8.1
+%define V_mod_auth_mysql 2.9.0
%define V_mod_gzip 1.3.19.1a
%define V_mod_fastcgi2.4.2
%define V_mod_throttle 312
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050207
+Release: 20050227
# package options (suexec related)
%option with_suexec yes
@@ -927,7 +927,7 @@
%if %{with_mod_auth_mysql} == yes
%{l_shtool} install -c -m 644 \
-e 's;^[ ]*MYSQL_LIB=.*$;;' \
-mod_auth_mysql-%{V_mod_auth_mysql}/mod_auth_mysql.c \
+mod_auth_mysql.c \
apache_%{V_apache}/src/modules/extra/
%endif
# optionally prepare mod_gzip
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Feb-2005 17:23:46
Branch: HEAD Handle: 2005020716234600
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20050206 - 20050207
Summary:
RevisionChanges Path
1.285 +5 -5 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.284 -r1.285 apache.spec
--- openpkg-src/apache/apache.spec6 Feb 2005 13:50:04 - 1.284
+++ openpkg-src/apache/apache.spec7 Feb 2005 16:23:46 - 1.285
@@ -52,7 +52,7 @@
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
%define V_mod_security 1.8.6
-%define V_mod_dosevasive 1.9
+%define V_mod_dosevasive 1.10
%define V_suphp 0.5.2
# package information
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20050206
+Release: 20050207
# package options (suexec related)
%option with_suexec yes
@@ -200,7 +200,7 @@
Source16:
http://osdn.dl.sourceforge.net/modauthmysql/mod_auth_mysql-%{V_mod_auth_mysql}.tar.gz
Source17: http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
Source18:
http://www.modsecurity.org/download/mod_security-%{V_mod_security}.tar.gz
-Source19:
http://www.nuclearelephant.com/projects/dosevasive/mod_dosevasive.%{V_mod_dosevasive}.tar.gz
+Source19:
http://www.nuclearelephant.com/projects/dosevasive/mod_dosevasive_%{V_mod_dosevasive}.tar.gz
Source20: http://www.sharemation.com/~dmcmahon/unix_all.tgz
Source21: apache.conf
Source22: apache.base
@@ -403,7 +403,7 @@
}
prog apache:mod_auth_mysql = {
version = %{V_mod_auth_mysql}
-url = http://osdn.dl.sourceforge.net/modauthmysql/
+url = http://prdownloads.sourceforge.net/modauthmysql/
regex = mod_auth_mysql-(__VER__)\.tar\.gz
}
prog apache:mod_auth_radius = {
@@ -481,7 +481,7 @@
prog apache:mod_dosevasive = {
version = %{V_mod_dosevasive}
url = http://www.nuclearelephant.com/projects/dosevasive/
-regex = mod_dosevasive\.(__VER__)\.tar\.gz
+regex = mod_dosevasive[._-](__VER__)\.tar\.gz
}
%prep
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Dec-2004 13:35:42
Branch: HEAD Handle: 2004122312354200
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.33 20041218 - 20041223
Summary:
RevisionChanges Path
1.281 +2 -2 openpkg-src/apache/apache.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.280 -r1.281 apache.spec
--- openpkg-src/apache/apache.spec18 Dec 2004 21:47:21 - 1.280
+++ openpkg-src/apache/apache.spec23 Dec 2004 12:35:42 - 1.281
@@ -37,7 +37,7 @@
%define V_mod_ssl2.8.22-1.3.33
%define V_mod_perl 1.29
%define V_mod_php4.3.10
-%define V_mod_php_hardened 4.3.10-0.2.5
+%define V_mod_php_hardened 4.3.10-0.2.6
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20041218
+Release: 20041223
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
