Bug 799192

The cummulative changes nss-til, a rather stable subset of nss, from 3.13.1 to 3.13.3 can be obtained with the following two buzilla queries:

https://bugzilla.mozilla.org/buglist.cgi?resolution=FIXED;classification=Components;query_format=advanced;target_milestone=3.13.2;product=NSS;list_id=2533316

https://bugzilla.mozilla.org/buglist.cgi?resolution=FIXED;classification=Components;query_format=advanced;target_milestone=3.13.3;product=NSS;list_id=2533316

Now new APIs are introduced nor new macros.

Created attachment 567663 [details]
Changes done to build for rhel 6.3

Hardly anything had to be done on account of this update. No patches were added or removed Two patches are updated to accound for code movement but nothing else. The small changes in %post and %postun of the spec file where done to comply with our packaging guidelines.

Created attachment 567758 [details]
Changes as actually applied

Comment on attachment 567758 [details]
Changes as actually applied

Please ignore, these are ones for nspr.

Created attachment 567766 [details]
Changes as actually applied

Comment on attachment 567766 [details]
Changes as actually applied

r+ rrelyea

Comment on attachment 567766 [details]
Changes as actually applied

RHEL 6.2 has nss-util-3.13.1-3. The last log entry before 3.13.3 is 3.13.1-2

Also you set the version number in your log file to 3.13.1-5 instead of 3.13.3-2.

(In reply to comment #10)
> Comment on attachment 567766 [details]
> Changes as actually applied
> 
> RHEL 6.2 has nss-util-3.13.1-3. The last log entry before 3.13.3 is 3.13.1-2

I'll explain the reasons for this below.

> Also you set the version number in your log file to 3.13.1-5 instead of
> 3.13.3-2.

Indeed, that is wrong. It should actually have been 3.13.3-1 as the top has
Version:          3.13.3
Release:          1%{?dist}

There is amnother error. The very first line says
%global nspr_version 4.8.9
and it should be
%global nspr_version 4.9

That's the minimun nspr version that feeds into
Requires:         nspr >= %{nspr_version}
BuildRequires:    nspr-devel >= %{nspr_version}

Getting back to for first comment: 
> RHEL 6.2 has nss-util-3.13.1-3.
Here are results of my investigation:

RHEL 6.2 nss-util History from 
https://brewweb.devel.redhat.com/buildinfo?buildID=198386

Changelog
 * Fri Feb 10 2012 Elio Maldonado Batiz <emaldona>
 - 3.13.1-3 - Related: Bug 773056 - Update to 3.13.1
 - Retagging

NOTE: Corrective build to bring sources in synchrony with last build done.
Merging from 6.3 into 6.2 and retagging. A loophole in the rhpg tool allowed
a build targetted for 6.2 but from the RHEL-6.3 branch to occur. The tool has
since been fixed. This build rectified this sutiation.

 * Mon Jan 30 2012 Martin Stransky <stransky> 3.13.1-2
 - Rebuild for NSPR 4.8.9

 * Wed Jan 18 2012 Elio Maldonado <emaldona>
 - 3.13.1-1 - Resolves: Bug 773056 - Update to 3.13.1

 * Tue Sep 27 2011 Elio Maldonado <emaldona>
 - 3.12.10-2 - Add relro support for executables and shared libraries

 * Wed Jul 06 2011 Elio Maldonado <emaldona>
 - 3.12.10-1 - Update to 3.12.10

-----------------------------------------------------------------------------
RHEL 6.3 nss-util History from 
https://brewweb.devel.redhat.com/buildinfo?buildID=201653

Changelog
 * Mon Mar 05 2012 Elio Maldonado <emaldona> - 3.13.1-5
 - Resolves: rhbz#799192 - Update to 3.13.3
This build is incorrect: Those two lines don't match!
Updating to 3.13.3 with a 3.13.1-5 tag!
At the top I have:
Version:          3.13.3
Release:          1%{?dist}
That's correct. But this other one, which deteemines the minimom nspt version
for Requires and BuildRequired says '%global nspr_version 4.8.9', not right.
It should be %global nspr_version 4.9. Release tagging and release dependencies
(requires) are worong. We now need a 3.13.3-2 build.

 * Mon Jan 30 2012 Martin Stransky <stransky> 3.13.1-2
 - Rebuild for NSPR 4.8.9

 * Wed Jan 18 2012 Elio Maldonado <emaldona>
 - 3.13.1-1 - Resolves: Bug 773056 - Update to 3.13.1

 * Tue Sep 27 2011 Elio Maldonado <emaldona>
 - 3.12.10-2 - Add relro support for executables and shared libraries

 * Wed Jul 06 2011 Elio Maldonado <emaldona>
 - 3.12.10-1 - Update to 3.12.10 

---------------------
This call for a verification that we end up with the same sources for 6.2 and 6.3.

0. The brew builds are at
https://brewweb.devel.redhat.com/packageinfo?packageID=18328
We are interested in 
nss-util-3.13.3-1.el6 	emaldona 2012-03-05 16:44:36 	complete (current)
nss-util-3.13.1-3.el6_2 emaldona 2012-02-10 17:18:09 	complete (Last 6.2)
nss-util-3.13.1-1.el6 	emaldona 2012-01-23 21:55:22 	complete (Last 6.3)

Downloaded and compared the debuginfos with
diff --recursive nss-util-debuginfo-3.13.1-3.el6_2.x86_64/usr/src/debug/nss-util-3.13.1/ nss-util-debuginfo-3.13.1-1.el6.x86_64/usr/src/debug/nss-util-3.13.1/
which shows me no differences. Rebasing changes  relative to either branch should give me the same results, provided I don't make other mistakes as obviously did.

We need an nss-util-3.13.3-2 build to fix this.

Created attachment 568396 [details]
Fix version-release tags and miniminum nspr version required

Created attachment 568398 [details]
Cummulative changes to propely rebase to 3.13.3

Committed locally only, not pushed to the git repository yet. 
scratch build at https://brewweb.devel.redhat.com/taskinfo?taskID=4127343

Comment on attachment 568398 [details]
Cummulative changes to propely rebase to 3.13.3

r+ rrelyea

Comment on attachment 568396 [details]
Fix version-release tags and miniminum nspr version required

clearing review flag. This patch was already incorporated in the patch with the r+.

    Technical note added. If any revisions are required, please edit the "Technical Notes" field
    accordingly. All revisions will be proofread by the Engineering Content Services team.
    
    New Contents:
No Ducumentation Needed

Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

http://rhn.redhat.com/errata/RHSA-2012-0973.html