-%define SSLVER 2.8.7
-%define APACHEVER 1.3.23
-%define apxs /usr/sbin/apxs
+%define SSLVER 2.8.18
+%define APACHEVER 1.3.31
+%define apxs /usr/sbin/apxs1
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(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(nb): Krypteringsstøtte for webtjeneren Apache
+Summary(pl): Modu³ SSL dla serwera WWW 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
+Name: apache1-mod_ssl
Version: %{SSLVER}_%{APACHEVER}
-Release: 1
+Release: 2
License: BSD
Group: Networking/Daemons
Source0: http://www.modssl.org/source/mod_ssl-%{SSLVER}-%{APACHEVER}.tar.gz
-Source1: %{name}.conf
+# Source0-md5: 4e966d62bb9304fef153b03868756543
+Source1: apache1-mod_ssl.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
+Patch3: %{name}-nohttpd.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}
+BuildRequires: apache1(EAPI)-devel = %{APACHEVER}
+BuildRequires: db-devel >= 4.1
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: openssl-tools >= 0.9.7d
+Requires(post,preun): apache1
+Requires(post,preun): grep
+Requires(preun): fileutils
+Requires: apache1(EAPI) >= %{APACHEVER}
Provides: mod_ssl
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: mod_ssl
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR)
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR)
+%define _apachesysconfdir %(%{apxs} -q SYSCONFDIR)
%description
The mod_ssl project provides strong cryptography for the Apache 1.3
ÎÁÊÐÏÐÕÌÑÒΦÛÉÊ ÓÅÒ×ÅÒ Õ ÓצԦ (×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ Â¦ÌØÛ ÑË ÎÁ 50%%
ÓÅÒ×ÅÒ¦×). ãÑ ×ÅÒÓ¦Ñ Í¦ÓÔÉÔØ Ð¦ÄÔÒÉÍËÕ SSL v2, v3 ÔÁ TLS v1.
-%package -n apache-mod_sxnet
+%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(pl): Modu³ Strong Extranet dla pakietu mod_ssl i serwera WWW Apache
Group: Networking/Daemons
-Requires: apache(EAPI) >= %{APACHEVER}
+Requires(post,preun): %{apxs}
+Requires: apache1(EAPI) >= %{APACHEVER}
-%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
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
+%description -n apache1-mod_sxnet -l pl
Pakiet Strong Extranet umo¿liwia u¿ywanie cyfrowych certyfikatów dla
-uwierzytleniania u¿ytkowników serwera www. Zwykle u¿ytkownicy
+uwierzytelniania u¿ytkowników serwera www. Zwykle u¿ytkownicy
rejestruj± siê pod opiek± administratora poprzez Thawte Personal Cert
System.
%setup -q -n mod_ssl-%{SSLVER}-%{APACHEVER}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+
+%{__perl} -pi -e 's@ /lib /usr/lib @ /%{_lib} /usr/%{_lib} @' pkg.sslmod/libssl.module
%build
-SSL_BASE=SYSTEM
-export SSL_BASE
+SSL_BASE=SYSTEM; export SSL_BASE
%configure \
--with-apxs=%{apxs} \
--enable-shared=ssl \
--with-ssl=%{_prefix}
+
%{__make}
cd pkg.contrib
tar xvf sxnet.tar
cd sxnet
-%{apxs} -I%{_includedir}/openssl/ -L%{_libdir} -l ssl -l crypto -c mod_sxnet.c
+%{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%{_apachesysconfdir} \
$RPM_BUILD_ROOT/etc/logrotate.d
install pkg.sslmod/libssl.so $RPM_BUILD_ROOT%{_pkglibdir}
install pkg.contrib/sxnet/mod_sxnet.so $RPM_BUILD_ROOT%{_pkglibdir}
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 %{SOURCE1} $RPM_BUILD_ROOT%{_apachesysconfdir}/mod_ssl.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_apachesysconfdir}/server.crt
+install %{SOURCE3} $RPM_BUILD_ROOT%{_apachesysconfdir}/server.key
install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_ssl
mv -f pkg.ssldoc ssl-doc
install %{SOURCE4} sxnet.html
-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
+if [ -f %{_apachesysconfdir}/apache.conf ] && \
+ ! grep -q "^Include.*/mod_ssl.conf" %{_apachesysconfdir}/apache.conf; then
+ echo "Include %{_apachesysconfdir}/mod_ssl.conf" >> %{_apachesysconfdir}/apache.conf
fi
-if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon."
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
+ umask 027
+ grep -E -v "^Include.*mod_ssl.conf" %{_apachesysconfdir}/apache.conf > \
+ %{_apachesysconfdir}/apache.conf.tmp
+ mv -f %{_apachesysconfdir}/apache.conf.tmp %{_apachesysconfdir}/apache.conf
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+ fi
+fi
+
+%post -n apache1-mod_sxnet
+%{apxs} -e -a -n sxnet %{_pkglibdir}/mod_sxnet.so 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+fi
+
+%preun -n apache1-mod_sxnet
+if [ "$1" = "0" ]; then
+ %{apxs} -e -A -n sxnet %{_pkglibdir}/mod_sxnet.so 1>&2
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
fi
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
+%doc ANNOUNCE CHANGES CREDITS NEWS README* ssl-doc
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_apachesysconfdir}/mod_ssl.conf
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_apachesysconfdir}/server.crt
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_apachesysconfdir}/server.key
%attr(640,root,root) %config(noreplace) /etc/logrotate.d/*
-%doc *.gz
-%doc ssl-doc
%attr(755,root,root) %{_pkglibdir}/libssl.so
%dir %{_libdir}/mod_ssl
%attr(755,root,root) %{_libdir}/mod_ssl/*.sh
-%files -n apache-mod_sxnet
+%files -n apache1-mod_sxnet
%defattr(644,root,root,755)
-%attr(755,root,root) %{_pkglibdir}/mod_sxnet.so
%doc sxnet.html
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%attr(755,root,root) %{_pkglibdir}/mod_sxnet.so
projects / packages / apache1-mod_ssl.git / blobdiff