Author: hawk Date: Thu Dec 11 22:34:39 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - keep /var/lib/openssl as default dir in Titanium, moving to /etc/openssl breaks too many apps and messess up stuff created manually in /var/lib/openssl, however add symlinks in /etc/openssl to keep compatibility with official PLD - release 5
---- Files affected: SPECS: openssl.spec (1.195 -> 1.196) ---- Diffs: ================================================================ Index: SPECS/openssl.spec diff -u SPECS/openssl.spec:1.195 SPECS/openssl.spec:1.196 --- SPECS/openssl.spec:1.195 Thu Nov 13 10:30:01 2008 +++ SPECS/openssl.spec Thu Dec 11 23:34:33 2008 @@ -16,7 +16,7 @@ Summary(uk.UTF-8): Бібліотеки та утиліти для з'єднань через Secure Sockets Layer Name: openssl Version: 0.9.8i -Release: 4 +Release: 5 License: Apache-like Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz @@ -211,7 +211,11 @@ OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \ ./Configure \ +%if "%{pld_release}" == "ti" + --openssldir=%{_var}/lib/%{name} \ +%else --openssldir=%{_sysconfdir}/%{name} \ +%endif --lib=%{_lib} \ shared threads \ enable-mdc2 enable-rc5 \ @@ -282,8 +286,19 @@ ln -sf libcrypto.so.*.* $RPM_BUILD_ROOT%{_libdir}/libcrypto.so ln -sf libssl.so.*.* $RPM_BUILD_ROOT%{_libdir}/libssl.so +%if "%{pld_release}" == "ti" +ln -sf %{_var}/lib/%{name}/%{name}.cnf \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/openssl.cnf +ln -sf %{_var}/lib/%{name}/certs \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/certs +ln -sf %{_var}/lib/%{name}/private \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/private +mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name} +rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc +%else mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc +%endif # not installed as individual utilities (see openssl dgst instead) %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{md2,md4,md5,mdc2,ripemd160,sha,sha1}.1 @@ -298,6 +313,14 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%if "%{pld_release}" == "ti" +%triggerin -- %{name}-tools < 0.9.8i-2 +if [ -L /var/lib/openssl/openssl.cnf ] ; then + echo "Saving old configuration as /var/lib/openssl/openssl.cnf.rpmsave" + rm /var/lib/openssl/openssl.cnf + mv %{_sysconfdir}/%{name}/openssl.cnf /var/lib/openssl/openssl.cnf.rpmsave 2>/dev/null || : +fi +%else %triggerpostun -- %{name} < 0.9.8i-2 if [ -d /var/lib/openssl/certs ] ; then mv /var/lib/openssl/certs/* %{_sysconfdir}/%{name}/certs 2>/dev/null || : @@ -310,6 +333,7 @@ [ -f "$f" ] && mv "$f" %{_sysconfdir}/%{name} 2>/dev/null || : done fi +%endif %files %defattr(644,root,root,755) @@ -322,11 +346,21 @@ %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/certs %dir %{_sysconfdir}/%{name}/private +%if "%{pld_release}" == "ti" +%dir %{_var}/lib/%{name} +%dir %{_var}/lib/%{name}/certs +%dir %{_var}/lib/%{name}/private +%endif %dir %{_datadir}/ssl %files tools %defattr(644,root,root,755) +%if "%{pld_release}" == "ti" +%{_sysconfdir}/%{name}/openssl.cnf +%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/%{name}/openssl.cnf +%else %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf +%endif %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/c_rehash.sh %attr(754,root,root) %{_bindir}/ssl-certificate @@ -405,6 +439,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.196 2008/12/11 22:34:33 hawk +- keep /var/lib/openssl as default dir in Titanium, moving to /etc/openssl + breaks too many apps and messess up stuff created manually in + /var/lib/openssl, however add symlinks in /etc/openssl to keep + compatibility with official PLD +- release 5 + Revision 1.195 2008/11/13 09:30:01 glen - ca-certificates moved to /etc/certs; rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssl.spec?r1=1.195&r2=1.196&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
