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: 25-Jul-2004 00:32:47
Branch: HEAD Handle: 2004072423324700
Modified files:
openpkg-src/apache2 apache2.spec rc.apache2
Log:
work-off this package a little bit more
Summary:
Revision Changes Path
1.47 +116 -11 openpkg-src/apache2/apache2.spec
1.11 +0 -3 openpkg-src/apache2/rc.apache2
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 apache2.spec
--- openpkg-src/apache2/apache2.spec 29 Jun 2004 17:39:37 -0000 1.46
+++ openpkg-src/apache2/apache2.spec 24 Jul 2004 22:32:47 -0000 1.47
@@ -34,7 +34,19 @@
Group: Web
License: ASF
Version: 2.0.50
-Release: 20040629
+Release: 20040725
+
+# package options (suexec related)
+%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
+%option with_mod_ldap no
+%option with_mod_proxy no
# list of sources
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -44,11 +56,25 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl, make, expat, libiconv, db
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, make
PreReq: OpenPKG, openpkg >= 20040130, perl
+BuildPreReq: expat, libiconv, db
+PreReq: expat, libiconv, db
+%if "%{with_mod_deflate}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
+%if "%{with_mod_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
+%if "%{with_mod_ldap}" == "yes"
+BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
+%endif
AutoReq: no
AutoReqProv: no
-Conflicts: apache, apr
+Conflicts: apache
%description
The Apache Project is a collaborative software development effort
@@ -61,6 +87,11 @@
of users have contributed ideas, code, and documentation to the
project.
+ NOTICE: This is Apache 2.0, a complete work-off of the old Apache
+ 1.3 code-base, now based on the Apache Portable Runtime (APR). It
+ is mostly configuration compatible to Apache 1.3, but the C API is
+ completely incompatible.
+
%track
prog apache2 = {
version = %{version}
@@ -71,38 +102,112 @@
%prep
%setup -q -n httpd-%{version}
%patch -p0
- %{l_shtool} subst \
- -e 's;^\(PROGRAM_LDADD.*\)$;\1 -liconv;' \
- Makefile.in support/Makefile.in
%build
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
+ # configure package
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags}"
+ export LIBS=""
+%if "%{with_mod_ldap}" == "yes"
+ LIBS="$LIBS -lssl -lcrypto"
+%endif
./configure \
--enable-layout=GNU \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/apache2 \
--libexecdir=%{l_prefix}/libexec/apache2 \
- --with-expat=%{l_prefix} \
- --with-berkeley-db=%{l_prefix} \
--with-mpm=prefork \
- --disable-shared
+%if "%{with_suexec}" == "yes"
+ --enable-suexec \
+ --with-suexec-bin=%{l_prefix}/sbin/suexec \
+ --with-suexec-caller=%{with_suexec_caller} \
+ --with-suexec-userdir=%{with_suexec_userdir} \
+ --with-suexec-logfile=%{l_prefix}/var/apache/log/suexec.log \
+%endif
+%if "%{with_mod_deflate}" == "yes"
+ --enable-deflate \
+ --with-z=%{l_prefix} \
+%endif
+%if "%{with_mod_ssl}" == "yes"
+ --enable-ssl \
+ --with-ssl=%{l_prefix} \
+%endif
+%if "%{with_mod_dav}" == "yes"
+ --enable-dav \
+ --enable-dav-fs \
+%endif
+%if "%{with_mod_ldap}" == "yes"
+ --enable-ldap \
+ --enable-auth-ldap \
+ --with-ldap \
+ --with-ldap-include=%{l_prefix}/include/ \
+ --with-ldap-lib=%{l_prefix}/lib \
+%endif
+%if "%{with_mod_proxy}" == "yes"
+ --enable-proxy \
+ --enable-proxy-connect \
+ --enable-proxy-http \
+ --enable-proxy-ftp \
+%endif
+ --enable-rewrite \
+ --enable-headers \
+ --enable-info \
+ --enable-mime-magic \
+ --enable-vhost-alias \
+ --enable-auth-dbm \
+ --disable-shared \
+ --disable-threads \
+ --with-dbm=db42 \
+ --with-berkeley-db=%{l_prefix} \
+ --with-expat=%{l_prefix} \
+ --with-iconv=%{l_prefix}
+
+ # build package
%{l_make} %{l_mflags}
%install
+ # install package
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+
+ # adjust configuration
%{l_shtool} subst \
-e 's;^\(Listen\).*;\1 127.0.0.1:80;' \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache2/httpd.conf
+
+ # install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.apache2} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # strip down installation
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libapr*
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/share/apache2/manual
+ find . -name "*.xml" -print | xargs rm -f
+ find . -name "*.xml.*" -print | xargs rm -f
+ find . -name "*.xsl" -print | xargs rm -f
+ for html in `find . -name "*.html" -print`; do
+ if [ -f "$html.en" ]; then
+ mv $html.en $html
+ rm -f $html.*
+ fi
+ done
+ rm -rf style/xsl
+ rm -rf style/latex
+ ) || exit $?
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+%if "%{with_suexec}" == "yes"
+ '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suexec' \
+%endif
'%config %{l_prefix}/etc/apache2/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/rc.apache2
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.apache2
--- openpkg-src/apache2/rc.apache2 14 Oct 2003 16:15:42 -0000 1.10
+++ openpkg-src/apache2/rc.apache2 24 Jul 2004 22:32:47 -0000 1.11
@@ -52,8 +52,6 @@
%daily -u @l_susr@
rcService apache2 enable yes || exit 0
-
- # rotate logfiles
rcTmp -i
hintfile=`rcTmp -f -n hint`
shtool rotate -f \
@@ -68,7 +66,6 @@
-P "$apache2_err_rotprolog" \
-E "$apache2_err_rotepilog && echo 1 >$hintfile" \
${apache2_err_files}
-
if [ -s $hintfile ]; then
@l_prefix@/sbin/apachectl restart
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]