[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2007-06-08 Thread Thomas Lotterer
  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:   08-Jun-2007 16:10:44
  Branch: HEAD Handle: 2007060815104300

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
configure option for LDAP based authentication was renamed

  Summary:
RevisionChanges Path
1.90+2  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.89 -r1.90 apache2.spec
  --- openpkg-src/apache2/apache2.spec  6 Jun 2007 13:05:52 -   1.89
  +++ openpkg-src/apache2/apache2.spec  8 Jun 2007 14:10:43 -   1.90
  @@ -33,7 +33,7 @@
   Group:Web
   License:  ASF
   Version:  2.2.4
  -Release:  20070606
  +Release:  20070608
   
   #   package options (generic)
   %option   with_mpm  prefork
  @@ -186,7 +186,7 @@
   %endif
   %if "%{with_mod_ldap}" == "yes"
 --enable-ldap \
  -  --enable-auth-ldap \
  +  --enable-authnz-ldap \
 --with-ldap \
 --with-ldap-include=%{l_prefix}/include/ \
 --with-ldap-lib=%{l_prefix}/lib \
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2007-05-30 Thread Thomas Lotterer
  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:   30-May-2007 17:00:24
  Branch: HEAD Handle: 2007053016002300

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
envvars needs to executed by /sbin/apxs

  Summary:
RevisionChanges Path
1.88+3  -0  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.87 -r1.88 apache2.spec
  --- openpkg-src/apache2/apache2.spec  30 May 2007 09:09:40 -  1.87
  +++ openpkg-src/apache2/apache2.spec  30 May 2007 15:00:23 -  1.88
  @@ -251,6 +251,9 @@
 rm -fr $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/{extra,original}
   ) || exit $?
   
  +#   adjust permissions
  +chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars
  +
   #   adjust GNU libtool configuration
   %{l_shtool} subst \
   -e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2007-05-29 Thread Ralf S. Engelschall
  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-May-2007 12:01:39
  Branch: HEAD Handle: 2007052911013800

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
remove the broken mod_perl support (will be re-implemented externally
perhaps)

  Summary:
RevisionChanges Path
1.86+11 -57 openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.85 -r1.86 apache2.spec
  --- openpkg-src/apache2/apache2.spec  29 May 2007 09:44:35 -  1.85
  +++ openpkg-src/apache2/apache2.spec  29 May 2007 10:01:38 -  1.86
  @@ -22,12 +22,6 @@
   ##  SUCH DAMAGE.
   ##
   
  -#   FIXME: with_mod_perl broken
  -
  -#   package version
  -%define   V_apache   2.2.4
  -%define   V_mod_perl 2.0.3
  -
   #   package information
   Name: apache2
   Summary:  Apache HTTP Server (V2)
  @@ -38,7 +32,7 @@
   Class:PLUS
   Group:Web
   License:  ASF
  -Version:  %{V_apache}
  +Version:  2.2.4
   Release:  20070529
   
   #   package options (generic)
  @@ -60,7 +54,6 @@
   %option   with_mod_memcache no
   %option   with_mod_filecacheno
   %option   with_mod_expires  no
  -%option   with_mod_perl no
   %option   with_shared_core  no
   
   #   fixing implicit inter-module dependencies and correlations
  @@ -70,12 +63,11 @@
   %endif
   
   #   list of sources
  -Source0:  http://www.apache.org/dist/httpd/httpd-%{V_apache}.tar.gz
  -Source1:  http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz
  -Source2:  rc.apache2
  -Source3:  apache2.base
  -Source4:  apache2.conf
  -Source5:  apache2.sh
  +Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  +Source1:  rc.apache2
  +Source2:  apache2.base
  +Source3:  apache2.conf
  +Source4:  apache2.sh
   Patch0:   apache2.patch
   
   #   build information
  @@ -119,15 +111,10 @@
   
   %track
   prog apache2 = {
  -version   = %{V_apache}
  +version   = %{version}
   url   = http://www.apache.org/dist/httpd/
   regex = httpd-(2.[02468]\.\d+)\.tar\.gz
   }
  -prog apache2:mod_perl = {
  -version   = %{V_mod_perl}
  -url   = http://perl.apache.org/dist/
  -regex = mod_perl-(__VER__)\.tar\.gz
  -}
   
   %prep
   #   some pre-flight checks on options specified
  @@ -143,47 +130,14 @@
   
   #   unpack Apache distribution
   %setup -q -c
  -%patch -p0 -d httpd-%{V_apache}
  +%patch -p0 -d httpd-%{version}
   %{l_shtool} subst \
   -e 's;(" PLATFORM ");(%{l_openpkg_release -F "OpenPKG/%%t"});g' \
  -httpd-%{V_apache}/server/core.c
  -
  -#   unpack optional extension modules
  -%if "%{with_mod_perl}" == "yes"
  -%setup -q -T -D -a 1
  -%endif
  +httpd-%{version}/server/core.c
   
   %build
  -#   optionally prepare mod_perl
  -%if "%{with_mod_perl}" == "yes"
  -( cd mod_perl-%{V_mod_perl}
  -  eval `%{l_prefix}/bin/perl -V:archname`
  -  eval `%{l_prefix}/bin/perl -V:version`
  -  eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib 
-V:installsitearch -V:installsitelib`
  -  %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
  -  perl=$RPM_BUILD_ROOT%{l_prefix}/bin/perl
  -  echo "#!/bin/sh" >$perl
  -  echo "exec %{l_prefix}/bin/perl \\" >>$perl
  -  echo " -I${RPM_BUILD_ROOT}${installarchlib}  \\" >>$perl
  -  echo " -I${RPM_BUILD_ROOT}${installprivlib}  \\" >>$perl
  -  echo " -I${RPM_BUILD_ROOT}${installsitearch} \\" >>$perl
  -  echo " -I${RPM_BUILD_ROOT}${installsitelib}  \\" >>$perl
  -  echo " \"[EMAIL PROTECTED]"" >>$perl
  -  chmod a+x $perl
  -  $perl Makefile.PL \
  -  MP_AP_PREFIX="`pwd`/../httpd-%{V_apache}" \
  -  MP_CCOPTS="%{l_cflags -O}" \
  -  MP_INST_APACHE2=1 \
  -  MP_USE_DSO=0 \
  -  MP_USE_STATIC=1 \
  -  MP_COMPAT_1X=1
  -  %{l_make} %{l_mflags}
  -  %{l_make} %{l_mflags} install
  -) || exit $?
  -%endif
  -
   #   configure package
  -( cd httpd-%{V_apache}
  +( cd httpd-%{version}
 ( echo "ac_cv_func_uuid_create=no"
 ) >config.cache
 export CC="%{l_cc}"
  @@ -293,7 +247,7 @@
   %install
   #   install Apache
   rm -rf $RPM_BUILD_ROOT
  -( cd httpd-%{V_apache}
  +( cd httpd-%{v

[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2007-05-29 Thread Ralf S. Engelschall
  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-May-2007 11:44:36
  Branch: HEAD Handle: 2007052910443500

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
allow one to try out the experimental 'event' MPM

  Summary:
RevisionChanges Path
1.85+7  -6  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.84 -r1.85 apache2.spec
  --- openpkg-src/apache2/apache2.spec  10 Jan 2007 18:55:01 -  1.84
  +++ openpkg-src/apache2/apache2.spec  29 May 2007 09:44:35 -  1.85
  @@ -39,7 +39,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20070110
  +Release:  20070529
   
   #   package options (generic)
   %option   with_mpm  prefork
  @@ -131,11 +131,12 @@
   
   %prep
   #   some pre-flight checks on options specified
  -%if "%{with_mpm}" != "prefork" && "%{with_mpm}" != "worker"
  +%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
  @@ -193,7 +194,7 @@
 case "%{l_platform -t}" in
 *-sunos* ) LIBS="$LIBS -lrt" ;;
 esac
  -%if "%{with_mpm}" == "worker" || "%{with_mod_memcache}" == "yes"
  +%if "%{with_mpm}" == "worker" || "%{with_mpm}" == "event" || 
"%{with_mod_memcache}" == "yes"
 THREADS="--enable-threads"
   %else
 THREADS="--disable-threads"
  @@ -278,9 +279,9 @@
 #   setting might affect package dependencies, therefore fallbacks
 #   are not acceptable
 if ! grep '^MPM_NAME = %{with_mpm}$' build/config_vars.mk >/dev/null 
2>&1; then
  -  ( echo "The Multi-Processing Module (MPM) '%{with_mpm}' requested 
using the 'with_mpm'"
  -echo "option doesn't seem to be available on this particular 
platform."
  -echo "Please check corresponding 'config.log' for details."
  +  ( echo "The Multi-Processing Module (MPM) '%{with_mpm}' requested 
using the"
  +echo "'with_mpm' option doesn't seem to be available on this 
particular"
  +echo "platform. Please check corresponding 'config.log' for 
details."
 ) | %{l_rpmtool} msg -b -t error
 exit 1
 fi
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2006-11-29 Thread Christoph Schug
  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-Nov-2006 18:35:42
  Branch: HEAD Handle: 2006112917354100

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
modifying package: apache2-2.2.3 20061013 -> 20061129

  Summary:
RevisionChanges Path
1.82+2  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.81 -r1.82 apache2.spec
  --- openpkg-src/apache2/apache2.spec  13 Oct 2006 17:26:46 -  1.81
  +++ openpkg-src/apache2/apache2.spec  29 Nov 2006 17:35:41 -  1.82
  @@ -26,7 +26,7 @@
   
   #   package version
   %define   V_apache   2.2.3
  -%define   V_mod_perl 2.0.2
  +%define   V_mod_perl 2.0.3
   
   #   package information
   Name: apache2
  @@ -39,7 +39,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20061013
  +Release:  20061129
   
   #   package options (generic)
   %option   with_mpm  prefork
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2006-08-21 Thread Christoph Schug
  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-Aug-2006 15:46:07
  Branch: HEAD Handle: 2006082114460700

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
misc mod_*cache cleanups and additions

  Summary:
RevisionChanges Path
1.78+17 -6  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.77 -r1.78 apache2.spec
  --- openpkg-src/apache2/apache2.spec  21 Aug 2006 12:31:00 -  1.77
  +++ openpkg-src/apache2/apache2.spec  21 Aug 2006 13:46:07 -  1.78
  @@ -30,7 +30,7 @@
   
   #   package information
   Name: apache2
  -Summary:  Apache Webserver (V2)
  +Summary:  Apache HTTP Server (V2)
   URL:  http://httpd.apache.org/
   Vendor:   Apache Software Foundation
   Packager: OpenPKG
  @@ -56,12 +56,19 @@
   %option   with_mod_ldap no
   %option   with_mod_proxyno
   %option   with_mod_cacheno
  +%option   with_mod_diskcacheno
   %option   with_mod_memcache no
   %option   with_mod_filecacheno
   %option   with_mod_expires  no
   %option   with_mod_perl no
   %option   with_shared_core  no
   
  +#   fixing implicit inter-module dependencies and correlations
  +%if "%{with_mod_memcache}" == "yes" || "%{with_mod_diskcache}" == "yes"
  +%undefine with_mod_cache
  +%define   with_mod_cacheyes
  +%endif
  +
   #   list of sources
   Source0:  http://www.apache.org/dist/httpd/httpd-%{V_apache}.tar.gz
   Source1:  http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz
  @@ -186,6 +193,11 @@
 case "%{l_platform -t}" in
 *-sunos* ) LIBS="$LIBS -lrt" ;;
 esac
  +%if "%{with_mpm}" == "worker" || "%{with_mod_memcache}" == "yes"
  +  THREADS="--enable-threads"
  +%else
  +  THREADS="--disable-threads"
  +%endif
   %if "%{with_mod_ldap}" == "yes"
 LIBS="$LIBS -lssl -lcrypto"
   %endif
  @@ -198,10 +210,7 @@
 --sysconfdir=%{l_prefix}/etc/apache2 \
 --libexecdir=%{l_prefix}/libexec/apache2 \
 --with-mpm=%{with_mpm} \
  -  --disable-threads \
  -%if "%{with_mpm}" == "worker"
  -  --enable-threads \
  -%endif
  +  $THREADS \
   %if "%{with_suexec}" == "yes"
 --enable-suexec \
 --with-suexec-bin=%{l_prefix}/sbin/suexec \
  @@ -236,11 +245,13 @@
   %endif
   %if "%{with_mod_cache}" == "yes"
 --enable-cache \
  +%if "%{with_mod_diskcache}" == "yes"
  +  --enable-disk-cache \
   %endif
   %if "%{with_mod_memcache}" == "yes"
  -  --enable-threads \
 --enable-mem-cache \
   %endif
  +%endif
   %if "%{with_mod_filecache}" == "yes"
 --enable-file-cache \
   %endif
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2006-08-21 Thread Torsten Homeyer
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Torsten Homeyer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   21-Aug-2006 14:31:00
  Branch: HEAD Handle: 200608211331

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
added optional modules cache, mem-cache and expires. mem-cache needs
enable-threads

  Summary:
RevisionChanges Path
1.77+15 -3  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.76 -r1.77 apache2.spec
  --- openpkg-src/apache2/apache2.spec  28 Jul 2006 06:14:40 -  1.76
  +++ openpkg-src/apache2/apache2.spec  21 Aug 2006 12:31:00 -  1.77
  @@ -39,7 +39,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20060728
  +Release:  20060821
   
   #   package options (generic)
   %option   with_mpm  prefork
  @@ -55,7 +55,10 @@
   %option   with_mod_dav  no
   %option   with_mod_ldap no
   %option   with_mod_proxyno
  +%option   with_mod_cacheno
  +%option   with_mod_memcache no
   %option   with_mod_filecacheno
  +%option   with_mod_expires  no
   %option   with_mod_perl no
   %option   with_shared_core  no
   
  @@ -195,10 +198,9 @@
 --sysconfdir=%{l_prefix}/etc/apache2 \
 --libexecdir=%{l_prefix}/libexec/apache2 \
 --with-mpm=%{with_mpm} \
  +  --disable-threads \
   %if "%{with_mpm}" == "worker"
 --enable-threads \
  -%else
  -  --disable-threads \
   %endif
   %if "%{with_suexec}" == "yes"
 --enable-suexec \
  @@ -232,9 +234,19 @@
 --enable-proxy-http \
 --enable-proxy-ftp \
   %endif
  +%if "%{with_mod_cache}" == "yes"
  +  --enable-cache \
  +%endif
  +%if "%{with_mod_memcache}" == "yes"
  +  --enable-threads \
  +  --enable-mem-cache \
  +%endif
   %if "%{with_mod_filecache}" == "yes"
 --enable-file-cache \
   %endif
  +%if "%{with_mod_expires}" == "yes"
  +  --enable-expires \
  +%endif
   %if "%{with_shared_core}" == "yes"
 --enable-so \
   %endif
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2006-07-27 Thread Ralf S. Engelschall
  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 08:14:41
  Branch: HEAD Handle: 2006072807144000

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
upgrading package: apache2 2.2.2 -> 2.2.3

  Summary:
RevisionChanges Path
1.76+2  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.75 -r1.76 apache2.spec
  --- openpkg-src/apache2/apache2.spec  22 Jun 2006 08:51:09 -  1.75
  +++ openpkg-src/apache2/apache2.spec  28 Jul 2006 06:14:40 -  1.76
  @@ -25,7 +25,7 @@
   #   FIXME: with_mod_perl broken
   
   #   package version
  -%define   V_apache   2.2.2
  +%define   V_apache   2.2.3
   %define   V_mod_perl 2.0.2
   
   #   package information
  @@ -39,7 +39,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20060622
  +Release:  20060728
   
   #   package options (generic)
   %option   with_mpm  prefork
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2006-04-26 Thread Ralf S. Engelschall
  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-Apr-2006 18:22:04
  Branch: HEAD Handle: 2006042617220400

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
fix typo

  Summary:
RevisionChanges Path
1.73+1  -1  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.72 -r1.73 apache2.spec
  --- openpkg-src/apache2/apache2.spec  26 Apr 2006 15:49:52 -  1.72
  +++ openpkg-src/apache2/apache2.spec  26 Apr 2006 16:22:04 -  1.73
  @@ -256,7 +256,7 @@
 #   are not acceptable
 if ! grep '^MPM_NAME = %{with_mpm}$' build/config_vars.mk >/dev/null 
2>&1; then
 ( echo "The Multi-Processing Module (MPM) '%{with_mpm}' requested 
using the 'with_mpm'"
  -echo "option doesn't seem to be availble on this particular 
platform."
  +echo "option doesn't seem to be available on this particular 
platform."
   echo "Please check corresponding 'config.log' for details."
 ) | %{l_rpmtool} msg -b -t error
 exit 1
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2005-10-20 Thread Ralf S. Engelschall
  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-Oct-2005 08:05:02
  Branch: HEAD Handle: 2005102107050200

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
modifying package: apache2-2.0.55 20051014 -> 20051021

  Summary:
RevisionChanges Path
1.67+2  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.66 -r1.67 apache2.spec
  --- openpkg-src/apache2/apache2.spec  14 Oct 2005 06:14:35 -  1.66
  +++ openpkg-src/apache2/apache2.spec  21 Oct 2005 06:05:02 -  1.67
  @@ -26,7 +26,7 @@
   
   #   package version
   %define   V_apache   2.0.55
  -%define   V_mod_perl 2.0.1
  +%define   V_mod_perl 2.0.2
   
   #   package information
   Name: apache2
  @@ -39,7 +39,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20051014
  +Release:  20051021
   
   #   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/apache2/ apache2.spec

2005-07-24 Thread Matthias Kurz
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Matthias Kurz
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   24-Jul-2005 21:32:58
  Branch: HEAD Handle: 2005072420325800

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
incompatible API change in OpenSSL 0.9.8
include/openssl/pem.h: PEM_F_DEF_CALLBACK -> PEM_F_PEM_DEF_CALLBACK

  Summary:
RevisionChanges Path
1.63+8  -5  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.62 -r1.63 apache2.spec
  --- openpkg-src/apache2/apache2.spec  18 Jun 2005 10:23:17 -  1.62
  +++ openpkg-src/apache2/apache2.spec  24 Jul 2005 19:32:58 -  1.63
  @@ -39,7 +39,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20050618
  +Release:  20050724
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -74,12 +74,12 @@
   PreReq:   zlib
   %endif
   %if "%{with_mod_ssl}" == "yes"
  -BuildPreReq:  openssl
  -PreReq:   openssl
  +BuildPreReq:  openssl >= 0.9.8
  +PreReq:   openssl >= 0.9.8
   %endif
   %if "%{with_mod_ldap}" == "yes"
  -BuildPreReq:  openldap, openssl
  -PreReq:   openldap, openssl
  +BuildPreReq:  openldap, openssl >= 0.9.8
  +PreReq:   openldap, openssl >= 0.9.8
   %endif
   %if "%{with_mod_perl}" == "yes"
   BuildPreReq:  perl
  @@ -123,6 +123,9 @@
   %if "%{with_mod_perl}" == "yes"
   %setup -q -T -D -a 1
   %endif
  +#   incompatible API change in OpenSSL 0.9.8
  +%{l_shtool} subst -e 's,PEM_F_DEF_CALLBACK,PEM_F_PEM_DEF_CALLBACK,g' \
  +`find . -type f | xargs grep -l PEM_F_DEF_CALLBACK`
   
   %build
   #   optionally prepare mod_perl
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2005-06-18 Thread Ralf S. Engelschall
  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-Jun-2005 12:23:17
  Branch: HEAD Handle: 2005061811231700

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
upgrade althougth building with mod_perl is still broken

  Summary:
RevisionChanges Path
1.62+4  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.61 -r1.62 apache2.spec
  --- openpkg-src/apache2/apache2.spec  6 May 2005 06:38:12 -   1.61
  +++ openpkg-src/apache2/apache2.spec  18 Jun 2005 10:23:17 -  1.62
  @@ -22,9 +22,11 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   FIXME: with_mod_perl broken
  +
   #   package version
   %define   V_apache   2.0.54
  -%define   V_mod_perl 2.0.0-RC6
  +%define   V_mod_perl 2.0.1
   
   #   package information
   Name: apache2
  @@ -37,7 +39,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20050506
  +Release:  20050618
   
   #   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/apache2/ apache2.spec

2005-05-05 Thread Ralf S. Engelschall
  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-May-2005 08:38:13
  Branch: HEAD Handle: 2005050607381200

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
modifying package: apache2-2.0.54 20050417 -> 20050506

  Summary:
RevisionChanges Path
1.61+2  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.60 -r1.61 apache2.spec
  --- openpkg-src/apache2/apache2.spec  17 Apr 2005 18:01:39 -  1.60
  +++ openpkg-src/apache2/apache2.spec  6 May 2005 06:38:12 -   1.61
  @@ -24,7 +24,7 @@
   
   #   package version
   %define   V_apache   2.0.54
  -%define   V_mod_perl 2.0.0-RC5
  +%define   V_mod_perl 2.0.0-RC6
   
   #   package information
   Name: apache2
  @@ -37,7 +37,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20050417
  +Release:  20050506
   
   #   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/apache2/ apache2.spec

2005-04-17 Thread Ralf S. Engelschall
  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-Apr-2005 20:01:40
  Branch: HEAD Handle: 2005041719013900

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
modifying package: apache2-2.0.54 20050417 again

  Summary:
RevisionChanges Path
1.60+1  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.59 -r1.60 apache2.spec
  --- openpkg-src/apache2/apache2.spec  17 Apr 2005 08:06:53 -  1.59
  +++ openpkg-src/apache2/apache2.spec  17 Apr 2005 18:01:39 -  1.60
  @@ -24,7 +24,7 @@
   
   #   package version
   %define   V_apache   2.0.54
  -%define   V_mod_perl 2.0.0-RC4
  +%define   V_mod_perl 2.0.0-RC5
   
   #   package information
   Name: apache2
  @@ -141,7 +141,6 @@
 chmod a+x $perl
 $perl Makefile.PL \
 MP_AP_PREFIX="`pwd`/../httpd-%{V_apache}" \
  -  MP_AP_BUILD=0 \
 MP_CCOPTS="%{l_cflags -O}" \
 MP_INST_APACHE2=1 \
 MP_USE_DSO=0 \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2005-04-17 Thread Ralf S. Engelschall
  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-Apr-2005 10:06:54
  Branch: HEAD Handle: 2005041709065300

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
upgrading package: apache2 2.0.53 -> 2.0.54

  Summary:
RevisionChanges Path
1.59+111 -60openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.58 -r1.59 apache2.spec
  --- openpkg-src/apache2/apache2.spec  28 Mar 2005 09:25:24 -  1.58
  +++ openpkg-src/apache2/apache2.spec  17 Apr 2005 08:06:53 -  1.59
  @@ -22,6 +22,10 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package version
  +%define   V_apache   2.0.54
  +%define   V_mod_perl 2.0.0-RC4
  +
   #   package information
   Name: apache2
   Summary:  Apache Webserver (V2)
  @@ -32,8 +36,8 @@
   Class:PLUS
   Group:Web
   License:  ASF
  -Version:  2.0.53
  -Release:  20050328
  +Version:  %{V_apache}
  +Release:  20050417
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -47,11 +51,13 @@
   %option   with_mod_ldap no
   %option   with_mod_proxyno
   %option   with_mod_filecacheno
  +%option   with_mod_perl no
   %option   with_shared_core  no
   
   #   list of sources
  -Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  -Source1:  rc.apache2
  +Source0:  http://www.apache.org/dist/httpd/httpd-%{V_apache}.tar.gz
  +Source1:  http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz
  +Source2:  rc.apache2
   Patch0:   apache2.patch
   
   #   build information
  @@ -73,6 +79,10 @@
   BuildPreReq:  openldap, openssl
   PreReq:   openldap, openssl
   %endif
  +%if "%{with_mod_perl}" == "yes"
  +BuildPreReq:  perl
  +PreReq:   perl
  +%endif
   AutoReq:  no
   AutoReqProv:  no
   Conflicts:apache
  @@ -95,93 +105,134 @@
   
   %track
   prog apache2 = {
  -version   = %{version}
  +version   = %{V_apache}
   url   = http://www.apache.org/dist/httpd/
   regex = httpd-(2.[02468]\.\d+)\.tar\.gz
   }
  +prog apache2:mod_perl = {
  +version   = %{V_mod_perl}
  +url   = http://perl.apache.org/dist/
  +regex = mod_perl-(__VER__)\.tar\.gz
  +}
   
   %prep
  -%setup -q -n httpd-%{version}
  -%patch -p0
  +%setup -q -c
  +%patch -p0 -d httpd-%{V_apache}
  +%if "%{with_mod_perl}" == "yes"
  +%setup -q -T -D -a 1
  +%endif
   
   %build
  +#   optionally prepare mod_perl
  +%if "%{with_mod_perl}" == "yes"
  +( cd mod_perl-%{V_mod_perl}
  +  eval `%{l_prefix}/bin/perl -V:archname`
  +  eval `%{l_prefix}/bin/perl -V:version`
  +  eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib 
-V:installsitearch -V:installsitelib`
  +  %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
  +  perl=$RPM_BUILD_ROOT%{l_prefix}/bin/perl
  +  echo "#!/bin/sh" >$perl
  +  echo "exec %{l_prefix}/bin/perl \\" >>$perl
  +  echo " -I${RPM_BUILD_ROOT}${installarchlib}  \\" >>$perl
  +  echo " -I${RPM_BUILD_ROOT}${installprivlib}  \\" >>$perl
  +  echo " -I${RPM_BUILD_ROOT}${installsitearch} \\" >>$perl
  +  echo " -I${RPM_BUILD_ROOT}${installsitelib}  \\" >>$perl
  +  echo " \"[EMAIL PROTECTED]"" >>$perl
  +  chmod a+x $perl
  +  $perl Makefile.PL \
  +  MP_AP_PREFIX="`pwd`/../httpd-%{V_apache}" \
  +  MP_AP_BUILD=0 \
  +  MP_CCOPTS="%{l_cflags -O}" \
  +  MP_INST_APACHE2=1 \
  +  MP_USE_DSO=0 \
  +  MP_USE_STATIC=1 \
  +  MP_COMPAT_1X=1
  +  %{l_make} %{l_mflags}
  +  %{l_make} %{l_mflags} install
  +) || exit $?
  +%endif
  +
   #   configure package
  -export CC="%{l_cc}"
  -export CFLAGS="%{l_cflags -O}"
  -export CPPFLAGS="%{l_cppflags}"
  -export LDFLAGS="%{l_ldflags}"
  -export LIBS=""
  -case "%{l_platform -t}" in
  -*-sunos* ) LIBS="$LIBS -lrt" ;;
  -esac
  +( cd httpd-%{V_apache}
  +  export CC="%{l_cc}"
  +  export CFLAGS="%{l_cflags -O}"
  +  export CPPFLAGS="%{l_cppflags}"
  +  export LDFLAGS="%{l_ldflags}"
  +  export LIBS=""
  +  case "%{l_platform -t}" in
  +  *-sunos* ) LIBS="$LIBS -lrt" ;;
  +  esac
   %if "%{with_mod_ldap}" == "yes"
  -LIBS="$LIBS -lssl -lcrypto"
  +

[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2005-03-28 Thread Ralf S. Engelschall
  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-Mar-2005 11:25:24
  Branch: HEAD Handle: 2005032810252400

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
make sure the libtool is able to build shared objects

  Summary:
RevisionChanges Path
1.58+7  -1  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.57 -r1.58 apache2.spec
  --- openpkg-src/apache2/apache2.spec  24 Mar 2005 11:18:25 -  1.57
  +++ openpkg-src/apache2/apache2.spec  28 Mar 2005 09:25:24 -  1.58
  @@ -33,7 +33,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.53
  -Release:  20050301
  +Release:  20050328
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -188,6 +188,12 @@
   -e 's;^\(Listen\).*;\1 127.0.0.1:80;' \
   $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/httpd.conf
   
  +%if "%{with_shared_core}" == "yes"
  +%{l_shtool} subst \
  +-e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \
  +$RPM_BUILD_ROOT%{l_prefix}/share/apache2/build/libtool
  +%endif
  +
   #   install run-command script
   %{l_shtool} mkdir -f -p -m 755 \
   $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2005-03-01 Thread Ralf S. Engelschall
  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:21:26
  Branch: HEAD Handle: 2005030108212600

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
do not track 2.1 betas

  Summary:
RevisionChanges Path
1.56+2  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.55 -r1.56 apache2.spec
  --- openpkg-src/apache2/apache2.spec  11 Feb 2005 08:26:58 -  1.55
  +++ openpkg-src/apache2/apache2.spec  1 Mar 2005 08:21:26 -   1.56
  @@ -34,7 +34,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.53
  -Release:  20050211
  +Release:  20050301
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -98,7 +98,7 @@
   prog apache2 = {
   version   = %{version}
   url   = http://www.apache.org/dist/httpd/
  -regex = httpd-(__VER__)\.tar\.gz
  +regex = httpd-(2.[02468]\.\d+)\.tar\.gz
   }
   
   %prep
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2005-02-11 Thread Ralf S. Engelschall
  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:   11-Feb-2005 09:26:58
  Branch: HEAD Handle: 2005021108265800

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
fix building under Solaris

  Summary:
RevisionChanges Path
1.55+4  -1  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.54 -r1.55 apache2.spec
  --- openpkg-src/apache2/apache2.spec  8 Feb 2005 18:47:38 -   1.54
  +++ openpkg-src/apache2/apache2.spec  11 Feb 2005 08:26:58 -  1.55
  @@ -34,7 +34,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.53
  -Release:  20050208
  +Release:  20050211
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -112,6 +112,9 @@
   export CPPFLAGS="%{l_cppflags}"
   export LDFLAGS="%{l_ldflags}"
   export LIBS=""
  +case "%{l_platform -t}" in
  +*-sunos* ) LIBS="$LIBS -lrt" ;;
  +esac
   %if "%{with_mod_ldap}" == "yes"
   LIBS="$LIBS -lssl -lcrypto"
   %endif
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2005-02-08 Thread Ralf S. Engelschall
  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:   08-Feb-2005 19:47:38
  Branch: HEAD Handle: 2005020818473800

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
upgrading package: apache2 2.0.52 -> 2.0.53

  Summary:
RevisionChanges Path
1.54+11 -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.53 -r1.54 apache2.spec
  --- openpkg-src/apache2/apache2.spec  1 Jan 2005 10:47:47 -   1.53
  +++ openpkg-src/apache2/apache2.spec  8 Feb 2005 18:47:38 -   1.54
  @@ -33,8 +33,8 @@
   Class:PLUS
   Group:Web
   License:  ASF
  -Version:  2.0.52
  -Release:  20040928
  +Version:  2.0.53
  +Release:  20050208
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -47,6 +47,8 @@
   %option   with_mod_dav  no
   %option   with_mod_ldap no
   %option   with_mod_proxyno
  +%option   with_mod_filecacheno
  +%option   with_shared_core  no
   
   #   list of sources
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  @@ -151,6 +153,13 @@
   --enable-proxy-http \
   --enable-proxy-ftp \
   %endif
  +%if "%{with_mod_filecache}" == "yes"
  +--enable-file-cache \
  +%endif
  +%if "%{with_shared_core}" == "yes"
  +--enable-so \
  +%endif
  +--enable-speling \
   --enable-rewrite \
   --enable-headers \
   --enable-info \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2004-09-28 Thread Ralf S. Engelschall
  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:   28-Sep-2004 20:21:45
  Branch: HEAD Handle: 2004092819214400

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
upgrading package: apache2 2.0.51 -> 2.0.52

  Summary:
RevisionChanges Path
1.52+3  -5  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.51 -r1.52 apache2.spec
  --- openpkg-src/apache2/apache2.spec  23 Sep 2004 18:04:08 -  1.51
  +++ openpkg-src/apache2/apache2.spec  28 Sep 2004 18:21:44 -  1.52
  @@ -33,8 +33,8 @@
   Class:PLUS
   Group:Web
   License:  ASF
  -Version:  2.0.51
  -Release:  20040923
  +Version:  2.0.52
  +Release:  20040928
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -52,7 +52,6 @@
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
   Source1:  rc.apache2
   Patch0:   apache2.patch
  -Patch1:   
http://www.apache.org/dist/httpd/patches/apply_to_%{version}/CAN-2004-0811.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -102,8 +101,7 @@
   
   %prep
   %setup -q -n httpd-%{version}
  -%patch -p0 -P 0
  -%patch -p1 -P 1
  +%patch -p0
   
   %build
   #   configure package
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2004-09-23 Thread Ralf S. Engelschall
  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:   23-Sep-2004 20:04:09
  Branch: HEAD Handle: 2004092319040800

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
apply security fix

  Summary:
RevisionChanges Path
1.51+4  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.50 -r1.51 apache2.spec
  --- openpkg-src/apache2/apache2.spec  16 Sep 2004 09:38:44 -  1.50
  +++ openpkg-src/apache2/apache2.spec  23 Sep 2004 18:04:08 -  1.51
  @@ -34,7 +34,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.51
  -Release:  20040916
  +Release:  20040923
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ -52,6 +52,7 @@
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
   Source1:  rc.apache2
   Patch0:   apache2.patch
  +Patch1:   
http://www.apache.org/dist/httpd/patches/apply_to_%{version}/CAN-2004-0811.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -101,7 +102,8 @@
   
   %prep
   %setup -q -n httpd-%{version}
  -%patch -p0
  +%patch -p0 -P 0
  +%patch -p1 -P 1
   
   %build
   #   configure package
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec rc.apache2 openpkg-sr...

2004-07-30 Thread Michael Schloh
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   30-Jul-2004 16:03:11
  Branch: HEAD Handle: 2004073015030109

  Modified files:
openpkg-src/apache2 apache2.spec rc.apache2
openpkg-src/cupscups.spec rc.cups
openpkg-src/imapd   rc.imapd
openpkg-src/jabberd jabberd.spec rc.jabberd
openpkg-src/kerberoskerberos.spec rc.kerberos
openpkg-src/mysql   mysql.spec rc.mysql
openpkg-src/mysql3  mysql3.spec rc.mysql3
openpkg-src/mysql41 mysql41.spec rc.mysql
openpkg-src/proftpd proftpd.spec rc.proftpd
openpkg-src/radius  radius.spec rc.radius
openpkg-src/tomcat  rc.tomcat tomcat.spec
openpkg-src/tsmcrc.tsmc tsmc.spec

  Log:
apply fixsimilar to http://cvs.openpkg.org/chngview?cn=17929,
restarting daemons unconditionally when any logfile rotation happens

  Summary:
RevisionChanges Path
1.48+1  -1  openpkg-src/apache2/apache2.spec
1.12+2  -2  openpkg-src/apache2/rc.apache2
1.17+1  -1  openpkg-src/cups/cups.spec
1.9 +3  -3  openpkg-src/cups/rc.cups
1.22+6  -6  openpkg-src/imapd/rc.imapd
1.20+1  -1  openpkg-src/jabberd/jabberd.spec
1.10+2  -2  openpkg-src/jabberd/rc.jabberd
1.50+1  -1  openpkg-src/kerberos/kerberos.spec
1.11+3  -3  openpkg-src/kerberos/rc.kerberos
1.96+1  -1  openpkg-src/mysql/mysql.spec
1.21+3  -3  openpkg-src/mysql/rc.mysql
1.31+1  -1  openpkg-src/mysql3/mysql3.spec
1.13+3  -3  openpkg-src/mysql3/rc.mysql3
1.15+1  -1  openpkg-src/mysql41/mysql41.spec
1.2 +3  -3  openpkg-src/mysql41/rc.mysql
1.84+1  -1  openpkg-src/proftpd/proftpd.spec
1.16+4  -4  openpkg-src/proftpd/rc.proftpd
1.40+1  -1  openpkg-src/radius/radius.spec
1.13+5  -5  openpkg-src/radius/rc.radius
1.17+5  -5  openpkg-src/tomcat/rc.tomcat
1.38+1  -1  openpkg-src/tomcat/tomcat.spec
1.12+2  -2  openpkg-src/tsmc/rc.tsmc
1.57+1  -1  openpkg-src/tsmc/tsmc.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.47 -r1.48 apache2.spec
  --- openpkg-src/apache2/apache2.spec  24 Jul 2004 22:32:47 -  1.47
  +++ openpkg-src/apache2/apache2.spec  30 Jul 2004 14:03:01 -  1.48
  @@ -34,7 +34,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.50
  -Release:  20040725
  +Release:  20040730
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/rc.apache2
  
  $ cvs diff -u -r1.11 -r1.12 rc.apache2
  --- openpkg-src/apache2/rc.apache224 Jul 2004 22:32:47 -  1.11
  +++ openpkg-src/apache2/rc.apache230 Jul 2004 14:03:01 -  1.12
  @@ -58,13 +58,13 @@
   -n ${apache2_log_rotsteps} -s ${apache2_log_rotminsize} -d \
   -z ${apache2_log_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
   -P "$apache2_log_rotprolog" \
  --E "$apache2_log_rotepilog && echo 1 >$hintfile" \
  +-E "$apache2_log_rotepilog; echo 1 >$hintfile" \
   ${apache2_log_files}
   shtool rotate -f \
   -n ${apache2_err_rotsteps} -s ${apache2_err_rotminsize} -d \
   -z ${apache2_err_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
   -P "$apache2_err_rotprolog" \
  --E "$apache2_err_rotepilog && echo 1 >$hintfile" \
  +-E "$apache2_err_rotepilog; echo 1 >$hintfile" \
   ${apache2_err_files}
   if [ -s $hintfile ]; then
   @l_prefix@/sbin/apachectl restart
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cups/cups.spec
  
  $ cvs diff -u -r1.16 -r1.17 cups.spec
  --- openpkg-src/cups/cups.spec7 Feb 2004 17:54:11 -   1.16
  +++ openpkg-src/cups/cups.spec30 Jul 2004 14:03:02 -  1.17
  @@ -34,7 +34,7 @@
   Group:Print
   License:  GPL/LGPL with exceptions
   Version:  1.1.20
  -Release:  20040207
  +Release:  20040730
   
   #   package options
   %option   with_ssl   no
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cups/rc.cups
  ==

[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec rc.apache2

2004-07-24 Thread Ralf S. Engelschall
  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:
RevisionChanges Path
1.47+116 -11openpkg-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 -  1.46
  +++ openpkg-src/apache2/apache2.spec  24 Jul 2004 22:32:47 -  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_proxyno
   
   #   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 \
  +   

[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2004-06-29 Thread Ralf S. Engelschall
  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:   29-Jun-2004 19:39:37
  Branch: HEAD Handle: -NONE-

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
upgrading package: apache2 2.0.49 -> 2.0.50

  Summary:
RevisionChanges Path
1.46+2  -3  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.45 -r1.46 apache2.spec
  --- openpkg-src/apache2/apache2.spec  29 Jun 2004 07:53:55 -  1.45
  +++ openpkg-src/apache2/apache2.spec  29 Jun 2004 17:39:37 -  1.46
  @@ -33,14 +33,13 @@
   Class:PLUS
   Group:Web
   License:  ASF
  -Version:  2.0.49
  +Version:  2.0.50
   Release:  20040629
   
   #   list of sources
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
   Source1:  rc.apache2
   Patch0:   apache2.patch
  -Patch1:   
http://archive.apache.org/dist/httpd/patches/apply_to_%{version}/CAN-2004-0493.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -71,7 +70,7 @@
   
   %prep
   %setup -q -n httpd-%{version}
  -%patch -p0 -P 0 1
  +%patch -p0
   %{l_shtool} subst \
   -e 's;^\(PROGRAM_LDADD.*\)$;\1 -liconv;' \
   Makefile.in support/Makefile.in
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2004-06-29 Thread Ralf S. Engelschall
  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:   29-Jun-2004 09:53:55
  Branch: HEAD Handle: -NONE-

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
apply security fix (http://www.guninski.com/httpd1.html;
CAN-2004-0493)

  Summary:
RevisionChanges Path
1.45+3  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.44 -r1.45 apache2.spec
  --- openpkg-src/apache2/apache2.spec  8 Jun 2004 13:20:27 -   1.44
  +++ openpkg-src/apache2/apache2.spec  29 Jun 2004 07:53:55 -  1.45
  @@ -34,12 +34,13 @@
   Group:Web
   License:  ASF
   Version:  2.0.49
  -Release:  20040608
  +Release:  20040629
   
   #   list of sources
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
   Source1:  rc.apache2
   Patch0:   apache2.patch
  +Patch1:   
http://archive.apache.org/dist/httpd/patches/apply_to_%{version}/CAN-2004-0493.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -70,7 +71,7 @@
   
   %prep
   %setup -q -n httpd-%{version}
  -%patch -p0
  +%patch -p0 -P 0 1
   %{l_shtool} subst \
   -e 's;^\(PROGRAM_LDADD.*\)$;\1 -liconv;' \
   Makefile.in support/Makefile.in
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2004-06-08 Thread Thomas Lotterer
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   08-Jun-2004 15:20:27
  Branch: HEAD Handle: 2004060814202700

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
remove obsolete substitution

  Summary:
RevisionChanges Path
1.44+1  -4  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.43 -r1.44 apache2.spec
  --- openpkg-src/apache2/apache2.spec  2 Jun 2004 12:47:27 -   1.43
  +++ openpkg-src/apache2/apache2.spec  8 Jun 2004 13:20:27 -   1.44
  @@ -34,7 +34,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.49
  -Release:  20040602
  +Release:  20040608
   
   #   list of sources
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  @@ -74,9 +74,6 @@
   %{l_shtool} subst \
   -e 's;^\(PROGRAM_LDADD.*\)$;\1 -liconv;' \
   Makefile.in support/Makefile.in
  -%{l_shtool} subst \
  --e 's;^\(APRUTIL_LIBS.*\)$;\1 -liconv;' \
  -srclib/apr-util/Makefile
   
   %build
   CC="%{l_cc}" \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2004-06-02 Thread Thomas Lotterer
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   02-Jun-2004 14:47:27
  Branch: HEAD Handle: 2004060213472700

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
apache2 requires db

  Summary:
RevisionChanges Path
1.43+2  -2  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.42 -r1.43 apache2.spec
  --- openpkg-src/apache2/apache2.spec  5 May 2004 08:43:38 -   1.42
  +++ openpkg-src/apache2/apache2.spec  2 Jun 2004 12:47:27 -   1.43
  @@ -34,7 +34,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.49
  -Release:  20040505
  +Release:  20040602
   
   #   list of sources
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  @@ -44,7 +44,7 @@
   #   build information
   Prefix:   %{l_prefix}
   BuildRoot:%{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, perl, make, expat, libiconv
  +BuildPreReq:  OpenPKG, openpkg >= 20040130, perl, make, expat, libiconv, db
   PreReq:   OpenPKG, openpkg >= 20040130, perl
   AutoReq:  no
   AutoReqProv:  no
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec

2004-05-05 Thread Ralf S. Engelschall
  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:   05-May-2004 10:43:38
  Branch: HEAD Handle: 2004050509433800

  Modified files:
openpkg-src/apache2 apache2.spec

  Log:
fix Berkeley-DB related building under Linux

  Summary:
RevisionChanges Path
1.42+2  -1  openpkg-src/apache2/apache2.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  
  $ cvs diff -u -r1.41 -r1.42 apache2.spec
  --- openpkg-src/apache2/apache2.spec  20 Mar 2004 07:35:21 -  1.41
  +++ openpkg-src/apache2/apache2.spec  5 May 2004 08:43:38 -   1.42
  @@ -34,7 +34,7 @@
   Group:Web
   License:  ASF
   Version:  2.0.49
  -Release:  20040320
  +Release:  20040505
   
   #   list of sources
   Source0:  http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  @@ -87,6 +87,7 @@
   --sysconfdir=%{l_prefix}/etc/apache2 \
   --libexecdir=%{l_prefix}/libexec/apache2 \
   --with-expat=%{l_prefix} \
  +--with-berkeley-db=%{l_prefix} \
   --with-mpm=prefork \
   --disable-shared
   %{l_make} %{l_mflags}
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]