updated: apache

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1473 ec354946-7b23-47d6-9f5a-488ba84defc7

a/apache/apache-vl.spec

@@ -4,14 +4,16 @@
 %define contentdir /home/httpd
 %define apache_ver 1.3.41
 %define mod_ssl_ver 2.8.31
-%define mm_ver 1.4.0
+%define mm_ver 1.4.2
 
 Summary: The most widely used Web server on the Internet.
 Summary(ja): インターネットで最も広く利用されているウェブサーバ
 Name: apache
 Version: 1.3.41
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
+
 Group: System Environment/Daemons
+License: Apache License, Version 2.0
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -19,7 +21,6 @@ Distribution: Vine Linux
 #Source0: ftp://ftp.apache.org/apache/dist/apache_%{apache_ver}.tar.gz
 Source0: http://archive.apache.org/dist/httpd/apache_%{apache_ver}.tar.bz2
 Source1: ftp://ftp.modssl.org/source/mod_ssl-%{mod_ssl_ver}-%{apache_ver}.tar.gz
-#Source2: http://www.engelschall.com/sw/mm/mm-%{mm_ver}.tar.gz
 Source2: ftp://ftp.ossp.org/pkg/lib/mm/mm-%{mm_ver}.tar.gz
 
 Source3: http://www.snert.com/Software/Throttle/mod_throttle211.tgz
@@ -57,27 +58,30 @@ Patch5: apache_1.3.12-piranha.patch
 # Patch300: apache-1.3.39_CVE-2007-6388.patch
 Patch310: apache-1.3.39_CVE-2007-4465.patch
 Patch320: apache-1.3.39_CVE-2008-0005.patch
+Patch330: apache-1.3.41_CVE-2010-0010.patch
 
 # Patch for Vine
 Patch0: apache_1.3.26-vine.patch
 # Patch10: apache_1.3.12-disable_iso8859_charset.patch
 Patch20: apache_1.3.22-use_expat_lite.patch
 Patch30: apache_1.3.26-layout.patch
+Patch40: apache-1.3.41-getline.patch
 
 # for x86_64 architecture support
 #Patch300: mod_ssl-2.8.28-libssl.lib64.patch
 Patch300: mod_ssl-2.8.31-libssl.lib64.patch
 
 
-License: Apache License, Version 2.0
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: findutils, openssl-devel, perl
+BuildRequires: db4-devel, gdbm-devel
 # Requires: /etc/mime.types, gawk, file, /usr/bin/find
 # Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, mailcap, grep, textutils
 # Prereq: /usr/sbin/useradd
 Requires: mailcap, gawk, file, findutils
-Prereq: chkconfig, mktemp, fileutils, mailcap, grep textutils
-Prereq: shadow-utils
+Requires(post): chkconfig, mktemp, coreutils, mailcap, grep
+Requires(pre): shadow-utils
+Requires(preun): chkconfig
 Provides: webserver
 
 %description
@@ -95,11 +99,11 @@ Apacheはインターネットで最も広く利用されているウェブサ
 ウェブサーバを必要とするならapacheパッケージをインストールしてください。
 
 %package -n mod_ssl
-Group: System Environment/Daemons
-Version: %{mod_ssl_ver}
 Summary: Cryptography support for the Apache web server.
+Version: %{mod_ssl_ver}
+Group: System Environment/Daemons
 Requires: apache = %{apache_ver}-%{release}
-Prereq: openssl, dev
+Requires(post): openssl, dev
 
 %description -n mod_ssl
 The mod_ssl module provides strong cryptography for the Apache web
@@ -115,9 +119,9 @@ mod_ssl を始めてインストールしたときにはインストール時に
 することもできます。
 
 %package devel
-Group: Development/Libraries
 Summary: Development tools for the Apache Web server.
 Summary(ja): Apacheウェブサーバのための開発ツール
+Group: Development/Libraries
 Obsoletes: secureweb-devel
 
 %description devel
@@ -138,9 +142,9 @@ Apacheウェブサーバをインストールして、かつ、追加モジュ
 
 
 %package manual
-Group: Applications/Documentation
 Summary: Documentation for the Apache Web server.
 Summary(ja): Apacheウェブサーバのためマニュアル文章
+Group: Applications/Documentation
 Requires: apache >= 1.3.26-0vl4
 
 %description manual
@@ -166,13 +170,13 @@ EAPI_MM=`pwd`/mm-%{mm_ver} ; export EAPI_MM
 
 pushd mm-%{mm_ver}
 # %patch200 -p1 -b .mm
-%configure --disable-shared
+#configure --disable-shared
 popd
 
 #%patch6 -p0 -b .openssl
 pushd mod_ssl-%{mod_ssl_ver}-%{apache_ver}
 %patch4 -p2 -b .tty
-%configure --with-apache=`cd ..;pwd` --with-mm=$EAPI_MM
+#configure --with-apache=`cd ..;pwd` --with-mm=$EAPI_MM
 popd
 
 %patch0 -p1 -b .redhat
@@ -183,16 +187,18 @@ popd
 #%patch10 -p1 -b .disable_iso8859_charset
 %patch20 -p1 -b .use_expat_lite
 %patch30 -p1 -b .layout
+%patch40 -p0 -b .getline
 
 # %patch210 -p1 -b .htpasswd
 # %patch290 -p1 -b .CVE-2007-5000
 # %patch300 -p4 -b .CVE-2007-6388
 %patch310 -p1 -b .CVE-2007-4465
 %patch320 -p1 -b .CVE-2008-0005
+%patch330 -p4 -b .CVE-2010-0010
 
 # mv eapi guys
-mv mod_ssl-%{mod_ssl_ver}-%{apache_ver}/pkg.eapi/*.c src/ap/
-mv mod_ssl-%{mod_ssl_ver}-%{apache_ver}/pkg.eapi/*.h src/include/
+cp -p mod_ssl-%{mod_ssl_ver}-%{apache_ver}/pkg.eapi/*.c src/ap/
+cp -p mod_ssl-%{mod_ssl_ver}-%{apache_ver}/pkg.eapi/*.h src/include/
 
 %build
 EAPI_MM=`pwd`/mm-%{mm_ver} ; export EAPI_MM
@@ -202,6 +208,10 @@ pushd $EAPI_MM
 make
 popd
 
+pushd mod_ssl-%{mod_ssl_ver}-%{apache_ver}
+%configure --with-apache=`cd ..;pwd` --with-mm=$EAPI_MM
+popd
+
 OPTIM="$RPM_OPT_FLAGS" \
 	./configure --prefix=%{_prefix} \
 	--libexecdir=%{_libdir}/apache \
@@ -351,6 +361,28 @@ if [ $1 = 0 ]; then
    %{_sysconfdir}/rc.d/init.d/httpd stop > /dev/null 2>&1
    /sbin/chkconfig --del httpd
 fi
+
+%post -n mod_ssl
+/sbin/ldconfig
+umask 077
+
+if [ ! -f %{_sysconfdir}/httpd/conf/ssl.key/server.key ] ; then
+%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/httpd/conf/ssl.key/server.key 2> /dev/null
+fi
+
+if [ ! -f %{_sysconfdir}/httpd/conf/ssl.crt/server.crt ] ; then
+cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/httpd/conf/ssl.key/server.key -x509 -days 365 -out %{_sysconfdir}/httpd/conf/ssl.crt/server.crt 2>/dev/null
+--
+SomeCountry
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+localhost.localdomain
+root@localhost.localdomain
+EOF
+fi
+
   
 %files
 %defattr(-,root,root)
@@ -421,28 +453,6 @@ fi
 %{_sbindir}/apxs
 %{_mandir}/man8/apxs.8*
 
-
-%post -n mod_ssl
-/sbin/ldconfig
-umask 077
-
-if [ ! -f %{_sysconfdir}/httpd/conf/ssl.key/server.key ] ; then
-%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/httpd/conf/ssl.key/server.key 2> /dev/null
-fi
-
-if [ ! -f %{_sysconfdir}/httpd/conf/ssl.crt/server.crt ] ; then
-cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/httpd/conf/ssl.key/server.key -x509 -days 365 -out %{_sysconfdir}/httpd/conf/ssl.crt/server.crt 2>/dev/null
---
-SomeCountry
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-fi
-
 %files -n mod_ssl
 %defattr(-,root,root)
 %doc $RPM_SOURCE_DIR/SSL-Certificate-Creation
@@ -458,6 +468,12 @@ fi
 %{_sysconfdir}/httpd/conf/ssl.*/*
 
 %changelog
+* Thu Jul 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3.41-3
+- added Patch330 for CVE-2010-0010
+- added Patch40 for building currnet toolchain
+- added BR: db4-devel, gdbm-devel
+- updated mm to 1.4.2
+
 * Sat Aug 23 2008 Shu KONNO <owa@bg.wakwak.com> 1.3.41-2vl5
 - updated mod_ssl-2.8.28-libssl.lib64.patch to 2.8.31
 - spec in utf-8