Date: Thu, 05 Dec 2013 16:13:47 +0400 From: "Marat N.Afanasyev" <amarat@ksu.ru> To: freebsd-gecko@freebsd.org Subject: 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 Message-ID: <52A06DFB.3080904@ksu.ru> In-Reply-To: <52A050F3.2050002@ksu.ru> References: <201311171204.rAHC4kbs079408@trillian.chruetertee.ch> <52A050F3.2050002@ksu.ru>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
Marat N.Afanasyev wrote:
> svn-freebsd-gecko@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
[-- Attachment #2 --]
0 *H
01 0 + 0 *H
l000m0
*H
01 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0
130828212720Z
140830023051Z0Q10U
9R33uEH60KZSGvdA10U
amarat@ksu.ru1 0 *H
amarat@ksu.ru0"0
*H
0
tKL;cJ({`)r-M3$5qdTpzg^!|m@hgL~txGϡ])N`1mhlMV:r#5F=fժ*1?Gt`Xk&}>U4k|_7 RxW6R<
~fod"-G`GQFX} (/L(^@)=Vg PgLPk5p: 00 U 0 0 U 0 U %0++0 U gk= l]`y[fV0 U #0Sr풜\|~5NԸQ0U 0
amarat@ksu.ru0LU C0?0; +70*0.+"http://www.startssl.com/policy.pdf0+00' StartCom Certification Authority0This certificate was issued according to the Class 1 Validation requirements of the StartCom CA policy, reliance only for the intended purpose in compliance of the relying party obligations.06U /0-0+)'%http://crl.startssl.com/crtu1-crl.crl0+009+0-http://ocsp.startssl.com/sub/class1/client/ca0B+06http://aia.startssl.com/certs/sub.class1.client.ca.crt0#U 0http://www.startssl.com/0
*H
[90k9]I)#Ȫ̫*6xZ_Y؍nXfYbzuO(9 ӻ`
'Q DL2>C` nl }^o<Ka.u_iص7){@ٺ BJTV1n8Q(~pG<* ;ֿJKq(gdnRv^.1awE3*J`6tPbD z%$ֶ040 0
*H
0}1 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1)0'U StartCom Certification Authority0
071024210155Z
171024210155Z01 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0"0
*H
0
-).2AUGo#G
B|NDRpM-B=o -we5JQpa>O.#._<V
[~**pz~3WG .ᘟMlr[<Ce6fqO"uxfWN#uicgkv$Lb%y`_{`xK'GN 00U 00U 0 U Sr풜\|~5NԸQ0 U #0N @[i04hCA0f+Z0X0'+0http://ocsp.startssl.com/ca0-+0!http://www.startssl.com/sfsca.crt0[U T0R0'%#!http://www.startssl.com/sfsca.crl0'%#!http://crl.startssl.com/sfsca.crl0U y0w0u +70f0.+"http://www.startssl.com/policy.pdf04+(http://www.startssl.com/intermediate.pdf0
*H
}x,\c^ #wMq}>UK/^yX֏y frMIŲB61ymQҨݬZ0& ;@#13qۑ& ̢o 6r_;GO>*I( 74XS1r3)!LJy6Kotˆ#
_wSr
;B
ADp(fs 䰷6%.W0J3:bC<8t X1<Cn=t==wST~\wkBf|15zUP)(IjVB!OfI=bb\4-*em/нSJm7N[]'@ڽ D9Kr>R7/|o^I@ټ'Pa $ z9a'L)(
I}vcH]۸D*W}
m>Q|C.(,lQ10001 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CAm0 + 0 *H
1 *H
0 *H
1
131205121347Z0# *H
1k k> XA U0l *H
1_0]0 `He*0 `He0
*H
0*H
0
*H
@0+0
*H
(0 +71001 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CAm0 *H
101 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CAm0
*H
+> )5 Of:.q0!((EOc XXVK߽y{9<#&OR {@⅞׳*aY;s[
=v G+!j4=ﳈz9mƾOF;k[e**&j=4HPaX5k*"?KwZMԯj5 ܼº0x W!dbfTbm`J;$]HIkwN!#IZ=
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52A06DFB.3080904>