X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=4081a927a122d79b2cd8a1ff773e776326ca07d2;hb=16d411b0af4234e8bca3bca70ad86bbb35e466c1;hp=e6d2e667de558c6cd581e5f2fc6c05a65424a241;hpb=23c1b0e7d878071dac28921b0eae931a7d796037;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index e6d2e66..4081a92 100644 --- a/apache.spec +++ b/apache.spec @@ -1,4 +1,5 @@ # _without_ssl - don't build with SSL support +# _without_ldap - don't build with LDAP support # TODO: # - mod_case_filter # - mod_case_filter_in @@ -14,23 +15,27 @@ # - --with-suexec-gidmin=500 or =100 ? # - --with-suexec-uidmin=500 or =1000 ? %include /usr/lib/rpm/macros.perl +# this is internal macro, don't change to %%apache_modules_api +%define _apache_modules_api 20020903 Summary: The most widely used Web server on the Internet Summary(de): Leading World Wide Web-Server Summary(es): Servidor HTTPD para proveer servicios WWW Summary(fr): Le serveur web le plus utilise sur Internet Summary(pl): Serwer WWW (World Wide Web) Summary(pt_BR): Servidor HTTPD para prover serviços WWW +Summary(ru): óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ Summary(tr): Lider WWW tarayýcý Name: apache -Version: 2.0.43 -Release: 0.2 +Version: 2.0.48 +Release: 0.1.3 License: Apache Group License Group: Networking/Daemons -URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz +# Source0-md5: 466c63bb71b710d20a5c353df8c1a19c Source1: %{name}.init Source2: %{name}.logrotate Source3: %{name}-icons.tar.gz +# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83 Source4: %{name}.sysconfig Source6: %{name}-httpd.conf Source8: %{name}-mod_vhost_alias.conf @@ -42,36 +47,47 @@ Source13: %{name}-mod_dav.conf Source14: %{name}-mod_dir.conf Source20: %{name}-server.crt Source21: %{name}-server.key -Patch0: %{name}-apxs.patch -Patch1: %{name}-configdir_skip_backups.patch -Patch2: %{name}-layout.patch -Patch3: %{name}-suexec.patch -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%{!?_without_ssl:BuildRequires: openssl-devel >= 0.9.6f} -%{!?_without_ssl:BuildRequires: openssl-tools} -BuildRequires: db4-devel -BuildRequires: zlib-devel +Patch0: %{name}-configdir_skip_backups.patch +Patch1: %{name}-layout.patch +Patch2: %{name}-suexec.patch +Patch3: %{name}-nolibs.patch +Patch4: %{name}-apr.patch +URL: http://httpd.apache.org/ +BuildRequires: apr-devel >= 1:0.9.4-1 +BuildRequires: apr-util-devel >= 1:0.9.5-0.3 +BuildRequires: db-devel BuildRequires: expat-devel +BuildRequires: gdbm-devel >= 1.8.3 +BuildRequires: libtool >= 1.5 +%{!?_without_ldap:BuildRequires: openldap-devel} +%{!?_without_ssl:BuildRequires: openssl-devel >= 0.9.7c} +%{!?_without_ssl:BuildRequires: openssl-tools >= 0.9.7c} BuildRequires: perl-devel >= 5.004 -BuildRequires: gdbm-devel -BuildRequires: byacc BuildRequires: rpm-perlprov >= 4.0.4 -Provides: httpd = %{version} -Provides: webserver = %{version} -Prereq: /sbin/chkconfig -Prereq: /usr/sbin/useradd -Prereq: /usr/bin/getgid -Prereq: /bin/id -Prereq: sh-utils -Prereq: rc-scripts -Prereq: perl -Requires: mailcap +BuildRequires: zlib-devel +PreReq: perl-base +PreReq: rc-scripts +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +Requires(postun): /usr/sbin/userdel +Requires(postun): /usr/sbin/groupdel +Requires(post,preun): /sbin/chkconfig +Requires(post,postun): /sbin/ldconfig +Requires(post): fileutils +Requires: apr-util >= 1:0.9.4-1 Requires: /etc/mime.types +Requires: mailcap Requires: psmisc >= 20.1 -Requires: libtool +Provides: httpd = %{version} +Provides: webserver = %{version} +Provides: apache(modules-api) = %{_apache_modules_api} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: apache-extra -Obsoletes: apache6 Obsoletes: apache-doc +Obsoletes: apache6 +Obsoletes: apache1 Obsoletes: indexhtml %define _sysconfdir /etc/httpd @@ -112,13 +128,17 @@ pode executar v cache, e oferece características como monitor de status, conversão dinâmica de tipo, e mais. +%description -l ru +Apache - ÍÏÝÎÙÊ, ÆÕÎËÃÉÏÎÁÌØÎÙÊ, ×ÙÓÏËÏÐÒÏÉÚ×ÏÄÉÔÅÌØÎÙÊ É Ó×ÏÂÏÄÎÏ +ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÙÊ ×ÅÂ-ÓÅÒ×ÅÒ. + %description -l tr Apache serbest daðýtýlan ve çok kullanýlan yetenekli bir web sunucusudur. %package suexec Summary: Apache suexec wrapper -Summary(pl): Suexec wrapper do serwera www Apache +Summary(pl): Wrapper suexec do serwera WWW Apache Group: Development/Tools Requires: %{name} = %{version} @@ -133,15 +153,30 @@ SuEXEC umo innym UID ni¿ wywo³uj±cy je serwer. Normalnie programy CGI i SSI s± wykonywane jako taki sam u¿ytkownik jak serwer WWW. +%package index +Summary: Apache index.html* files +Summary(pl): Pliki Apache index.html* +Group: Documentation +Requires: %{name} = %{version} + +%description index +Apache index.html* files. + +%description index -l pl +Pliki Apache index.html*. + %package devel Summary: Module development tools for the Apache web server Summary(es): Archivos de inclusión del Apache para desarrollo de módulos Summary(fr): Les outils de developpement de modules pour le serveur web Apache -Summary(pl): Pliki nag³ówkowe do tworzenai modu³ów rozszerzeñ do serwera www Apache +Summary(pl): Pliki nag³ówkowe do tworzenia modu³ów rozszerzeñ do serwera WWW Apache Summary(pt_BR): Arquivos de inclusão do Apache para desenvolvimento de módulos +Summary(ru): óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache Group: Networking/Utilities Requires: %{name} = %{version} -Requires: apr-devel = %{version} +Requires: apr-util-devel >= 1:0.9.4 +Requires: libtool +Obsoletes: %{name}-static %description devel The apache-devel package contains header files for Apache. @@ -158,7 +193,11 @@ Apache et le binaire APXS dont vous aurez besoin pour construire des Objets Dynamiques Partages (DSOs) pour Apache. %description devel -l pl -Pliki nag³ówkowe dla serwera WWW Apache. +Pliki nag³ówkowe i inne zasoby niezbêdne przy budowaniu modu³ów DSO +(Dynamic Shared Objects) dla Apache. + +%description devel -l ru +óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache. %description devel -l pt_BR Este pacote contem os arquivos de inclusão para o Apache, bem como o @@ -166,21 +205,9 @@ utilit (DSOs). Este pacote precisa ser instalado se você deseja compilar ou desenvolver módulos adicionais para o Apache. -%package static -Summary: Static Apache web server libraries -Summary(pl): Statyczne biblioteki serwera www Apache -Group: Development/Libraries -Requires: %{name}-devel = %{version} - -%description static -The apache-static package contains static libraries for Apache. - -%description static -l pl -Styatyczne biblioteki serwera Apache. - %package mod_actions Summary: Apache module for run CGI whenever a file of a certain type is requested -Summary(pl): Modu³ dla apache do uruchamiania skryptów cgi +Summary(pl): Modu³ Apache'a do uruchamiania skryptów CGI Group: Networking/Daemons Requires: %{name} = %{version} @@ -195,6 +222,7 @@ Ten modu %package mod_auth Summary: Apache module with user authentication using textual files +Summary(pl): Modu³ Apache'a identyfikuj±cy u¿ytkowników na podstawie plików tekstowych Group: Networking/Daemons Requires: %{name} = %{version} @@ -203,12 +231,12 @@ This package contains mod_auth module. It provides for user authentication using textual files. %description mod_auth -l pl -Ten pakiet zawiera modu³ mod_auth. S³u¿y on do autentykacji przy -u¿yciu plików tekstowych. +Ten pakiet zawiera modu³ mod_auth. S³u¿y on do sprawdzania to¿samo¶ci +u¿ytkowników na podstawie plików tekstowych. %package mod_auth_anon Summary: Apache module with "anonymous" user access authentication -Summary(pl): Modu³ apache oferuj±cy anonimow± autoryzacjê u¿ytkownia +Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkownika "anonimowego" Group: Networking/Daemons Requires: %{name} = %{version} @@ -225,13 +253,25 @@ magic-cookies and funny URL pre/postfixes, it is completely browser independent and it allows users to share URLs. %description mod_auth_anon -l pl -Ten modu³ oferuje anonimow± autoryzacjê u¿ytkownia podobnie do -anonimowych serwerów ftp (u¿ytkownik ,,anonymous'' oraz has³o w -postaci adresu pocztowego u¿ytkownika). +Ten modu³ oferuje autoryzacjê u¿ytkownika "anonimowego" podobnie do +anonimowych serwerów FTP (u¿ytkownik "anonymous" oraz has³o w postaci +adresu pocztowego u¿ytkownika). + +%package mod_auth_ldap +Summary: Apache module with LDAP user access authentication +Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP +Group: Networking/Daemons +Requires: %{name} = %{version} + +%description mod_auth_ldap +Apache module with LDAP user access authentication. + +%description mod_auth_ldap -l pl +Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP %package mod_auth_dbm Summary: Apache module with user authentication which uses DBM files -Summary(pl): Modu³ apache z mechanizmem autentykacji u¿ywaj±cym plików DBM +Summary(pl): Modu³ Apache'a z mechanizmem identyfikacji korzystaj±cym z plików DBM Group: Networking/Daemons Obsoletes: %{name}-mod_auth_db Requires: %{name} = %{version} @@ -242,12 +282,12 @@ usernames and passwords are stored in DBM type database files. It is an alternative to the plain text password files provided by mod_auth. %description mod_auth_dbm -l pl -Ten modu³ dostarcza Pros± Autoryzacjê HTTP gdzie u¿ytkownicy oraz ich -has³a s± trzymane w plikach bazy typu DBM. +Ten modu³ udostêpnia Prost± Autoryzacjê HTTP, gdzie u¿ytkownicy oraz +ich has³a s± trzymane w plikach bazy typu DBM. %package mod_auth_digest Summary: Apache user authentication module using MD5 Digest Authentication -Summary(pl): Modu³ apache do autoryzacji MD5 +Summary(pl): Modu³ Apache'a do autoryzacji MD5 Group: Networking/Daemons Obsoletes: apache-mod_digest Requires: %{name} = %{version} @@ -291,7 +331,7 @@ Requires: %{name} = %{version} Execution of CGI scripts using an external CGI daemon. %description mod_cgid -l pl -Uruchamianie zewnêtrznych skryptów CGI za pomoc± daemona CGI +Uruchamianie zewnêtrznych skryptów CGI za pomoc± demona CGI. %package mod_charset_lite Summary: Specify character set translation or recoding @@ -307,7 +347,7 @@ Translacja lub przekodowywanie znak %package mod_dav Summary: Apache module - Distributed Authoring and Versioning -Summary(pl): Modu³ apache - Rozdzielone Autorstwo i Wersjonowanie +Summary(pl): Modu³ Apache'a - rozproszone autorstwo i wersjonowanie Group: Networking/Daemons Requires: %{name} = %{version} @@ -318,14 +358,14 @@ extension to the HTTP protocol allows creating, moving, copying, and deleting resources and collections on a remote web server. %description mod_dav -l pl -Modu³ dostarcza klasê 1 oraz klasê 2 WebDAV (Bazuj±cy na WWWW -Rozdzielone Autorstwo i Wersjonowanie). To rozszerzenie HTTP pozwala +Modu³ udostêpnia klasê 1 oraz klasê 2 WebDAV (Bazuj±cego na WWW +rozproszonego autorstwa i wersjonowania). To rozszerzenie HTTP pozwala na tworzenie, przesuwanie, kopiowanie oraz kasowanie zasobów na -zdalnym serwerze www. +zdalnym serwerze WWW. %package mod_deflate Summary: Apache module: Compress content before it is delivered to the client -Summary(pl): Modu³ kompresuj±cy dane przed przes³aniem ich do klienta +Summary(pl): Modu³ Apache'a kompresuj±cy dane przed przes³aniem ich do klienta Group: Networking/Daemons Requires: %{name} = %{version} @@ -337,7 +377,7 @@ Modu %package mod_dir Summary: Apache module for "trailing slash" redirects and serving directory index files -Summary(pl): Modu³ oferuj±cy przekierowania i serwowanie indeksu katalogu. +Summary(pl): Modu³ Apache'a oferuj±cy przekierowania i udostêpnianie informacji o zawarto¶ci katalogu Group: Networking/Daemons Requires: %{name} = %{version} @@ -346,11 +386,12 @@ This package contains mod_dir which provides "trailing slash" redirects and serving directory index files. %description mod_dir -l pl -Modu³ oferuj±cy przekierowania i serwowanie indeksu katalogu. +Modu³ oferuj±cy przekierowania i udostêpnianie informacji o zawarto¶ci +katalogu. %package mod_headers Summary: Apache module allows for the customization of HTTP response headers -Summary(pl): Modu³ pozwalaj±cy na modyfikacjê nag³ówków HTTP +Summary(pl): Modu³ Apache'a pozwalaj±cy na modyfikacjê nag³ówków HTTP Group: Networking/Daemons Requires: %{name} = %{version} @@ -365,7 +406,7 @@ wysy %package mod_imap Summary: Apache module with imap-file handler -Summary(pl): Modu³ z obs³ug± imap-file +Summary(pl): Modu³ Apache'a z obs³ug± imap-file Group: Networking/Daemons Requires: %{name} = %{version} @@ -375,11 +416,11 @@ replacing the functionality of the imagemap CGI program. Any directory or document type configured to use the handler imap-file. %description mod_imap -l pl -Modu³ umozliwiaj±cy obs³ugê plików .map (imap-file handler) +Modu³ umo¿liwiaj±cy obs³ugê plików .map (imap-file handler). %package mod_info Summary: Apache module with comprehensive overview of the server configuration -Summary(pl): Modu³ dostarczaj±cy informacji na temat serwera. +Summary(pl): Modu³ Apache'a udostêpniaj±cy informacje o serwerze Group: Networking/Daemons Requires: %{name} = %{version} @@ -389,17 +430,28 @@ overview of the server configuration including all installed modules and directives in the configuration files. %description mod_info -l pl -Modu³ dostarczaj±cy informacji o konfiguracji serwera, zainstalowanych -modu³ach itp. +Modu³ udostêpniaj±cy informacje o konfiguracji serwera, +zainstalowanych modu³ach itp. + +%package mod_ldap +Summary: Apache module to use LDAP connections +Summary(pl): Modu³ Apache'a umo¿liwiaj±cy korzystanie z po³±czeñ LDAP +Group: Networking/Daemons +Requires: %{name} = %{version} + +%description mod_ldap +Apache module to use LDAP connections. + +%description mod_ldap -l pl +Modu³ Apache'a umo¿liwiaj±cy korzystanie z po³±czeñ LDAP. %package mod_proxy Summary: Apache module with Web proxy -Summary(pl): Modu³ dodaj±cy obs³ugê serwera proxy +Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê serwera proxy Group: Networking/Daemons Requires: %{name} = %{version} %description mod_proxy - This package contains module with implementation a proxy/cache for Apache. It implements proxying capability for FTP, CONNECT (for SSL), HTTP/0.9, HTTP/1.0 and HTTP/1.1. The module can be configured to @@ -407,12 +459,12 @@ connect to other proxy modules for these and other protocols. %description mod_proxy -l pl Modu³ zawiera implementacjê serwera proxy/cache dla Apache. -Iplementacja zawiera obs³ugê FTP, CONNECT (dla SSL), HTTP/0.9, +Implementacja zawiera obs³ugê FTP, CONNECT (dla SSL), HTTP/0.9, HTTP/1.0 i HTTP/1.1. %package mod_rewrite Summary: Apache module with rule-based engine for rewrite requested URLs on the fly -Summary(pl): Modu³ do ,,przepisywania'' adresów URL w locie +Summary(pl): Modu³ Apache'a do "przepisywania" adresów URL w locie Group: Networking/Daemons Requires: %{name} = %{version} @@ -421,24 +473,33 @@ This package contains It provides a rule-based rewriting engine to rewrite requested URLs on the fly. %description mod_rewrite -l pl -Modu³ oferuj±cy mo¿liwo¶æ ,,przepisywania'' adresów URL w locie. +Modu³ oferuj±cy mo¿liwo¶æ "przepisywania" adresów URL w locie. %package mod_ssl -Summary: Apache module: Strong cryptography using the Secure Sockets Layer (SSL) -Summary(pl): Modu³ apache: Silna kryptografia z u¿yciem SSL +Summary: SSL/TLS module for the Apache HTTP server +Summary(pl): Modu³ SSL/TSL dla serwera Apache +Summary(ru): íÏÄÕÌØ SSL/TLS ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache Group: Networking/Daemons Epoch: 1 Requires: %{name} = %{version} %description mod_ssl -Strong cryptography using the Secure Sockets Layer (SSL). +The mod_ssl module provides strong cryptography for the Apache Web +server via the Secure Sockets Layer (SSL) and Transport Layer Security +(TLS) protocols. %description mod_ssl -l pl -Silna kryptografia z u¿yciem SSL. +Modu³ mod_ssl udostêpnia wsparcie do silnej kryptografii dla serwera +Apache poprzez protoko³y SSL/TSL (Secure Sockets Layer/Transport Layer +Security). + +%description mod_ssl -l ru +íÏÄÕÌØ mod_ssl ÏÂÅÓÐÅÞÉ×ÁÅÔ ÐÏÄÄÅÒÖËÕ × ×ÅÂ-ÓÅÒ×ÅÒÅ Apache ÎÁÄÅÖÎÏÇÏ +ÛÉÆÒÏ×ÁÎÉÑ ÓÒÅÄÓÔ×ÁÍÉ Secure Sockets Layer (SSL) É Transport Layer %package mod_status -Summary: Server status report module for apache -Summary(pl): Modu³ dostarczaj±cy informacje statystyczne o serwerze. +Summary: Server status report module for Apache +Summary(pl): Modu³ udostêpniaj±cy informacje statystyczne z serwera Apache Group: Networking/Daemons Requires: %{name} = %{version} @@ -455,7 +516,7 @@ pracy serwera apache (w postaci strony HTML). %package mod_usertrack Summary: Apache module for user tracking using cookies -Summary(pl): Modu³ s³u¿±cy do ¶ledzenia ,,ciasteczek''. +Summary(pl): Modu³ Apache'a s³u¿±cy do ¶ledzenia "ciasteczek" Group: Networking/Daemons Requires: %{name} = %{version} @@ -465,11 +526,11 @@ logging using CookieLog directory. This module allow multiple log files. %description mod_usertrack -l pl -Modu³ pozwalaj±cy na ¶ledzenie ,,ciasteczek''. +Modu³ pozwalaj±cy na ¶ledzenie "ciasteczek". %package mod_vhost_alias Summary: Apache module for dynamically configured mass virtual hosting -Summary(pl): Modu³ dodaj±cy obs³ugê hostów wirtualnych. +Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê hostów wirtualnych Group: Networking/Daemons Requires: %{name} = %{version} @@ -483,7 +544,7 @@ wirtualnych. %package mod_unique_id Summary: Apache module which provides a magic token for each request -Summary(pl): Modu³ nadaj±cy ka¿demu ¿±daniu unikalny token +Summary(pl): Modu³ Apache'a nadaj±cy ka¿demu zapytaniu unikalny token Group: Networking/Daemons Requires: %{name} = %{version} @@ -497,14 +558,14 @@ for each request. Unique identifiers are useful for various reasons which are beyond the scope of this document. %description mod_unique_id -l pl -Modu³ nadaje przy ka¿dym ¿±daniu token unikalny w ramach wszystkich -¿±dañ, nawet w ramach poprawnie skonfigurowanego klastra z wielu -maszyn. Modu³ ustawia przy ka¿dym ¿±daniu zmienn± ¶rodowiskow± +Modu³ nadaje ka¿demu zapytaniu token unikalny w ramach wszystkich +zapytañ, nawet w ramach poprawnie skonfigurowanego klastra z wielu +maszyn. Modu³ ustawia przy ka¿dym zapytaniu zmienn± ¶rodowiskow± UNIQUE_ID. %package mod_expires Summary: Apache module which generates Expires HTTP headers -Summary(pl): Modu³ generuj±cy nag³ówki HTTP Expires +Summary(pl): Modu³ Apache'a generuj±cy nag³ówki HTTP Expires Group: Networking/Daemons Requires: %{name} = %{version} @@ -520,8 +581,8 @@ wa ¼ród³owych lub odwo³ania klienta. %package mod_file_cache -Summary: Apache module: Caches a static list of files in memory -Summary(pl): Modu³ cacheuj±cy statyczn± listê plików w pamiêci +Summary: Apache module: caches a static list of files in memory +Summary(pl): Modu³ Apache'a cache'uj±cy statyczn± listê plików w pamiêci Group: Networking/Daemons Obsoletes: %{name}-mmap_static Requires: %{name} = %{version} @@ -530,45 +591,7 @@ Requires: %{name} = %{version} Caches a static list of files in memory. %description mod_file_cache -l pl -Modu³ cacheuj±cy statyczn± listê plików w pamiêci. - -%package -n apr -Summary: The Apache Portable Runtime library -Summary(pl): Przeno¶na biblioteka Apache -Group: Libraries - -%description -n apr -The Apache Portable Run-time libraries have been designed to provide a -common interface to low level routines across any platform. - -%description -n apr -l pl -Przeno¶na biblioteka Apache zosta³a zaprojektowana w celu dostarczania -popularnego i jednolitego interfejsu do niskopoziomowych funkcji na -dowolnej platformie. - -%package -n apr-devel -Summary: The includes and linker libraries for development with APR -Summary(pl): Pliki nag³ówkowe, biblioteki dla linkera APR -Group: Development/Libraries -Requires: apr = %{version} - -%description -n apr-devel -The includes and linker libraries for development with APR. - -%description -n apr-devel -l pl -Pliki nag³ówkowe, biblioteki dla linkera APR. - -%package -n apr-static -Summary: Static APR libraries. -Summary(pl): Statyczne biblioteki APR. -Group: Development/Libraries -Requires: apr-devel = %{version} - -%description -n apr-static -Static APR libraries. - -%description -n apr-static -l pl -Statyczne biblioteki APR. +Modu³ cache'uj±cy statyczn± listê plików w pamiêci. %prep %setup -q -n httpd-%{version} @@ -576,9 +599,18 @@ Statyczne biblioteki APR. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build +# sanity check +MODULES_API=`awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' include/ap_mmn.h` +if [ "$MODULES_API" != "%_apache_modules_api" ]; then + echo "Set %%_apache_modules_api to $MODILES_API and rerun." + exit 1 +fi +./buildconf %configure \ + --prefix=%{_libexecdir} \ --enable-layout=PLD \ --enable-modules=all \ --enable-mods-shared=all \ @@ -611,6 +643,8 @@ Statyczne biblioteki APR. --enable-optional-hook-import \ --enable-optional-fn-import \ --enable-optional-fn-export \ + %{!?_without_ldap:--enable-ldap} \ + %{!?_without_ldap:--enable-auth-ldap} \ --enable-dav \ --enable-info \ --enable-suexec \ @@ -628,35 +662,30 @@ Statyczne biblioteki APR. --with-suexec-logfile=/var/log/httpd/suexec_log \ --with-suexec-uidmin=500 \ --with-suexec-gidmin=500 \ - --with-suexec-umask=077 + --with-suexec-umask=077 \ + --with-apr=%{_bindir} \ + --with-apr-util=%{_bindir} %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} -install -d $RPM_BUILD_ROOT%{_var}/log/{httpd,archiv/httpd} -install -d $RPM_BUILD_ROOT%{_var}/{run,cache}/apache +install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ + $RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/apache} -%{makeinstall} \ +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + installbuilddir=%{_sysconfdir}/build \ prefix=%{_sysconfdir}/httpd \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - sbindir=$RPM_BUILD_ROOT%{_sbindir} \ - installbuilddir=$RPM_BUILD_ROOT%{_sysconfdir}/build \ - libexecdir=$RPM_BUILD_ROOT%{_libdir}/%{name} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \ - datadir=$RPM_BUILD_ROOT%{_datadir} \ - iconsdir=$RPM_BUILD_ROOT%{_datadir}/icons \ - errordir=$RPM_BUILD_ROOT%{_datadir}/error \ - htdocsdir=$RPM_BUILD_ROOT%{_datadir}/html \ - manualdir=$RPM_BUILD_ROOT%{_datadir}/manual \ - cgidir=$RPM_BUILD_ROOT%{_datadir}/cgi-bin \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \ - runtimedir=$RPM_BUILD_ROOT%{_var}/run \ - logdir=$RPM_BUILD_ROOT%{_var}/log/httpd \ - proxycachedir=$RPM_BUILD_ROOT%{_var}/cache/httpd + libexecdir=%{_libdir}/%{name} \ + iconsdir=%{_datadir}/icons \ + errordir=%{_datadir}/error \ + htdocsdir=%{_datadir}/html \ + manualdir=%{_datadir}/manual \ + cgidir=%{_datadir}/cgi-bin \ + runtimedir=%{_var}/run \ + logdir=%{_var}/log/httpd \ + proxycachedir=%{_var}/cache/httpd rm -f $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf @@ -664,8 +693,12 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf mv -f $RPM_BUILD_ROOT%{_sysconfdir}/build \ $RPM_BUILD_ROOT%{_libexecdir}/build -perl -pi -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_libexecdir}/build/config_vars.mk +perl -pi -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_libexecdir}/build/* +perl -pi -e "s#$RPM_BUILD_DIR#%{_usrsrc}#g" $RPM_BUILD_ROOT%{_libexecdir}/build/* perl -pi -e "s#-pthread#-lpthread#g" $RPM_BUILD_ROOT%{_libdir}/lib*.la +perl -pi -e 's#/etc/httpd/build#%{_libexecdir}/build#g' $RPM_BUILD_ROOT%{_libexecdir}/build/* +ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_libexecdir}/build/libtool +ln -sf %{_libexecdir}/build $RPM_BUILD_ROOT%{_sysconfdir}/build install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache @@ -673,7 +706,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log -%if %{?_without_ssl:1}%{!?_without_ssl:0} +%if %{?_without_ssl:0}%{!?_without_ssl:1} install -d $RPM_BUILD_ROOT%{_sysconfdir}/ssl install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key @@ -690,6 +723,7 @@ install %{SOURCE12} $CFG/40_mod_ssl.conf install %{SOURCE13} $CFG/45_mod_dav.conf install %{SOURCE14} $CFG/59_mod_dir.conf +echo "LoadModule ldap_module %{_libexecdir}/mod_ldap.so" > $CFG/49_mod_ldap.conf echo "LoadModule actions_module %{_libexecdir}/mod_actions.so" > $CFG/50_mod_actions.conf echo "LoadModule auth_module %{_libexecdir}/mod_auth.so" > $CFG/51_mod_auth.conf echo "LoadModule auth_anon_module %{_libexecdir}/mod_auth_anon.so" > $CFG/52_mod_auth_anon.conf @@ -701,6 +735,7 @@ LoadModule disk_cache_module %{_libexecdir}/mod_disk_cache.so" > $CFG/55_mod_ echo "LoadModule cgid_module %{_libexecdir}/mod_cgid.so" > $CFG/56_mod_cgid.conf echo "LoadModule charset_lite_module %{_libexecdir}/mod_charset_lite.so" > $CFG/57_mod_charset_lite.conf echo "LoadModule deflate_module %{_libexecdir}/mod_deflate.so" > $CFG/58_mod_deflate.conf +echo "LoadModule auth_ldap_module %{_libexecdir}/mod_auth_ldap.so" > $CFG/59_mod_auth_ldap.conf echo "LoadModule expires_module %{_libexecdir}/mod_expires.so" > $CFG/60_mod_expires.conf echo "LoadModule file_cache_module %{_libexecdir}/mod_file_cache.so" > $CFG/61_mod_file_cache.conf echo "LoadModule headers_module %{_libexecdir}/mod_headers.so" > $CFG/62_mod_headers.conf @@ -711,15 +746,13 @@ echo "LoadModule unique_id_module %{_libexecdir}/mod_unique_id.so" > $CFG/66 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html -gzip -9nf ABOUT_APACHE CHANGES README ROADMAP - %clean rm -rf $RPM_BUILD_ROOT %pre if [ -n "`getgid http`" ]; then if [ "`getgid http`" != "51" ]; then - echo "Warning: group http haven't gid=51. Correct this before installing apache" 1>&2 + echo "Error: group http doesn't have gid=51. Correct this before installing apache." 1>&2 exit 1 fi else @@ -727,11 +760,11 @@ else fi if [ -n "`id -u http 2>/dev/null`" ]; then if [ "`id -u http`" != "51" ]; then - echo "Warning: user http haven't uid=51. Correct this before installing apache" 1>&2 + echo "Error: user http doesn't have uid=51. Correct this before installing apache." 1>&2 exit 1 fi else - /usr/sbin/useradd -u 51 -r -d /home/httpd -s /bin/false -c "HTTP User" -g http http 1>&2 + /usr/sbin/useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http 1>&2 fi %post @@ -1082,12 +1115,9 @@ if [ "$1" = "0" ]; then fi fi -%post -n apr -p /sbin/ldconfig -%postun -n apr -p /sbin/ldconfig - %files %defattr(644,root,root,755) -%doc *.gz +%doc ABOUT_APACHE CHANGES README %doc docs/conf/mime.types %attr(754,root,root) /etc/rc.d/init.d/httpd @@ -1096,11 +1126,6 @@ fi %attr(750,root,root) %dir %{_sysconfdir}/httpd.conf %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_httpd.conf %attr(640,root,root) %{_sysconfdir}/magic -%attr(755,root,root) %dir %{_libexecdir}/build -%attr(755,root,root) %{_libexecdir}/build/*.mk -%attr(755,root,root) %{_libexecdir}/build/*.sh -%attr(755,root,root) %{_libexecdir}/build/libtool - %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/* %attr(640,root,root) %config(noreplace) /etc/logrotate.d/* @@ -1154,7 +1179,6 @@ fi %dir %{_datadir} %dir %{_datadir}/manual %{_datadir}/manual/LICENSE -%{_datadir}/manual/*.html %{_datadir}/manual/*.xml %{_datadir}/manual/*.html.en %lang(ja) %{_datadir}/manual/*.html.ja.jis @@ -1166,13 +1190,11 @@ fi %{_datadir}/manual/faq %dir %{_datadir}/manual/howto %doc %{_datadir}/manual/howto/*.en -%{_datadir}/manual/howto/*.html %lang(ja) %{_datadir}/manual/howto/*.ja.jis %dir %{_datadir}/manual/images %{_datadir}/manual/images/[achips]* %{_datadir}/manual/misc %dir %{_datadir}/manual/mod -%{_datadir}/manual/mod/[fh]*.html %{_datadir}/manual/mod/[cdfhipw]*.html.en %{_datadir}/manual/mod/[acd]*.xml %lang(ja) %{_datadir}/manual/mod/[ad]*.xml.ja* @@ -1200,12 +1222,7 @@ fi %doc%attr(755,root,root) %{_datadir}/manual/search/manual-index.cgi %{_datadir}/manual/style -# Having all index.html.LANG files here is very bad idea. %attr(755,root,root) %dir %{_datadir}/html -%config(noreplace,missingok) %{_datadir}/html/index.html -%config(noreplace,missingok) %{_datadir}/html/index.html.en -%{_datadir}/html/*.gif -%{_datadir}/html/*.png %{_datadir}/icons %attr(755,root,root) %{_datadir}/cgi-bin @@ -1217,15 +1234,20 @@ fi %attr(755,root,root) %{_libexecdir}/mod_suexec.so %{_datadir}/manual/mod/mod_suexec.html.en +%files index +%defattr(644,root,root,755) +%config(noreplace,missingok) %{_datadir}/html/index.html* +%{_datadir}/html/*.gif +%{_datadir}/html/*.png + %files devel %defattr(644,root,root,755) %{_includedir} -%exclude %{_includedir}/apr*.h %{_libexecdir}/*.exp - -%files static -%defattr(644,root,root,755) -%{_libdir}/lib*.a +%attr(755,root,root) %dir %{_libexecdir}/build +%attr(644,root,root) %{_libexecdir}/build/*.mk +%attr(755,root,root) %{_libexecdir}/build/*.sh +%attr(755,root,root) %{_libexecdir}/build/libtool %files mod_actions %defattr(644,root,root,755) @@ -1247,6 +1269,22 @@ fi %attr(755,root,root) %{_libexecdir}/mod_auth_anon.so %{_datadir}/manual/mod/mod_auth_anon.html.en +%if %{!?_without_ldap:1}%{?_without_ldap:0} +%files mod_auth_ldap +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_ldap.conf +%attr(755,root,root) %{_libexecdir}/mod_auth_ldap.so +%{_datadir}/manual/mod/mod_auth_ldap.html.en +%endif + +%if %{!?_without_ldap:1}%{?_without_ldap:0} +%files mod_ldap +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_ldap.conf +%attr(755,root,root) %{_libexecdir}/mod_ldap.so +%{_datadir}/manual/mod/mod_ldap.html.en +%endif + %files mod_auth_dbm %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_dbm.conf @@ -1340,6 +1378,7 @@ fi %files mod_rewrite %defattr(644,root,root,755) %attr(755,root,root) %{_libexecdir}/mod_rewrite.so +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_rewrite.conf %{_datadir}/manual/mod/mod_rewrite.html.en %{_datadir}/manual/images/mod_rewrite* @@ -1378,21 +1417,3 @@ fi %{_datadir}/manual/mod/mod_vhost_alias.html.en %{_datadir}/manual/vhosts %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_vhost_alias.conf - -%files -n apr -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libapr*.so.* - -%files -n apr-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/apr-config -%attr(755,root,root) %{_bindir}/apu-config -%{_includedir}/apr*.h -#%{_libdir}/APRVARS -%{_libdir}/apr*.exp -%attr(755,root,root) %{_libdir}/libapr*.so -%attr(755,root,root) %{_libdir}/libapr*.la - -%files -n apr-static -%defattr(644,root,root,755) -%{_libdir}/libapr.a