October 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Remove nss *.chk files
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 37d39c9b00c4e4c341a6f614a88834e3b59416a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 20:48:56 2015 +0200 Remove nss *.chk files --- projects/tor-messenger/build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index d3d4c9b..94dba3b 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -15,6 +15,12 @@ mkdir bundle/Messenger tar xf [% c('input_files_by_name/instantbird') %] -C bundle/Messenger --strip 1 [% END -%] +[% IF c("var/linux") -%] +# remove non reproducible files (FIPS-140) +# Tor Browser removes them too +rm -f bundle/Messenger/*.chk +[% END -%] + mkdir bundle/Messenger/TorMessenger tar xf [% c('input_files_by_name/bundle-data') %] -C bundle/Messenger/TorMessenger

1 0

[gettor/master] Update AUTHORS file; Sukhbir is no longer core developer
by sukhbir＠torproject.org 16 Oct '15

16 Oct '15

commit 3a1963064933e35ac3e25cab3e0964951c778778 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Oct 16 14:10:58 2015 -0400 Update AUTHORS file; Sukhbir is no longer core developer --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index d118105..6e3edb0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,5 @@ Current maintainer/core developers: Israel Leiva <ilv(a)riseup.net> 4096R/540BFC0E - Sukhbir Sing <sukhbir(a)torproject.org> 4096R/B297B391 Past core developers: Jacob Appelbaum <jacob(a)appelbaum.net> @@ -11,3 +10,4 @@ Contributors: Runa A. Sandvik <runa(a)torproject.org> Nima Fatemi <nima(a)torproject.org> Poly <poly(a)darkdepths.net> + Sukhbir Singh <sukhbir(a)torproject.org> 4096R/B297B391

1 0

[tor-messenger-build/master] Remove __DATE__ and __TIME__ references from NSS
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit e4bfbaece05f5bcebb48302bfa995828c2e63ead Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 18:52:55 2015 +0200 Remove __DATE__ and __TIME__ references from NSS --- ...8ea23862252b-remove__DATE__and__TIME__.nsspatch | 345 ++++++++++++++++++++ projects/instantbird/build | 10 + projects/instantbird/config | 1 + 3 files changed, 356 insertions(+) diff --git a/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch b/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch new file mode 100644 index 0000000..e601b2d --- /dev/null +++ b/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch @@ -0,0 +1,345 @@ +# HG changeset patch +# User Mike Hommey <mh+mozilla(a)glandium.org> +# Date 1436438559 -7200 +# Thu Jul 09 12:42:39 2015 +0200 +# Node ID 8ea23862252b009f097807267f43248a820f673e +# Parent cac90b6155c9f140f63a75d38c7d7da8d2d6ca55 +Bug 1169174, Remove __DATE__ and __TIME__ references from NSS, r=rrelyea + +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/builtins/binst.c +--- a/lib/ckfw/builtins/binst.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/ckfw/builtins/binst.c Thu Jul 09 12:42:39 2015 +0200 +@@ -65,11 +65,10 @@ + NSSCKFWInstance *fwInstance + ) + { +- extern const char __nss_builtins_rcsid[]; +- extern const char __nss_builtins_sccsid[]; ++ extern const char __nss_builtins_version[]; + volatile char c; /* force a reference that won't get optimized away */ + +- c = __nss_builtins_rcsid[0] + __nss_builtins_sccsid[0]; ++ c = __nss_builtins_version[0]; + return nss_builtins_LibraryVersion; + } + +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/builtins/ckbiver.c +--- a/lib/ckfw/builtins/ckbiver.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/ckfw/builtins/ckbiver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,14 +13,7 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_builtins_rcsid[] = "$Header: NSS Builtin Trusted Root CAs " +- NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_builtins_sccsid[] = "@(#)NSS Builtin Trusted Root CAs " +- NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_builtins_version[] = "Version: NSS Builtin Trusted Root CAs " ++ NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/capi/ckcapiver.c +--- a/lib/ckfw/capi/ckcapiver.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/ckfw/capi/ckcapiver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -12,14 +12,7 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_ckcapi_rcsid[] = "$Header: NSS Access to Microsoft Certificate Store " +- NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_ckcapi_sccsid[] = "@(#)NSS Access to Microsoft Certificate Store " +- NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_ckcapi_version[] = "Version: NSS Access to Microsoft Certificate Store " ++ NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/nssmkey/ckmkver.c +--- a/lib/ckfw/nssmkey/ckmkver.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/ckfw/nssmkey/ckmkver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -12,14 +12,7 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_ckmk_rcsid[] = "$Header: NSS Access to the MAC OS X Key Ring " +- NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_ckmk_sccsid[] = "@(#)NSS Access to the MAC OS X Key Ring " +- NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_ckmk_version[] = "Version: NSS Access to the MAC OS X Key Ring " ++ NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/freebl/freeblver.c +--- a/lib/freebl/freeblver.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/freebl/freeblver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,12 +13,6 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_freebl_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_freebl_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_freebl_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/freebl/ldvector.c +--- a/lib/freebl/ldvector.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/freebl/ldvector.c Thu Jul 09 12:42:39 2015 +0200 +@@ -294,13 +294,12 @@ + const FREEBLVector * + FREEBL_GetVector(void) + { +- extern const char __nss_freebl_rcsid[]; +- extern const char __nss_freebl_sccsid[]; ++ extern const char __nss_freebl_version[]; + + /* force a reference that won't get optimized away */ + volatile char c; + +- c = __nss_freebl_rcsid[0] + __nss_freebl_sccsid[0]; ++ c = __nss_freebl_version[0]; + #ifdef FREEBL_NO_DEPEND + FREEBL_InitStubs(); + #endif +diff -r cac90b6155c9 -r 8ea23862252b lib/nss/nssinit.c +--- a/lib/nss/nssinit.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/nss/nssinit.c Thu Jul 09 12:42:39 2015 +0200 +@@ -1230,8 +1230,7 @@ + } + + +-extern const char __nss_base_rcsid[]; +-extern const char __nss_base_sccsid[]; ++extern const char __nss_base_version[]; + + PRBool + NSS_VersionCheck(const char *importedVersion) +@@ -1249,7 +1248,7 @@ + const char *ptr = importedVersion; + volatile char c; /* force a reference that won't get optimized away */ + +- c = __nss_base_rcsid[0] + __nss_base_sccsid[0]; ++ c = __nss_base_version[0]; + + while (isdigit(*ptr)) { + vmajor = 10 * vmajor + *ptr - '0'; +diff -r cac90b6155c9 -r 8ea23862252b lib/nss/nssver.c +--- a/lib/nss/nssver.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/nss/nssver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,12 +13,6 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_base_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_base_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_base_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/smime/smimeutil.c +--- a/lib/smime/smimeutil.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/smime/smimeutil.c Thu Jul 09 12:42:39 2015 +0200 +@@ -754,8 +754,7 @@ + return cert; + } + +-extern const char __nss_smime_rcsid[]; +-extern const char __nss_smime_sccsid[]; ++extern const char __nss_smime_version[]; + + PRBool + NSSSMIME_VersionCheck(const char *importedVersion) +@@ -771,7 +770,7 @@ + */ + volatile char c; /* force a reference that won't get optimized away */ + +- c = __nss_smime_rcsid[0] + __nss_smime_sccsid[0]; ++ c = __nss_smime_version[0]; + + return NSS_VersionCheck(importedVersion); + } +diff -r cac90b6155c9 -r 8ea23862252b lib/smime/smimever.c +--- a/lib/smime/smimever.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/smime/smimever.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,12 +13,6 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_smime_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_smime_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_smime_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/softoken/legacydb/lginit.c +--- a/lib/softoken/legacydb/lginit.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/softoken/legacydb/lginit.c Thu Jul 09 12:42:39 2015 +0200 +@@ -22,15 +22,9 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_dbm_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_dbm_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_dbm_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING; + + typedef struct LGPrivateStr { + NSSLOWCERTCertDBHandle *certDB; +@@ -595,7 +589,7 @@ + PRBool readOnly = (flags == SDB_RDONLY)? PR_TRUE: PR_FALSE; + volatile char c; /* force a reference that won't get optimized away */ + +- c = __nss_dbm_rcsid[0] + __nss_dbm_sccsid[0]; ++ c = __nss_dbm_version[0]; + + rv = SECOID_Init(); + if (SECSuccess != rv) { +diff -r cac90b6155c9 -r 8ea23862252b lib/softoken/pkcs11.c +--- a/lib/softoken/pkcs11.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/softoken/pkcs11.c Thu Jul 09 12:42:39 2015 +0200 +@@ -3135,8 +3135,7 @@ + return crv; + } + +-extern const char __nss_softokn_rcsid[]; +-extern const char __nss_softokn_sccsid[]; ++extern const char __nss_softokn_version[]; + + /* NSC_GetInfo returns general information about Cryptoki. */ + CK_RV NSC_GetInfo(CK_INFO_PTR pInfo) +@@ -3145,7 +3144,7 @@ + + CHECK_FORK(); + +- c = __nss_softokn_rcsid[0] + __nss_softokn_sccsid[0]; ++ c = __nss_softokn_version[0]; + pInfo->cryptokiVersion.major = 2; + pInfo->cryptokiVersion.minor = 20; + PORT_Memcpy(pInfo->manufacturerID,manufacturerID,32); +diff -r cac90b6155c9 -r 8ea23862252b lib/softoken/softkver.c +--- a/lib/softoken/softkver.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/softoken/softkver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,12 +13,6 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_softokn_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_softokn_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_softokn_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/ssl/sslcon.c +--- a/lib/ssl/sslcon.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/ssl/sslcon.c Thu Jul 09 12:42:39 2015 +0200 +@@ -3669,8 +3669,7 @@ + */ + + #include "nss.h" +-extern const char __nss_ssl_rcsid[]; +-extern const char __nss_ssl_sccsid[]; ++extern const char __nss_ssl_version[]; + + PRBool + NSSSSL_VersionCheck(const char *importedVersion) +@@ -3686,7 +3685,7 @@ + */ + volatile char c; /* force a reference that won't get optimized away */ + +- c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0]; ++ c = __nss_ssl_version[0]; + return NSS_VersionCheck(importedVersion); + } + +diff -r cac90b6155c9 -r 8ea23862252b lib/ssl/sslver.c +--- a/lib/ssl/sslver.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/ssl/sslver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,12 +13,6 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_ssl_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_ssl_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_ssl_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/util/secoid.c +--- a/lib/util/secoid.c Thu May 28 15:34:09 2015 -0700 ++++ b/lib/util/secoid.c Thu Jul 09 12:42:39 2015 +0200 +@@ -20,15 +20,9 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_util_rcsid[] = "$Header: NSS " NSSUTIL_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__ " $"; +-const char __nss_util_sccsid[] = "@(#)NSS " NSSUTIL_VERSION _DEBUG_STRING +- " " __DATE__ " " __TIME__; ++const char __nss_util_version[] = "Version: NSS " NSSUTIL_VERSION _DEBUG_STRING; + + /* MISSI Mosaic Object ID space */ + /* USGov algorithm OID space: { 2 16 840 1 101 } */ +@@ -1921,7 +1915,7 @@ + char * envVal; + volatile char c; /* force a reference that won't get optimized away */ + +- c = __nss_util_rcsid[0] + __nss_util_sccsid[0]; ++ c = __nss_util_version[0]; + + if (oidhash) { + return SECSuccess; /* already initialized */ diff --git a/projects/instantbird/build b/projects/instantbird/build index 5d91c50..e5820fa 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -79,6 +79,16 @@ then patch -p1 < $patch done fi + +if ls -1 $rootdir/*.nsspatch > /dev/null 2>&1 +then + cd security/nss + for patch in $(ls -1 $rootdir/*.nsspatch | sort) + do + patch -p1 < $patch + done + cd ../.. +fi cd .. cp $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig diff --git a/projects/instantbird/config b/projects/instantbird/config index 3524cd9..7f1e0fd 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -88,6 +88,7 @@ input_files: - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch - filename: ifdef-performance-toolkit-xpt.patch + - filename: 8ea23862252b-remove__DATE__and__TIME__.nsspatch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png - filename: branding/blistWindow48.png

1 0

[tor-messenger-build/master] libgpg-error: update to version 1.20
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit dab1bdda68c9bda3020e148d0ae9bebd07f793d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 17:30:23 2015 +0200 libgpg-error: update to version 1.20 --- projects/libgpg-error/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index 036ba8c..62978bf 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.16 +version: 1.20 remote_docker: 1 lsb_release: id: Ubuntu

1 0

[tor-messenger-build/master] libgcrypt: build from a non-random directory
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 5bc60f1b33248fd66d772f9608cea5a0415342ca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 19:36:25 2015 +0200 libgcrypt: build from a non-random directory --- projects/libgcrypt/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 640c99e..9b9506f 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -6,11 +6,11 @@ mkdir -p /var/tmp/dist cd /var/tmp/dist tar xf $rootdir/[% c('input_files_by_name/libgpg-error') %] export PATH="/var/tmp/dist/libgpg-error/bin:$PATH" -cd $rootdir distdir=/var/tmp/dist/[% project %] mkdir -p $distdir -tar xf [% project %]-[% c('version') %].tar.bz2 -cd [% project %]-[% c('version') %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 +cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] # our compiler does not like -g sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure

1 0

[tor-messenger-build/master] keyring/libgcrypt.gpg: add key 031E C253 6E58 0D8E A286 A9F2 2071 B08A 33BD 3F06
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit e987a153ca6d5f402e04ea8fb5a52f89791e5393 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 18:08:57 2015 +0200 keyring/libgcrypt.gpg: add key 031E C253 6E58 0D8E A286 A9F2 2071 B08A 33BD 3F06 --- keyring/libgcrypt.gpg | Bin 1355 -> 2574 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/libgcrypt.gpg b/keyring/libgcrypt.gpg index 5334158..41c8361 100644 Binary files a/keyring/libgcrypt.gpg and b/keyring/libgcrypt.gpg differ

1 0

[tor-messenger-build/master] libgcrypt: update to version 1.6.4
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit f47ae824bdc20efb4b9ec5f6107cdccb38d7ccd6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 19:34:37 2015 +0200 libgcrypt: update to version 1.6.4 --- projects/libgcrypt/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 90c5ab7..25d3c8e 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.6.2 +version: 1.6.4 remote_docker: 1 lsb_release: id: Ubuntu @@ -29,7 +29,7 @@ targets: release: 12.04 codename: precise input_files: - - URL: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2 + - URL: 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-[% c("version") %].tar.bz2' sig_ext: sig file_gpg_id: 1 gpg_keyring: libgcrypt.gpg

1 0

[tor-messenger-build/master] libgpg-error: build from a non-random directory
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit a22d3a05e619796865fa545ee8ff1fecc91184a6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 18:00:41 2015 +0200 libgpg-error: build from a non-random directory --- projects/libgpg-error/build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 3d3749b..8768dc7 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -1,12 +1,14 @@ #!/bin/sh set -e +rootdir=$(pwd) distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -tar xf [% project %]-[% c('version') %].tar.bz2 -cd [% project %]-[% c('version') %] +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 +cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] -cp ../lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h +cp $rootdir/lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] ./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %]

1 0

[tor-messenger-build/master] libotr: build from a non-random directory
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 8135de9a75ef132702b97839889ac77bd019c87b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 20:00:10 2015 +0200 libotr: build from a non-random directory --- projects/libotr/build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/libotr/build b/projects/libotr/build index ecd94ee..3aa8443 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -10,9 +10,10 @@ tar xf $rootdir/[% c('input_files_by_name/libgcrypt') %] export PATH="/var/tmp/dist/libgcrypt/bin:$PATH" cd $rootdir distdir=/var/tmp/dist/[% project %] -tar xf libotr-[% c('version') %].tar.gz -cd libotr-[% c('version') %] -patch -p1 < ../bugs-otr-im-72.patch +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf libotr-[% c('version') %].tar.gz +cd /var/tmp/build/libotr-[% c('version') %] +patch -p1 < $rootdir/bugs-otr-im-72.patch ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] make prefix=$distdir install

1 0

[tor-messenger-build/master] libgcrypt: remove build timestamp
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 7be4daacef65c17c96c5eb861d502a25d3b57997 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 19:37:55 2015 +0200 libgcrypt: remove build timestamp --- projects/libgcrypt/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 9b9506f..37f4a0a 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -15,6 +15,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # our compiler does not like -g sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure [% END -%] +sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+0000/' configure ./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] make -j4 make prefix=$distdir install

1 0