-%define SSLVER 2.8.8
-%define APACHEVER 1.3.24
-%define apxs /usr/sbin/apxs
+%define SSLVER 2.8.31
+%define APACHEVER 1.3.41
+%define apxs /usr/sbin/apxs1
+%define mod_name ssl
Summary: An SSL module for the Apache Web server
-Summary(cs): Modul s podporou silného ¹ifrování pro WWW server Apache
-Summary(da): Krypteringsunderstøttelse for webtjeneren Apache
-Summary(de): SSL-Modul für den Apache-Webserver
-Summary(es): Soporte criptofráfico para el servidor de red Apache
-Summary(fr): Un module SSL pour le serveur Web Apache
-Summary(id): Interpreter Perl untuk web server Apache
-Summary(is): Perl túlkur fyrir Apache vefþjóninn
-Summary(it): Supporto di crittografia per il server Web Apache
-Summary(ja): Apache Web ¥µ¡¼¥Ð¡¼ÍѤΰŹ極¥Ý¡¼¥È
-Summary(no): Krypteringsstøtte for webtjeneren Apache
-Summary(pl): Modu³ SSL dla webserwera Apache
-Summary(pt): O suporte de cifra para o servidor Web Apache
-Summary(ru): íÏÄÕÌØ ÐÏÄÄÅÒÖËÉ SSL × Apache
-Summary(sl): Podpora za ¹ifriranje za spletni stre¾nik Apache
-Summary(sv): Kryptografistöd till webbservern Apache
-Summary(uk): íÏÄÕÌØ Ð¦ÄÔÒÉÍËÉ SSL × Apache
-Name: apache-mod_ssl
+Summary(cs.UTF-8): Modul s podporou silného šifrování pro WWW server Apache
+Summary(da.UTF-8): Krypteringsunderstøttelse for webtjeneren Apache
+Summary(de.UTF-8): SSL-Modul für den Apache-Webserver
+Summary(es.UTF-8): Soporte criptofráfico para el servidor de WWW Apache
+Summary(fr.UTF-8): Un module SSL pour le serveur Web Apache
+Summary(id.UTF-8): Interpreter Perl untuk web server Apache
+Summary(is.UTF-8): Perl túlkur fyrir Apache vefþjóninn
+Summary(it.UTF-8): Supporto di crittografia per il server Web Apache
+Summary(ja.UTF-8): Apache Web サーバー用の暗号サポート
+Summary(nb.UTF-8): Krypteringsstøtte for webtjeneren Apache
+Summary(pl.UTF-8): Moduł SSL dla serwera WWW Apache
+Summary(pt.UTF-8): O suporte de cifra para o servidor Web Apache
+Summary(ru.UTF-8): Модуль поддержки SSL в Apache
+Summary(sl.UTF-8): Podpora za šifriranje za spletni strežnik Apache
+Summary(sv.UTF-8): Kryptografistöd till webbservern Apache
+Summary(uk.UTF-8): Модуль підтримки SSL в Apache
+Name: apache1-mod_%{mod_name}
Version: %{SSLVER}_%{APACHEVER}
-Release: 1
+Release: 10
License: BSD
Group: Networking/Daemons
-Source0: http://www.modssl.org/source/mod_ssl-%{SSLVER}-%{APACHEVER}.tar.gz
+Source0: http://www.modssl.org/source/mod_%{mod_name}-%{SSLVER}-%{APACHEVER}.tar.gz
+# Source0-md5: 4d55fc5c7cbf38820b44edf767f571c4
Source1: %{name}.conf
Source2: %{name}-server.crt
Source3: %{name}-server.key
Source4: %{name}-sxnet.html
-Source5: %{name}.logrotate
-Patch1: mod_ssl-cca-openssl-path.patch
-Patch2: mod_ssl-db3.patch
+Patch1: mod_%{mod_name}-cca-openssl-path.patch
+Patch2: mod_%{mod_name}-db3.patch
+Patch3: %{name}-nohttpd.patch
+Patch4: openssl.patch
URL: http://www.modssl.org/
-BuildRequires: apache(EAPI)-devel = %{APACHEVER}
-BuildRequires: openssl-devel >= 0.9.6a
-BuildRequires: openssl-tools >= 0.9.6a
-BuildRequires: db3-devel
-BuildRequires: %{apxs}
-Requires: apache(EAPI) >= %{APACHEVER}
-Provides: mod_ssl
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: apache1-devel >= %{APACHEVER}
+BuildRequires: db-devel >= 4.1
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: openssl-tools >= 0.9.7d
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
+Requires(triggerpostun): grep
+Requires(triggerpostun): sed >= 4.0
+Requires: apache1-base >= %{APACHEVER}
+# see the config
+Requires: apache1-mod_log_config
+Requires: apache1-mod_setenvif
+Provides: apache(mod_ssl) = %{version}-%{release}
+Obsoletes: apache-mod_ssl < 2
Obsoletes: mod_ssl
+%requires_ge_to openssl openssl-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR)
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define _pkglogdir /var/log/apache
%description
The mod_ssl project provides strong cryptography for the Apache 1.3
licensed under a BSD-style licence, which basically means that you are
free to get and use it for commercial and non-commercial purposes.
-%description -l cs
-"Modul mod_ssl pro WWW server Apache umo¾òuje pou¾ití silného
-¹ifrování\n" "komunikace klienta (WWW prohlí¾eè) a serveru - SSL
-(Secure Sockets Layer)\n" "a TLS (Transport Layer Security)
-protokoly."
+%description -l cs.UTF-8
+Modul mod_ssl pro WWW server Apache umožňuje použití silného šifrování
+komunikace klienta (WWW prohlížeč) a serveru - SSL (Secure Sockets
+Layer) a TLS (Transport Layer Security) protokoly.
-%description -l de
-Das mod_ssl-Projekt stellt kryptographie für den Apache 1.3-Webserver
-über Secure Sockets Layer (SSL v2/v3) und Transport Layer Security
-(TLS v1)-Protokolle zur Verfügung. Dazu wird das Open Source
+%description -l de.UTF-8
+Das mod_ssl-Projekt stellt kryptographie für den Apache 1.3-Webserver
+über Secure Sockets Layer (SSL v2/v3) und Transport Layer Security
+(TLS v1)-Protokolle zur Verfügung. Dazu wird das Open Source
SSL/TLS-Toolkit OpenSSL, das auf SSLeay basiert, verwendet.
-%description -l es
-"El módulo modd_ssl proporciona la criptografía para el servidor
-Web\n" "Apache, los sockets seguros, los protocolos de la seguridad
-(SSL) y de la\n" "capa tranparente (TLS)."
+%description -l es.UTF-8
+El módulo mod_ssl proporciona la criptografía para el servidor Web
+Apache, los sockets seguros, los protocolos de la seguridad (SSL) y de
+la capa tranparente (TLS).
-%description -l fr
+%description -l fr.UTF-8
Le projet mod_ssl fournit de la forte cryptographie pour le serveur
web Apache 1.3 via les protocoles Secure Sockets Layer (SSL v2/v3) et
Transport Layer Security (TLS v1) avec l'aide du kit d'outils Open
Source SSL/TLS, OpenSSL, base sur SSLeay d'Eric A. Young et Tim J.
Hudson.
-%description -l it
-"Il modulo mod_ssl fornisce un supporto di crittografia molto potente
-per\n" "il server Web Apache tramite i protocolli SSL (Secure Sockets
-Layer) e i\n" "protocolli TLS (Transport Layer Security)."
+%description -l it.UTF-8
+Il modulo mod_ssl fornisce un supporto di crittografia molto potente
+per il server Web Apache tramite i protocolli SSL (Secure Sockets
+Layer) e i protocolli TLS (Transport Layer Security).
-%description -l ja
-"mod_ssl ¥â¥¸¥å¡¼¥ë¤Ï¡¢SSL (Secure Sockets Layer) ¤ª¤è¤Ó TLS
-(Transport \n" "Layer Security) ¥×¥í¥È¥³¥ë¤ò²ð¤·¤Æ Apache Web
-¥µ¡¼¥Ð¡¼ÍѤζ¯ÎϤʰŹ沽\n" "µ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£"
+%description -l ja.UTF-8
+mod_ssl モジュールは、SSL (Secure Sockets Layer) および TLS (Transport
+Layer Security) プロトコルを介して Apache Web サーバー用の強力な暗号化
+機能を提供します。
-%description -l pl
-Projekt mod_ssl ma za zadanie zapewniæ serwerowi www Apache 1.3 wysoki
-poziom szyfrowania dziêki protoko³om Secure Sockets Layer (SSL v2/v3)
-i Transport Layer Security (TLS v1) przy pomocy pakiety narzêdziowego
+%description -l pl.UTF-8
+Projekt mod_ssl ma za zadanie zapewnić serwerowi WWW Apache 1.3 wysoki
+poziom szyfrowania dzięki protokołom Secure Sockets Layer (SSL v2/v3)
+i Transport Layer Security (TLS v1) przy pomocy pakiety narzędziowego
Open Source SSL/TSL -- OpenSSL, stworzonego na podstawie SSLeay Erica
A.Younga i Tima J.Hudsona.
-%description -l pt
-"O módulo mod_ssl oferece uma criptografia robusta para o servidor
-Web\n" "Apache através dos protocolos SSL (Secure Sockets Layer) e TLS
-(Transport\n" "Layer Security)."
+%description -l pt.UTF-8
+O módulo mod_ssl oferece uma criptografia robusta para o servidor Web
+Apache através dos protocolos SSL (Secure Sockets Layer) e TLS
+(Transport Layer Security).
+
+%description -l ru.UTF-8
+Apache -- мощный свободно распространяемый сервер а также и самым
+популярный в Internet'е (он используется на более, чем 50%% серверов в
+мире). Эта версия включает в себя поддержку SSL v2, v3 и TLS v1.
-%description -l ru
-Apache -- ÍÏÝÎÙÊ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÙÊ ÓÅÒ×ÅÒ Á ÔÁËÖÅ É ÓÁÍÙÍ
-ÐÏÐÕÌÑÒÎÙÊ × Internet'Å (ÏÎ ÉÓÐÏÌØÚÕÅÔÓÑ ÎÁ ÂÏÌÅÅ, ÞÅÍ 50%% ÓÅÒ×ÅÒÏ× ×
-ÍÉÒÅ). üÔÁ ×ÅÒÓÉÑ ×ËÌÀÞÁÅÔ × ÓÅÂÑ ÐÏÄÄÅÒÖËÕ SSL v2, v3 É TLS v1.
+%description -l sv.UTF-8
+Modulen mod_ssl förser webbservern Apache med stark kryptografi via
+protokollen SSL (Secure Sockets Layer) och TLS (Transport Layer
+Security).
-%description -l sv
-"Modulen mod_ssl förser webbservern Apache med stark kryptografi
-via\n" "protokollen SSL (Secure Sockets Layer) och TLS (Transport
-Layer\n" "Security)."
+%description -l uk.UTF-8
+Apache -- потужний вільно розповсюджуваний сервер HTTP. Це
+найпопулярніший сервер у світі (використовується більш як на 50%%
+серверів). Ця версія містить підтримку SSL v2, v3 та TLS v1.
-%description -l uk
-Apache -- ÐÏÔÕÖÎÉÊ ×¦ÌØÎÏ ÒÏÚÐÏ×ÓÀÄÖÕ×ÁÎÉÊ ÓÅÒ×ÅÒ http. ãÅ
-ÎÁÊÐÏÐÕÌÑÒΦÛÉÊ ÓÅÒ×ÅÒ Õ ÓצԦ (×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ Â¦ÌØÛ ÑË ÎÁ 50%%
-ÓÅÒ×ÅÒ¦×). ãÑ ×ÅÒÓ¦Ñ Í¦ÓÔÉÔØ Ð¦ÄÔÒÉÍËÕ SSL v2, v3 ÔÁ TLS v1.
+%package devel
+Summary: Header files for mod_ssl
+Summary(pl.UTF-8): Pliki nagłówkowe dla mod_ssl
+Group: Development/Building
+Requires: apache1-devel >= %{APACHEVER}
-%package -n apache-mod_sxnet
+%description devel
+Header files for mod_ssl.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla mod_ssl.
+
+%package -n apache1-mod_sxnet
Summary: Strong Extranet module for mod_ssl and apache
-Summary(fr): Module d'Extranet Fort pour Apache et mod_ssl
-Summary(pl): Modu³ Strong Extranet dla pakietu mod_ssl i webserwera Apache
+Summary(fr.UTF-8): Module d'Extranet Fort pour Apache et mod_ssl
+Summary(pl.UTF-8): Moduł Strong Extranet dla pakietu mod_ssl i serwera WWW Apache
Group: Networking/Daemons
-Requires: apache(EAPI) >= %{APACHEVER}
+Requires(triggerpostun): grep
+Requires(triggerpostun): sed >= 4.0
+Requires: apache1(EAPI) >= %{APACHEVER}
+Obsoletes: apache-mod_sxnet < 2
-%description -n apache-mod_sxnet
+%description -n apache1-mod_sxnet
The Strong Extranet allows you to use digital certificates to
authenticate users on your web server. Typically, your users enroll in
your Strong Extranet, under your control, through the Thawte Personal
Cert System.
-%description -n apache-mod_sxnet -l fr
+%description -n apache1-mod_sxnet -l fr.UTF-8
L'Extranet Fort vous permet d'utiliser des certificats numeriques pour
authentifier les usagers sur votre serveur web. Typiquement, vos
usagers s'enrolent dans votre Extranet Fort, sous votre controle, a
travers le Thawte Personal Cert System.
-%description -n apache-mod_sxnet -l pl
-Pakiet Strong Extranet umo¿liwia u¿ywanie cyfrowych certyfikatów dla
-uwierzytleniania u¿ytkowników serwera www. Zwykle u¿ytkownicy
-rejestruj± siê pod opiek± administratora poprzez Thawte Personal Cert
+%description -n apache1-mod_sxnet -l pl.UTF-8
+Pakiet Strong Extranet umożliwia używanie cyfrowych certyfikatów dla
+uwierzytelniania użytkowników serwera WWW. Zwykle użytkownicy
+rejestrują się pod opieką administratora poprzez Thawte Personal Cert
System.
%prep
-%setup -q -n mod_ssl-%{SSLVER}-%{APACHEVER}
+%setup -q -n mod_%{mod_name}-%{SSLVER}-%{APACHEVER}
+%{__tar} -C pkg.contrib -xf pkg.contrib/sxnet.tar
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%{__sed} -i -e 's@ /lib /usr/lib @ /%{_lib} /usr/%{_lib} @' pkg.sslmod/libssl.module
+%{__sed} -i -e 's,@APACHE_VERSION@,%{APACHEVER},' configure
%build
-SSL_BASE=SYSTEM
-export SSL_BASE
+export SSL_BASE=SYSTEM
%configure \
--with-apxs=%{apxs} \
--enable-shared=ssl \
--with-ssl=%{_prefix}
+
%{__make}
-cd pkg.contrib
-tar xvf sxnet.tar
-cd sxnet
+cd pkg.contrib/sxnet
%{apxs} -DMalloc=malloc -DFree=free -I%{_includedir}/openssl -L%{_libdir} -l ssl -l crypto -c mod_sxnet.c
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/mod_ssl,%{_pkglibdir}} \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd \
- $RPM_BUILD_ROOT/etc/logrotate.d
+install -d $RPM_BUILD_ROOT{%{_libdir}/mod_%{mod_name},%{_pkglibdir},%{_pkglogdir}} \
+ $RPM_BUILD_ROOT%{_includedir}/apache1 \
+ $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+
+install -p pkg.sslmod/libssl.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p pkg.contrib/sxnet/mod_sxnet.so $RPM_BUILD_ROOT%{_pkglibdir}
+
+install -p pkg.contrib/*.sh $RPM_BUILD_ROOT%{_libdir}/mod_%{mod_name}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/40_mod_%{mod_name}.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/server.crt
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/server.key
-install pkg.sslmod/libssl.so $RPM_BUILD_ROOT%{_pkglibdir}
-install pkg.contrib/sxnet/mod_sxnet.so $RPM_BUILD_ROOT%{_pkglibdir}
+cp -a pkg.ssldoc ssl-doc
-install pkg.contrib/*.sh $RPM_BUILD_ROOT%{_libdir}/mod_ssl
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_ssl.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/server.crt
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/server.key
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_ssl
+cp -a %{SOURCE4} sxnet.html
+echo 'LoadModule sxnet_module modules/mod_sxnet.so' > \
+ $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_sxnet.conf
-mv -f pkg.ssldoc ssl-doc
+cp -p pkg.sslmod/*.h $RPM_BUILD_ROOT%{_includedir}/apache1
-install %{SOURCE4} sxnet.html
+> $RPM_BUILD_ROOT%{_pkglogdir}/ssl_engine_log
+> $RPM_BUILD_ROOT%{_pkglogdir}/ssl_request_log
-gzip -9nf ANNOUNCE CHANGES CREDITS NEWS README*
+%clean
+rm -rf $RPM_BUILD_ROOT
%post
-if [ -f %{_sysconfdir}/httpd/httpd.conf ] && \
- ! grep -q "^Include.*/mod_ssl.conf" %{_sysconfdir}/httpd/httpd.conf; then
- echo "Include /etc/httpd/mod_ssl.conf" >> %{_sysconfdir}/httpd/httpd.conf
+%service -q apache restart
+
+%postun
+if [ "$1" = "0" ]; then
+ %service -q apache restart
fi
-if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
+
+%triggerpostun -- apache1-mod_ssl < 2.8.22_1.3.33-1.7
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
+ sed -i -e '
+ /^Include.*mod_%{mod_name}.conf/d
+ ' /etc/apache/apache.conf
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ # they're still using old apache.conf
+ sed -i -e '
+ s,^Include.*mod_%{mod_name}.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
+ ' /etc/apache/apache.conf
fi
-%preun
-if [ "$1" = "0" ]; then
- grep -E -v "^Include.*mod_ssl.conf" %{_sysconfdir}/httpd/httpd.conf > \
- %{_sysconfdir}/httpd/httpd.conf.tmp
- mv -f %{_sysconfdir}/httpd/httpd.conf.tmp %{_sysconfdir}/httpd/httpd.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
+%triggerpostun -- apache1-mod_sxnet < 2.8.22_1.3.33-1.9
+# check that they're not using old apache.conf
+if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+ sed -i -e '/^\(Add\|Load\)Module.*mod_sxnet\.\(so\|c\)/d' /etc/apache/apache.conf
fi
-%post -n apache-mod_sxnet
-/usr/sbin/apxs -e -a -n sxnet %{_pkglibdir}/mod_sxnet.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%post -n apache1-mod_sxnet
+%service -q apache restart
-%preun -n apache-mod_sxnet
+%postun -n apache1-mod_sxnet
if [ "$1" = "0" ]; then
- /usr/sbin/apxs -e -A -n sxnet %{_pkglibdir}/mod_sxnet.so 1>&2
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
+ %service -q apache restart
fi
-
+
%files
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/mod_ssl.conf
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/server.crt
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/server.key
-%attr(640,root,root) %config(noreplace) /etc/logrotate.d/*
-%doc *.gz
-%doc ssl-doc
+%doc ANNOUNCE CHANGES CREDITS LICENSE NEWS README* ssl-doc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ssl.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/server.crt
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/server.key
+%attr(640,root,root) %ghost %{_pkglogdir}/*
%attr(755,root,root) %{_pkglibdir}/libssl.so
-%dir %{_libdir}/mod_ssl
-%attr(755,root,root) %{_libdir}/mod_ssl/*.sh
+%dir %{_libdir}/mod_%{mod_name}
+%attr(755,root,root) %{_libdir}/mod_%{mod_name}/*.sh
-%files -n apache-mod_sxnet
+%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_pkglibdir}/mod_sxnet.so
-%doc sxnet.html
+%{_includedir}/apache1/*.h
-%clean
-rm -rf $RPM_BUILD_ROOT
+%files -n apache1-mod_sxnet
+%defattr(644,root,root,755)
+%doc sxnet.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_sxnet.conf
+%attr(755,root,root) %{_pkglibdir}/mod_sxnet.so
projects / packages / apache1-mod_ssl.git / blobdiff