X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1.spec;h=0b184061c14d0fab26d695307dc4ee5cdbeb2e0f;hb=f7ca584549bc84dfc4827d786748558b21517376;hp=b4ed5f129323679dbf948f901e16e6499c3ddaab;hpb=948e98d5bd7626476178f65e63348549517950a7;p=packages%2Fapache1.git diff --git a/apache1.spec b/apache1.spec index b4ed5f1..0b18406 100644 --- a/apache1.spec +++ b/apache1.spec @@ -27,20 +27,21 @@ Summary(tr.UTF-8): Lider WWW tarayıcı Summary(uk.UTF-8): Найпопулярніший Web-Server Summary(zh_CN.UTF-8): Internet 上应用最广泛的 Web 服务程序。 Name: apache1 -Version: 1.3.37 -Release: 9 -License: Apache Group +Version: 1.3.41 +Release: 5 +License: Apache v2.0 Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz -# Source0-md5: b278f0969a9ccadeb781316e79e3520f +# Source0-md5: f7f00b635243f03a787ca9f4d4c85651 Source1: %{name}.init Source2: %{name}.logrotate -Source3: apache-icons.tar.gz -# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83 -Source4: %{name}.sysconfig +Source3: %{name}.sysconfig +# http://www.iagora.com/about/software/lingerd/ +Source4: http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz +# Source4-md5: 6401015bafad4f44fdf8a9a1795d9258 Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2 # Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e -Source6: %{name}.monitrc +Source6: %{name}-defaultindex.conf Source7: %{name}-httpd.conf Source8: %{name}-common.conf Source9: %{name}-mod_status.conf @@ -59,8 +60,7 @@ Source21: %{name}-mod_cern_meta.conf Source22: %{name}-mod_setenvif.conf Source23: %{name}-mod_vhost_alias.conf Source24: %{name}-errordocs.conf -Source25: http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz -# Source25-md5: 6401015bafad4f44fdf8a9a1795d9258 +Source25: %{name}-manual.conf Patch0: %{name}-PLD.patch Patch1: %{name}-suexec.patch Patch2: %{name}-errordocs.patch @@ -105,11 +105,12 @@ Patch38: %{name}-GNU_xargs.patch Patch39: %{name}-security_htdigest_local_buffer_overflow.patch Patch40: %{name}-security_htpasswd_user_buffer_overflow.patch Patch41: %{name}-security_check_forensic_tempfiles.patch +Patch42: %{name}-lingerd.patch URL: http://httpd.apache.org/ BuildRequires: bash BuildRequires: db-devel >= 4.1 BuildRequires: mm-devel >= 1.3.0 -%{?with_rewrite_ldap:BuildRequires: openldap-devel} +%{?with_rewrite_ldap:BuildRequires: openldap-devel >= 2.4.6} BuildRequires: perl-base BuildRequires: rpm-build >= 4.4.0 BuildRequires: rpm-perlprov @@ -122,12 +123,14 @@ Requires: %{name}-mod_mime = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/apache -%define _includedir %{_prefix}/include/apache1 -%define _libexecdir %{_prefix}/%{_lib}/apache1 -%define _datadir %{httpdir} +%define _includedir %{_prefix}/include/%{name} +%define _libexecdir %{_prefix}/%{_lib}/%{name} %define apxs /usr/sbin/apxs1 %define httpdir /home/services/apache -%define manualdir %{_prefix}/share/apache1-manual +%define docroot %{_datadir}/%{name}/html +%define errordir %{_datadir}/%{name}/error +%define manualdir %{_datadir}/%{name}/manual +%define cgibindir %{_prefix}/lib/cgi-bin/%{name} %description Apache is a powerful, full-featured, efficient and freely-available @@ -254,7 +257,8 @@ Obsoletes: apache < 2.0.0 Obsoletes: apache-extra Obsoletes: apache6 Conflicts: apache1 < 1.3.37-4 -Conflicts: logrotate < 3.7.4 +Conflicts: apache1-mod_ssl < 2.8.30_1.3.39-3 +Conflicts: logrotate < 3.7-4 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed. Conflicts: rpm < 4.4.2-0.2 @@ -311,17 +315,6 @@ wykonywane jako taki sam użytkownik jak serwer WWW. системної безпеки, котрі породжені використанням таких програм, настійливо радимо не використовувати цього пакету... -%package apxs -Summary: APache eXtenSion tool -Summary(pl.UTF-8): Narzędzie do rozszerzania Apache'a -Group: Development/Tools - -%description apxs -APache eXtenSion tool. - -%description apxs -l pl.UTF-8 -Narzędzie do rozszerzania Apache'a. - %package tools Summary: Apache tools Summary(pl.UTF-8): Narzędzia Apache'a @@ -333,36 +326,46 @@ Apache tools. %description tools -l pl.UTF-8 Narzędzia Apache'a. -%package index +%package defaultindex Summary: Apache index.html* files Summary(pl.UTF-8): Pliki Apache index.html* Group: Documentation Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: %{name}-mod_dir = %{version}-%{release} +Provides: apache1-index +Obsoletes: apache1-index < 1.3.39-7.9 Obsoletes: indexhtml -%description index +%description defaultindex Apache index.html* files. -%description index -l pl.UTF-8 +%description defaultindex -l pl.UTF-8 Pliki Apache index.html*. -%package doc +%package manual Summary: Apache 1.3.x manual Summary(pl.UTF-8): Podręcznik do Apache'a 1.3.x Group: Documentation Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: %{name}-mod_negotiation = %{version}-%{release} +Provides: apache1-doc +Obsoletes: apache1-doc < 1.3.39-7.9 -%description doc +%description manual Apache 1.3.x manual. -%description doc -l pl.UTF-8 +%description manual -l pl.UTF-8 Podręcznik do Apache'a 1.3.x. %package errordocs Summary: Apache 1.3.x HTTP error documents Summary(pl.UTF-8): Dokumenty opisujące błędy HTTP dla Apache'a 1.3.x Group: Applications/WWW +Requires: %{name}-mod_alias = %{version}-%{release} Requires: %{name}-mod_include = %{version}-%{release} +Requires: %{name}-mod_negotiation = %{version}-%{release} %description errordocs Apache 1.3.x HTTP error documents. Currently in English and Polish @@ -394,11 +397,11 @@ Summary(sv.UTF-8): Huvudfiler för webbservern Apache Summary(uk.UTF-8): Засоби створення модулів для web server'у Apache Summary(zh_CN.UTF-8): 用于 Apache Web 服务程序的开发工具。 Group: Networking/Utilities -Requires: %{name}-apxs = %{version}-%{release} Provides: %{name}(EAPI)-devel = %{version}-%{release} Provides: apache(EAPI)-devel = %{version}-%{release} %{?with_ipv6:Provides: apache1(ipv6)-devel} Obsoletes: apache-devel < 2.0.0 +Obsoletes: apache1-apxs %description devel The apache-devel package contains header files for Apache. @@ -663,6 +666,8 @@ Summary(pl.UTF-8): Moduł apache do wyświetlania indeksu plików Group: Networking/Daemons Requires(triggerpostun): sed >= 4.0 Requires: %{name}(EAPI) = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: apache-icons Provides: apache(mod_autoindex) = %{version}-%{release} %description mod_autoindex @@ -1274,8 +1279,21 @@ użytkowników HTTP. Ten pakiet zawiera htpasswd z Apache'a 1.x; ta wersja obsługuje hasła zapisane czystym tekstem oraz zakodowane algorytmami CRYPT (domyślnym), MD5 i SHA1. +%package cgi_test +Summary: cgi test/demo programs +Summary(pl.UTF-8): Programy testowe/przykładowe cgi +Group: Networking/Utilities +Requires: %{name}-base = %{version}-%{release} +Requires: filesystem >= 2.0-1 + +%description cgi_test +Two cgi test/demo programs: test-cgi and print-env. + +%description cgi_test -l pl.UTF-8 +Dwa programy testowe/przykładowe cgi: test-cgi and print-env. + %prep -%setup -q -n apache_%{version} -a3 %{?with_lingerd:-a25} +%setup -q -n apache_%{version} %{?with_lingerd:-a4} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -1321,41 +1339,32 @@ algorytmami CRYPT (domyślnym), MD5 i SHA1. %patch41 -p2 %if %{with lingerd} -mv lingerd-* _lingerd mkdir -p lingerd -cp -a _lingerd/{README,TUNING,LICENSE,TODO,ChangeLog} lingerd -cp -a _lingerd/{apache-1.3/ap_lingerd.c,li_config.h} src/main -patch -p0 -d src < _lingerd/apache-1.3/aplinger-ssl.diff +cp -a lingerd-*/{README,TUNING,LICENSE,TODO,ChangeLog} lingerd +cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h} src/main +%patch42 -p1 %endif +# make manual link with full path +%{__sed} -i -e 's,href="manual/,href="/manual/,i' htdocs/index.html.* + +# fix libdir (at least in PLD layout; no need to care about other ones) +%{__sed} -i -e 's,/lib$,/%{_lib},' config.layout + %build OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \ ./configure \ - --prefix=%{_sysconfdir} \ - --exec-prefix=%{_libexecdir} \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ - --sysconfdir=%{_sysconfdir} \ - --datadir=%{_datadir} \ - --includedir=%{_includedir} \ - --libexecdir=%{_sysconfdir}/modules \ - --localstatedir=/var \ - --mandir=%{_mandir} \ - --manualdir=%{manualdir} \ - --runtimedir=/var/run \ - --logfiledir=/var/log/apache \ --with-layout=PLD \ --without-confadjust \ --enable-module=all \ --enable-module=auth_digest \ --enable-shared=max \ - --proxycachedir=/var/cache/apache \ --with-perl=%{__perl} \ --enable-suexec \ --suexec-caller=http \ --suexec-uidmin=500 \ --suexec-gidmin=500 \ - --suexec-docroot=%{_datadir} \ + --suexec-docroot=%{httpdir} \ --disable-rule=WANTHSREGEX \ --enable-rule=EAPI \ --target=apache \ @@ -1376,7 +1385,7 @@ rm -f src/modules/standard/mod_rewrite.so LIBS_SHLIB="-ldb %{?with_rewrite_ldap:-lldap -llber}" %if %{with lingerd} -%{__make} -C _lingerd lingerd \ +%{__make} -C lingerd-* lingerd \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" @@ -1384,9 +1393,9 @@ rm -f src/modules/standard/mod_rewrite.so %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \ - $RPM_BUILD_ROOT%{_datadir}/errordocs \ +install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \ + $RPM_BUILD_ROOT%{httpdir}/html \ $RPM_BUILD_ROOT%{_libexecdir} \ $RPM_BUILD_ROOT/var/{log/{apache,archive/apache},run/apache} @@ -1394,48 +1403,53 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \ root=$RPM_BUILD_ROOT install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1 -sed -e '%{?with_lingerd:s,/usr/lib,%{_libdir},g}' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache +sed -e 's,/usr/lib,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache +install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apache bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +mv $RPM_BUILD_ROOT%{_mandir}/hu/man8/{httpd,apache}.8 +mv $RPM_BUILD_ROOT%{_mandir}/pl/man8/{httpd,apache}.8 touch $RPM_BUILD_ROOT/var/log/apache/{access,error,agent,referer}_log -install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs +install -d $RPM_BUILD_ROOT%{errordir} +cp -a errordocs/* $RPM_BUILD_ROOT%{errordir} mv $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf conf/apache.conf.dist -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf +cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d" echo "LoadModule access_module modules/mod_access.so" > $CFG/01_mod_access.conf echo "LoadModule alias_module modules/mod_alias.so" > $CFG/02_mod_alias.conf echo "LoadModule asis_module modules/mod_asis.so" > $CFG/03_mod_asis.conf -install %{SOURCE21} $CFG/04_mod_cern_meta.conf +cp -a %{SOURCE21} $CFG/04_mod_cern_meta.conf echo "LoadModule cgi_module modules/mod_cgi.so" > $CFG/05_mod_cgi.conf echo "LoadModule env_module modules/mod_env.so" > $CFG/06_mod_env.conf echo "LoadModule include_module modules/mod_include.so" > $CFG/07_mod_include.conf echo "LoadModule log_agent_module modules/mod_log_agent.so" > $CFG/08_mod_log_agent.conf -install %{SOURCE14} $CFG/09_mod_log_config.conf +cp -a %{SOURCE14} $CFG/09_mod_log_config.conf echo "LoadModule log_referer_module modules/mod_log_referer.so" > $CFG/10_mod_log_referer.conf -install %{SOURCE16} $CFG/11_mod_mime_magic.conf -install %{SOURCE19} $CFG/12_mod_mime.conf -install %{SOURCE18} $CFG/13_mod_negotiation.conf -install %{SOURCE22} $CFG/14_mod_setenvif.conf +cp -a %{SOURCE16} $CFG/11_mod_mime_magic.conf +cp -a %{SOURCE19} $CFG/12_mod_mime.conf +cp -a %{SOURCE18} $CFG/13_mod_negotiation.conf +cp -a %{SOURCE22} $CFG/14_mod_setenvif.conf echo "LoadModule speling_module modules/mod_speling.so" > $CFG/15_mod_speling.conf -install %{SOURCE15} $CFG/16_mod_userdir.conf +cp -a %{SOURCE15} $CFG/16_mod_userdir.conf -install %{SOURCE8} $CFG/20_common.conf +cp -a %{SOURCE8} $CFG/20_common.conf +cp -a %{SOURCE6} $CFG/30_defaultindex.conf +cp -a %{SOURCE25} $CFG/30_manual.conf -install %{SOURCE23} $CFG/20_mod_vhost_alias.conf -install %{SOURCE9} $CFG/25_mod_status.conf -install %{SOURCE10} $CFG/30_mod_proxy.conf -install %{SOURCE20} $CFG/50_mod_actions.conf +cp -a %{SOURCE23} $CFG/20_mod_vhost_alias.conf +cp -a %{SOURCE9} $CFG/25_mod_status.conf +cp -a %{SOURCE10} $CFG/30_mod_proxy.conf +cp -a %{SOURCE20} $CFG/50_mod_actions.conf echo "LoadModule auth_module modules/mod_auth.so" > $CFG/51_mod_auth.conf echo "LoadModule auth_anon_module modules/mod_auth_anon.so" > $CFG/52_mod_auth_anon.conf echo "LoadModule auth_db_module modules/mod_auth_db.so" > $CFG/53_mod_auth_db.conf echo "LoadModule auth_digest_module modules/mod_auth_digest.so" > $CFG/54_mod_auth_digest.conf -install %{SOURCE11} $CFG/57_mod_autoindex.conf -install %{SOURCE12} $CFG/59_mod_dir.conf +cp -a %{SOURCE11} $CFG/57_mod_autoindex.conf +cp -a %{SOURCE12} $CFG/59_mod_dir.conf echo "LoadModule expires_module modules/mod_expires.so" > $CFG/67_mod_expires.conf echo "LoadModule headers_module modules/mod_headers.so" > $CFG/68_mod_headers.conf echo "LoadModule imap_module modules/mod_imap.so" > $CFG/69_mod_imap.conf @@ -1446,21 +1460,22 @@ echo "LoadModule define_module modules/mod_define.so" > $CFG/73_mod_define.conf echo "LoadModule digest_module modules/mod_digest.so" > $CFG/74_mod_digest.conf echo "LoadModule log_forensic_module modules/mod_log_forensic.so" > $CFG/75_mod_log_forensic.conf echo "LoadModule mmap_static_module modules/mod_mmap_static.so" > $CFG/76_mod_mmap_static.conf -install %{SOURCE13} $CFG/77_mod_info.conf -install %{SOURCE24} $CFG/80_errordocs.conf -install %{SOURCE17} $CFG/80_mod_alias.conf - -install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/apache.monitrc +cp -a %{SOURCE13} $CFG/77_mod_info.conf +cp -a %{SOURCE24} $CFG/80_errordocs.conf +cp -a %{SOURCE17} $CFG/80_mod_alias.conf +# cgi_test: create config file with ScriptAlias +cat << 'EOF' > $CFG/09_cgi_test.conf +ScriptAlias /cgi-bin/printenv %{cgibindir}/printenv +ScriptAlias /cgi-bin/test-cgi %{cgibindir}/test-cgi +EOF -ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html +ln -sf index.html.en $RPM_BUILD_ROOT%{docroot}/index.html mv $RPM_BUILD_ROOT%{_sbindir}/apxs $RPM_BUILD_ROOT%{apxs} mv $RPM_BUILD_ROOT%{_mandir}/man8/apxs.8 $RPM_BUILD_ROOT%{_mandir}/man8/apxs1.8 perl -p -i -e 's/^if ...O ne "MSWin32"./if (0)/' $RPM_BUILD_ROOT%{apxs} -mv $RPM_BUILD_ROOT%{_sysconfdir}/modules/* $RPM_BUILD_ROOT%{_libexecdir} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/modules ln -s ../..%{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules ln -s ../../var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs @@ -1472,17 +1487,18 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/{access,srm}.conf rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.exp rm -f $RPM_BUILD_ROOT%{_libexecdir}/mod_{auth_dbm,example}.so -rm -f $RPM_BUILD_ROOT%{_datadir}/icons{,/small}/README* rm -f $RPM_BUILD_ROOT%{_mandir}/README* +rm -rf $RPM_BUILD_ROOT%{_datadir}/apache-icons + # Not for our os or for older apache -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/{cygwin,ebcdic,install-{z,}tpf,man-template}.html -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/mod/mod_{auth_dbm,browser,dld,example,isapi,log_common}.html -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/{mpeix,netware,new_features_1_[0-2],readme-tpf,suexec_1_2,unixware,vhosts/details_1_2}.html -rm $RPM_BUILD_ROOT%{_prefix}/share/apache1-manual/{win_{compiling,service}.html*,windows.html*} +rm $RPM_BUILD_ROOT%{manualdir}/{cygwin,ebcdic,install-{z,}tpf,man-template}.html +rm $RPM_BUILD_ROOT%{manualdir}/mod/mod_{auth_dbm,browser,dld,example,isapi,log_common}.html +rm $RPM_BUILD_ROOT%{manualdir}/{mpeix,netware,new_features_1_[0-2],readme-tpf,suexec_1_2,unixware,vhosts/details_1_2}.html +rm $RPM_BUILD_ROOT%{manualdir}/{win_{compiling,service}.html*,windows.html*} %if %{with lingerd} -install _lingerd/lingerd $RPM_BUILD_ROOT%{_libexecdir} +install lingerd-*/lingerd $RPM_BUILD_ROOT%{_libexecdir} install -d $RPM_BUILD_ROOT%{_localstatedir}/run/lingerd %endif @@ -1492,8 +1508,7 @@ rm -rf $RPM_BUILD_ROOT %pre base %groupadd -g 51 -r -f http %useradd -u 51 -r -d %{httpdir} -s /bin/false -c "HTTP User" -g http http - -if [ "`getent passwd http | cut -d: -f6`" = "/home/httpd" ]; then +if [ "$(getent passwd http | cut -d: -f6)" = "/home/httpd" ]; then /usr/sbin/usermod -d %{httpdir} http fi @@ -1531,7 +1546,7 @@ if [ "$1" = "2" ]; then ' /etc/apache/apache.conf fi -%triggerpostun base -- %{name} <= 1.3.31-5 +%triggerpostun base -- %{name} < 1.3.31-5.9 %banner %{name} -e -a <