Re: [SVN-Commit] r1391 - in trunk: devel/nspr security/ca_root_nss security/nss www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-i18n www/firefox-nightly www/firefox-nightly/files www/libxul www/linux-firefox www/linux-seamonkey www/seamonkey

[Marat N.Afanasyev]

Marat N.Afanasyev wrote:

svn-freebsd-ge...@chruetertee.ch wrote:

Author: jbeich
Date: Sun Nov 17 12:04:46 2013
New Revision: 1391

Log:
update

Modified:
    trunk/devel/nspr/Makefile
    trunk/devel/nspr/distinfo
    trunk/security/ca_root_nss/Makefile
    trunk/security/ca_root_nss/distinfo
    trunk/security/nss/Makefile
    trunk/security/nss/distinfo
    trunk/www/firefox-esr-i18n/Makefile
    trunk/www/firefox-esr-i18n/distinfo
    trunk/www/firefox-esr/Makefile
    trunk/www/firefox-esr/distinfo
    trunk/www/firefox-i18n/Makefile
    trunk/www/firefox-i18n/distinfo
    trunk/www/firefox-nightly/Makefile
    trunk/www/firefox-nightly/Makefile.hgrev
    trunk/www/firefox-nightly/distinfo
    trunk/www/firefox-nightly/files/patch-bug810716
    trunk/www/firefox/Makefile
    trunk/www/firefox/distinfo
    trunk/www/libxul/Makefile
    trunk/www/libxul/distinfo
    trunk/www/linux-firefox/Makefile
    trunk/www/linux-firefox/distinfo
    trunk/www/linux-seamonkey/Makefile
    trunk/www/linux-seamonkey/distinfo
    trunk/www/seamonkey/Makefile
    trunk/www/seamonkey/distinfo

Modified: trunk/devel/nspr/Makefile
==============================================================================

--- trunk/devel/nspr/Makefile    Sat Nov 16 08:46:46 2013    (r1390)
+++ trunk/devel/nspr/Makefile    Sun Nov 17 12:04:46 2013    (r1391)
@@ -2,7 +2,7 @@
  # $FreeBSD: head/devel/nspr/Makefile 331527 2013-10-24 20:08:22Z flo $

  PORTNAME=    nspr
-DISTVERSION=    4.10.1
+DISTVERSION=    4.10.2
  CATEGORIES=    devel
  MASTER_SITES=    MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src


Modified: trunk/devel/nspr/distinfo
==============================================================================

--- trunk/devel/nspr/distinfo    Sat Nov 16 08:46:46 2013    (r1390)
+++ trunk/devel/nspr/distinfo    Sun Nov 17 12:04:46 2013    (r1391)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.1.tar.gz) =
0c2f8dc265f1e9b2600fd519430a1f960799888857bbb1538343a1b16ba41b20
-SIZE (nspr-4.10.1.tar.gz) = 1102858
+SHA256 (nspr-4.10.2.tar.gz) =
4d09ee67a6fb57d3c646098b0ac7fd1e31be1c2c2ca57cd2ad28b42e6d3cf400
+SIZE (nspr-4.10.2.tar.gz) = 1103130

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================

--- trunk/security/ca_root_nss/Makefile    Sat Nov 16 08:46:46 2013
(r1390)
+++ trunk/security/ca_root_nss/Makefile    Sun Nov 17 12:04:46 2013
(r1391)
@@ -25,7 +25,7 @@
  # !!!  Please DO NOT submit patches for new version until it has !!!
  # !!!  been committed there first.                               !!!
  # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=    3.15.2
+VERSION_NSS=    3.15.3
  #NSS_SUFFIX=    .with.ckbi.1.93
  CERTDATA_TXT_PATH=
nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
  BUNDLE_PROCESSOR=    MAca-bundle.pl

Modified: trunk/security/ca_root_nss/distinfo
==============================================================================

--- trunk/security/ca_root_nss/distinfo    Sat Nov 16 08:46:46 2013
(r1390)
+++ trunk/security/ca_root_nss/distinfo    Sun Nov 17 12:04:46 2013
(r1391)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.15.2.tar.gz) =
7b2c80d18c49581edbdb509cbf7afd61d8c53658f2a38ff20e224c1909faeddc
-SIZE (nss-3.15.2.tar.gz) = 6288669
+SHA256 (nss-3.15.3.tar.gz) =
ec5f01f7d9f42cf8ad3f95c7f8921bde583df9297c83dc9062930462e3717a18
+SIZE (nss-3.15.3.tar.gz) = 6288990

Modified: trunk/security/nss/Makefile
==============================================================================

--- trunk/security/nss/Makefile    Sat Nov 16 08:46:46 2013    (r1390)
+++ trunk/security/nss/Makefile    Sun Nov 17 12:04:46 2013    (r1391)
@@ -2,7 +2,7 @@
  # $FreeBSD: head/security/nss/Makefile 331529 2013-10-24 20:10:51Z
flo $

  PORTNAME=    nss
-PORTVERSION=    3.15.2
+PORTVERSION=    3.15.3
  #DISTVERSIONSUFFIX=    .with.ckbi.1.93
  CATEGORIES=    security
  MASTER_SITES=
MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src

Modified: trunk/security/nss/distinfo
==============================================================================

--- trunk/security/nss/distinfo    Sat Nov 16 08:46:46 2013    (r1390)
+++ trunk/security/nss/distinfo    Sun Nov 17 12:04:46 2013    (r1391)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.15.2.tar.gz) =
7b2c80d18c49581edbdb509cbf7afd61d8c53658f2a38ff20e224c1909faeddc
-SIZE (nss-3.15.2.tar.gz) = 6288669
+SHA256 (nss-3.15.3.tar.gz) =
ec5f01f7d9f42cf8ad3f95c7f8921bde583df9297c83dc9062930462e3717a18
+SIZE (nss-3.15.3.tar.gz) = 6288990
...

--->  Building '/usr/ports/security/nss'
===>  Cleaning for nss-3.15.3
===>  Found saved configuration for nss-3.12.4_1
===> Fetching all distfiles required by nss-3.15.3 for building
===>  Extracting for nss-3.15.3
=> SHA256 Checksum OK for nss-3.15.3.tar.gz.
===>  Patching for nss-3.15.3
===>  Applying FreeBSD patches for nss-3.15.3
6 out of 6 hunks failed--saving rejects to lib/pkcs7/p7decode.c.rej
=> Patch patch-bug834091 failed to apply cleanly.
=> Patch(es) patch-bug301986 applied cleanly.
*** [do-patch] Error code 1

Stop in /mnt/mod_usr/head/security/nss.

it seems that lib/pkcs7/p7decode.c already patched in mainstream, so after cleaning up files/patch-bug301986 from any mention of p7decode.c it successfully built

--
SY, Marat

smime.p7s
Description: S/MIME Cryptographic Signature