Attachment 149126 Details for Bug 230546 – Proposed Patch

[patch] Proposed Patch

p-fix-fips-rhel5 (text/plain), 2.56 KB, created by Kai Engert (:kaie) (inactive account) on 2007-03-02 15:42:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Engert (:kaie) (inactive account)

Created: 2007-03-02 15:42:17 UTC

Size: 2.56 KB

patch

obsolete

>Index: nss.spec
>===================================================================
>RCS file: /cvs/dist/rpms/nss/RHEL-5/nss.spec,v
>retrieving revision 1.23
>diff -u -r1.23 nss.spec
>--- nss.spec	24 Jan 2007 20:30:19 -0000	1.23
>+++ nss.spec	1 Mar 2007 11:55:28 -0000
>@@ -1,9 +1,10 @@
> %define nspr_version 4.6.2
>+%define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
> 
> Summary:          Network Security Services
> Name:             nss
> Version:          3.11.5
>-Release:          1%{?dist}
>+Release:          2%{?dist}
> License:          MPL/GPL/LGPL
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -150,6 +151,7 @@
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
>+%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
> 
> # Copy the binary libraries we want
> for file in libnss3.so libssl3.so libsmime3.so libsoftokn3.so libnssckbi.so libfreebl3.so
>@@ -157,11 +159,9 @@
>   %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
> done
> 
>-# Copy the chk files we want
>-for file in libsoftokn3.chk libfreebl3.chk
>-do
>-  %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
>-done
>+# These ghost files will be generated in the post step
>+touch $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.chk
>+touch $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.chk
> 
> # Install the empty NSS db files
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
>@@ -181,6 +181,12 @@
>   %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
> done
> 
>+# Copy the binaries we ship as unsupported
>+for file in shlibsign
>+do
>+  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
>+done
>+
> # Copy the include files
> for file in mozilla/dist/public/nss/*.h
> do
>@@ -194,6 +200,8 @@
> 
> %post
> /sbin/ldconfig >/dev/null 2>/dev/null
>+%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libsoftokn3.so >/dev/null 2>/dev/null
>+%{unsupported_tools_directory}/shlibsign -i %{_libdir}/libfreebl3.so >/dev/null 2>/dev/null
> 
> 
> %postun
>@@ -206,10 +214,11 @@
> %{_libdir}/libssl3.so
> %{_libdir}/libsmime3.so
> %{_libdir}/libsoftokn3.so
>-%{_libdir}/libsoftokn3.chk
> %{_libdir}/libnssckbi.so
> %{_libdir}/libfreebl3.so
>-%{_libdir}/libfreebl3.chk
>+%{unsupported_tools_directory}/shlibsign
>+%ghost %{_libdir}/libsoftokn3.chk
>+%ghost %{_libdir}/libfreebl3.chk
> %dir %{_sysconfdir}/pki/nssdb
> %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
> %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db

Actions: View | Diff

Attachments on bug 230546: 149126