January 2018 - tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 18691: switch Windows builds from precise to jessie
by gk＠torproject.org 17 Jan '18

17 Jan '18

commit d6eb63ecc91d3227fce195af5e003c9928958e9f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 10 13:22:31 2018 +0100 Bug 18691: switch Windows builds from precise to jessie --- projects/argparse/build | 4 +- projects/argparse/config | 3 +- projects/binutils/build | 2 + projects/binutils/config | 2 + projects/binutils/fix-warning-bfd.patch | 186 ++++++++++++++++++++++++++++++++ projects/fteproxy/build | 2 +- projects/fteproxy/config | 3 +- projects/libfte/build | 4 +- projects/libfte/config | 2 +- projects/obfsproxy/build | 4 +- projects/obfsproxy/config | 3 +- projects/parsley/build | 4 +- projects/parsley/config | 3 +- projects/pycrypto/build | 2 +- projects/pycrypto/config | 2 +- projects/pyptlib/build | 2 +- projects/pyptlib/config | 3 +- projects/pyyaml/build | 4 +- projects/pyyaml/config | 3 +- projects/twisted/build | 4 +- projects/twisted/config | 2 +- projects/txsocksx/build | 4 +- projects/txsocksx/config | 3 +- projects/winpython/build | 4 +- projects/winpython/config | 4 +- projects/zope.interface/build | 4 +- projects/zope.interface/config | 2 +- rbm.conf | 32 +----- 28 files changed, 234 insertions(+), 63 deletions(-) diff --git a/projects/argparse/build b/projects/argparse/build index 29e4221..3d5b424 100644 --- a/projects/argparse/build +++ b/projects/argparse/build @@ -13,8 +13,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] python2 setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ diff --git a/projects/argparse/config b/projects/argparse/config index c4d9dec..730a4f1 100644 --- a/projects/argparse/config +++ b/projects/argparse/config @@ -15,7 +15,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/binutils/build b/projects/binutils/build index aa0d752..ee6db1a 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -25,6 +25,8 @@ cd [% project %]-[% c("version") %] patch -p1 < ../peXXigen.patch # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch + # fix "right-hand operand of comma expression has no effect" warning + patch -p1 < ../fix-warning-bfd.patch [% END -%] [% IF c('var/windows-x86_64') -%] patch -p1 < ../64bit-fixups.patch diff --git a/projects/binutils/config b/projects/binutils/config index 25417c0..5c35588 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -19,6 +19,8 @@ input_files: - project: container-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' + - filename: fix-warning-bfd.patch + enable: '[% c("var/windows") %]' - filename: 64bit-fixups.patch enable: '[% c("var/windows-x86_64") %]' - filename: peXXigen.patch diff --git a/projects/binutils/fix-warning-bfd.patch b/projects/binutils/fix-warning-bfd.patch new file mode 100644 index 0000000..fa04405 --- /dev/null +++ b/projects/binutils/fix-warning-bfd.patch @@ -0,0 +1,186 @@ +From 27b829ee701e29804216b3803fbaeb629be27491 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc(a)redhat.com> +Date: Wed, 29 Jan 2014 13:46:39 +0000 +Subject: [PATCH] Following up on Tom's suggestion I am checking in a patch to + replace the various bfd_xxx_set macros with static inline functions, so that + we can avoid compile time warnings about comma expressions with unused + values. + + * bfd-in.h (bfd_set_section_vma): Delete. + (bfd_set_section_alignment): Delete. + (bfd_set_section_userdata): Delete. + (bfd_set_cacheable): Delete. + * bfd.c (bfd_set_cacheable): New static inline function. + * section.c (bfd_set_section_userdata): Likewise. + (bfd_set_section_vma): Likewise. + (bfd_set_section_alignment): Likewise. + * bfd-in2.h: Regenerate. +--- + bfd/bfd-in.h | 5 ----- + bfd/bfd-in2.h | 41 +++++++++++++++++++++++++++++++++++------ + bfd/bfd.c | 8 ++++++++ + bfd/section.c | 26 ++++++++++++++++++++++++++ + 5 files changed, 81 insertions(+), 11 deletions(-) + +diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h +index 3afd71b..c7c5a7d 100644 +--- a/bfd/bfd-in.h ++++ b/bfd/bfd-in.h +@@ -292,9 +292,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -517,8 +514,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 71996db..b5aeb40 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -299,9 +299,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -524,8 +521,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +@@ -1029,7 +1024,7 @@ bfd *bfd_openr (const char *filename, const char *target); + + bfd *bfd_fdopenr (const char *filename, const char *target, int fd); + +-bfd *bfd_openstreamr (const char *, const char *, void *); ++bfd *bfd_openstreamr (const char * filename, const char * target, void * stream); + + bfd *bfd_openr_iovec (const char *filename, const char *target, + void *(*open_func) (struct bfd *nbfd, +@@ -1596,6 +1591,32 @@ struct relax_table { + int size; + }; + ++/* Note: the following are provided as inline functions rather than macros ++ because not all callers use the return value. A macro implementation ++ would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++ compilers will complain about comma expressions that have no effect. */ ++static inline bfd_boolean ++bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++{ ++ ptr->userdata = val; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++{ ++ ptr->vma = ptr->lma = val; ++ ptr->user_set_vma = TRUE; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++{ ++ ptr->alignment_power = val; ++ return TRUE; ++} ++ + /* These sections are global, and are managed by BFD. The application + and target back end are not permitted to change the values in + these sections. */ +@@ -6415,6 +6436,14 @@ struct bfd + unsigned int selective_search : 1; + }; + ++/* See note beside bfd_set_section_userdata. */ ++static inline bfd_boolean ++bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++{ ++ abfd->cacheable = val; ++ return TRUE; ++} ++ + typedef enum bfd_error + { + bfd_error_no_error = 0, +diff --git a/bfd/bfd.c b/bfd/bfd.c +index 8d0580c..2d174f3 100644 +--- a/bfd/bfd.c ++++ b/bfd/bfd.c +@@ -311,6 +311,14 @@ CODE_FRAGMENT + . unsigned int selective_search : 1; + .}; + . ++.{* See note beside bfd_set_section_userdata. *} ++.static inline bfd_boolean ++.bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++.{ ++. abfd->cacheable = val; ++. return TRUE; ++.} ++. + */ + + #include "sysdep.h" +diff --git a/bfd/section.c b/bfd/section.c +index fb19d8c..a661228 100644 +--- a/bfd/section.c ++++ b/bfd/section.c +@@ -542,6 +542,32 @@ CODE_FRAGMENT + . int size; + .}; + . ++.{* Note: the following are provided as inline functions rather than macros ++. because not all callers use the return value. A macro implementation ++. would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++. compilers will complain about comma expressions that have no effect. *} ++.static inline bfd_boolean ++.bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++.{ ++. ptr->userdata = val; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++.{ ++. ptr->vma = ptr->lma = val; ++. ptr->user_set_vma = TRUE; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++.{ ++. ptr->alignment_power = val; ++. return TRUE; ++.} ++. + .{* These sections are global, and are managed by BFD. The application + . and target back end are not permitted to change the values in + . these sections. *} +-- +2.1.4 + diff --git a/projects/fteproxy/build b/projects/fteproxy/build index 0d9baf1..310c9a5 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -12,7 +12,7 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" $PYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ diff --git a/projects/fteproxy/config b/projects/fteproxy/config index 6a13e0d..d58095e 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -18,7 +18,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/libfte/build b/projects/libfte/build index 62c8fce..9493f30 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -16,12 +16,12 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] pydir=$distdir/python export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" export LD_PRELOAD= - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" # FTE only needs libgmp-10.dll and no libgmpxx anymore. cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll . cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll $distdir/TorBrowser/Tor/ WINDOWS_BUILD=1 CROSS_COMPILE=1 make - $PYTHON setup.py install --prefix=$(winepath -w "$pydir") + $PYTHON setup.py install --prefix=$(wine winepath -w "$pydir") $PYTHON setup.py install [% ELSE -%] export PYTHON=python2 diff --git a/projects/libfte/config b/projects/libfte/config index 4c34116..3b33cf6 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -17,8 +17,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: + - wine - faketime input_files: diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build index 9d64aa9..2c87e95 100644 --- a/projects/obfsproxy/build +++ b/projects/obfsproxy/build @@ -21,9 +21,9 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" $PYTHON setup_py2exe.py py2exe - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/ # http://bugs.winehq.org/show_bug.cgi?id=3591 diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config index 9134de1..9286c61 100644 --- a/projects/obfsproxy/config +++ b/projects/obfsproxy/config @@ -20,7 +20,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/parsley/build b/projects/parsley/build index 1d52f9a..7b6e632 100644 --- a/projects/parsley/build +++ b/projects/parsley/build @@ -13,8 +13,8 @@ cd /var/tmp/build/Parsley-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/parsley/config b/projects/parsley/config index b788899..f305822 100644 --- a/projects/parsley/config +++ b/projects/parsley/config @@ -15,7 +15,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/pycrypto/build b/projects/pycrypto/build index 51ec5ce..084939f 100644 --- a/projects/pycrypto/build +++ b/projects/pycrypto/build @@ -27,7 +27,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32 export LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32 - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 ./configure --build=i686-linux-gnu [% c("var/configure_opt") %] diff --git a/projects/pycrypto/config b/projects/pycrypto/config index ca314c8..c55844b 100644 --- a/projects/pycrypto/config +++ b/projects/pycrypto/config @@ -15,9 +15,9 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - faketime + - wine input_files: - project: container-image diff --git a/projects/pyptlib/build b/projects/pyptlib/build index de70c5b..fa6d78d 100644 --- a/projects/pyptlib/build +++ b/projects/pyptlib/build @@ -14,7 +14,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p "$pydir" - $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/pyptlib/config b/projects/pyptlib/config index 7ae1d68..36a6037 100644 --- a/projects/pyptlib/config +++ b/projects/pyptlib/config @@ -19,7 +19,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/pyyaml/build b/projects/pyyaml/build index d3d60d7..72dc553 100644 --- a/projects/pyyaml/build +++ b/projects/pyyaml/build @@ -13,8 +13,8 @@ cd /var/tmp/build/PyYAML-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/pyyaml/config b/projects/pyyaml/config index 8d43bf6..f2b928e 100644 --- a/projects/pyyaml/config +++ b/projects/pyyaml/config @@ -15,7 +15,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/twisted/build b/projects/twisted/build index 0d9154f..077143c 100644 --- a/projects/twisted/build +++ b/projects/twisted/build @@ -24,8 +24,8 @@ cd /var/tmp/build/Twisted-[% c('version') %] # the -c option, so we set the compiler in a configuration file. echo $'[build_ext]\ncompiler=mingw32' > setup.cfg mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/twisted/config b/projects/twisted/config index 2f35166..4dbbb26 100644 --- a/projects/twisted/config +++ b/projects/twisted/config @@ -15,10 +15,10 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - p7zip-full - faketime + - wine input_files: - project: container-image diff --git a/projects/txsocksx/build b/projects/txsocksx/build index 31d7b18..3491d11 100644 --- a/projects/txsocksx/build +++ b/projects/txsocksx/build @@ -18,8 +18,8 @@ mkdir vcversioner-1.14.1.1-py2.7.egg [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install_lib --install-dir=$(winepath -w "$pydir/Lib/site-packages") + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install_lib --install-dir=$(wine winepath -w "$pydir/Lib/site-packages") [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/txsocksx/config b/projects/txsocksx/config index 18fc4a8..061af53 100644 --- a/projects/txsocksx/config +++ b/projects/txsocksx/config @@ -17,7 +17,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/winpython/build b/projects/winpython/build index 5f53b9c..db78a0f 100644 --- a/projects/winpython/build +++ b/projects/winpython/build @@ -5,8 +5,8 @@ set -e distdir="/var/tmp/dist/[% project %]" mkdir -p $distdir WINEROOT=$HOME/.wine/drive_c -wineboot -i -msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir +wine wineboot -i +wine msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $distdir/Lib/distutils/cygwinccompiler.py tar xf setuptools-*.tar.gz rm setuptools-*.tar.gz diff --git a/projects/winpython/config b/projects/winpython/config index dcd21f6..9f884c0 100644 --- a/projects/winpython/config +++ b/projects/winpython/config @@ -4,10 +4,10 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: compiler: mingw-w64 - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - p7zip-full - faketime + - wine container: use_container: 1 setup: | @@ -17,7 +17,7 @@ var: export HOME=/var/tmp/home mkdir -p $HOME WINEROOT=$HOME/.wine/drive_c - wineboot -i + wine wineboot -i cp -a /var/tmp/dist/winpython/wineroot/windows/* $WINEROOT/windows/ export PYTHON="wine /var/tmp/dist/winpython/python.exe" diff --git a/projects/zope.interface/build b/projects/zope.interface/build index 29406fb..b126989 100644 --- a/projects/zope.interface/build +++ b/projects/zope.interface/build @@ -15,10 +15,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %] find -type f -print0 | xargs -0 [% c("var/touch") %] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32 - $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) # Must create this file in order for py2exe to find the package. touch $pydir/Lib/site-packages/zope/__init__.py [% ELSE -%] diff --git a/projects/zope.interface/config b/projects/zope.interface/config index 4ae3cff..ffba3df 100644 --- a/projects/zope.interface/config +++ b/projects/zope.interface/config @@ -15,9 +15,9 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - faketime + - wine input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index 95b7447..4b4162c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -194,6 +194,7 @@ targets: osname: windows-x86_64 container: arch: amd64 + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 windows-i686: arch: i686 var: @@ -201,6 +202,7 @@ targets: osname: windows-i686 container: arch: i386 + faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1 setarch: | if test -z "$RBM_SETARCH" then @@ -212,7 +214,7 @@ targets: var: windows: 1 container: - suite: precise + suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' @@ -226,34 +228,6 @@ targets: - libtool - zip - unzip - faketime_path: /usr/lib/faketime/libfaketime.so.1 - install_wine_ppa: | - # Install a Wine new enough to have a fix for - # http://bugs.winehq.org/show_bug.cgi?id=29764; otherwise Python run under - # Wine constantly crashes in _PyVerify_fd, which is called by such common - # operations as io.open and os.fstat (anything involving a file descriptor - # number). Ubuntu's main repository only has wine1.4, and the issue was fixed - # in 1.5.29. - echo 'deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main' >> /etc/apt/sources.list - # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and - # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D…. - apt-key add - << EOF - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v1 - - mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAo - WdS7H+7Y4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxsci - rnag8ShrNM9PtG/vAQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0 - IkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVz - lQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFqaBq75y42wflcD/jLMihWM - zRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0np+iOB6+PDRbyJ8GVgIjpaIbt - l4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCuebWU4bV1w+YBvHFF - qTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+ - =Z9DY - -----END PGP PUBLIC KEY BLOCK----- - EOF - apt-get update - apt-get --no-install-recommends -y install wine torbrowser-osx-x86_64: - osx-x86_64

1 0

[tor-browser-build/master] Bug 24756: Add noisebridge01 obfs4 bridge configuration
by gk＠torproject.org 17 Jan '18

17 Jan '18

commit ccf20f2ccb106dbe1fa44b1e569bba9ce3682ddf Author: Patrick O'Doherty <p(a)trickod.com> Date: Sun Jan 14 12:41:40 2018 -0800 Bug 24756: Add noisebridge01 obfs4 bridge configuration --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 258586f..a3f5326 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,6 +39,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.240.34:4003 pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Bug 24912: Don't build the macOS sandbox in the stable series
by gk＠torproject.org 17 Jan '18

17 Jan '18

commit 62f2dced863d2dfcd5076c101bda0f4c9c10d508 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 16 15:09:41 2018 +0000 Bug 24912: Don't build the macOS sandbox in the stable series --- projects/tor-browser/build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index bfa250a..59fbda5 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -106,13 +106,14 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac - # Install a "tor" shim that sets the working directory. See #10030. mv $TBDIR/$TORBINPATH/tor $TBDIR/$TORBINPATH/tor.real cp Bundle-Data/mac-tor.sh $TBDIR/$TORCONFIGPATH/tor - SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" - mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER" + [% IF ! c("var/release") -%] + SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" + mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER" + [% END -%] tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %]

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 17 Jan '18

17 Jan '18

commit 467f4e48613819d700b8dde4d2bd0d57940d38cc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 17 04:16:52 2018 +0000 Update translations for tor-launcher-network-settings --- ja/network-settings.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index f7cea8294..f14590eca 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Torネットワーク設定"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "Tor に接続する"> <!ENTITY torsettings.wizard.title.configure "Tor ネットワーク設定"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "接続を確立しています">  <!ENTITY torlauncher.localePicker.title "Tor ブラウザー言語"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "「接続」をクリックすると Tor に接続します。"> +<!ENTITY torSettings.configurePrompt "Tor による通信を検閲する国（エジプト、中国、トルコ等）にいる場合やプロキシを要求するプライベートネットワークから接続する場合、「設定」をクリックしてネットワーク設定を調整します。"> <!ENTITY torSettings.configure "構成"> <!ENTITY torSettings.connect "接続"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "オプション"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "インターネットに接続するのにプロキシを使用します"> <!ENTITY torsettings.useProxy.type "Proxyの種類:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "プロキシの種類を選択"> <!ENTITY torsettings.useProxy.address "アドレス:"> <!ENTITY torsettings.useProxy.address.placeholder "IPアドレスまたはホストネーム"> <!ENTITY torsettings.useProxy.port "ポート"> @@ -38,17 +38,17 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。"> <!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.placeholder "アドレス:ポートを入力（1行につきひとつ）"> <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "プロキシヘルプ"> +<!ENTITY torsettings.proxyHelp1 "会社、学校、大学等のネットワークを通して接続する場合、ローカルプロクシが必要になります。 もしこの質問にどう答えればよいかわからない場合は、他のブラウザのインターネット設定を見るか、システムのネットワーク設定を確認するかして、プロクシが必要であるかを調べてください。"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 17 Jan '18

17 Jan '18

commit f03a92947bc93df3e1f622233f1825737e43c53f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 17 02:15:59 2018 +0000 Update translations for https_everywhere_completed --- ja/https-everywhere.dtd | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd index 9b3da537c..291f441cd 100644 --- a/ja/https-everywhere.dtd +++ b/ja/https-everywhere.dtd @@ -2,42 +2,22 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "ウェブの暗号化！自動的に多くのサイトにHTTPSセキュリティを使用します。"> <!ENTITY https-everywhere.about.version "バージョン"> -<!ENTITY https-everywhere.about.created_by "作成者:"> -<!ENTITY https-everywhere.about.and "および"> -<!ENTITY https-everywhere.about.librarians "ルール設定ライブラリ"> <!ENTITY https-everywhere.about.add_new_rule "新しいルールの追加"> -<!ENTITY https-everywhere.about.thanks "のおかげで"> -<!ENTITY https-everywhere.about.many_contributors "非常に多くの貢献者、例えば"> -<!ENTITY https-everywhere.about.noscript "また、HTTPS Everywhereの一部はGiogio MaoneなどによるNoScriptからのコードに基づいています。彼らの素晴らしい仕事に感謝しています！"> -<!ENTITY https-everywhere.about.contribute "HTTPS Everywhereが好きなら、検討してください"> -<!ENTITY https-everywhere.about.donate_tor "Torに寄付する"> -<!ENTITY https-everywhere.about.tor_lang_code "英語"> -<!ENTITY https-everywhere.about.or "または"> -<!ENTITY https-everywhere.about.donate_eff "EFFに寄付する"> <!ENTITY https-everywhere.menu.donate_eff_imperative "EFFに寄付する"> -<!ENTITY https-everywhere.menu.about "HTTPS Everywhereについて"> <!ENTITY https-everywhere.menu.observatory "ssl Observatoryの設定"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhereを有効化"> -<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhereを無効化"> <!ENTITY https-everywhere.menu.blockUnencryptedRequests "すべての非暗号化リクエストをブロック"> <!ENTITY https-everywhere.menu.showCounter "カウンターを表示"> <!ENTITY https-everywhere.menu.viewAllRules "すべてのルールを表示"> -<!ENTITY https-everywhere.prefs.title "HTTPS Everywhereの設定"> -<!ENTITY https-everywhere.prefs.enable_all "全て有効化"> -<!ENTITY https-everywhere.prefs.disable_all "全て無効化"> +<!ENTITY https-everywhere.options.generalSettings "一般設定"> +<!ENTITY https-everywhere.options.importSettings "インポートの設定"> +<!ENTITY https-everywhere.options.import "インポート"> +<!ENTITY https-everywhere.options.imported "設定がインポートされました。"> + +<!ENTITY https-everywhere.prefs.export_settings "エクスポートの設定"> <!ENTITY https-everywhere.prefs.reset_defaults "デフォルトにリセット"> -<!ENTITY https-everywhere.prefs.search "検索"> -<!ENTITY https-everywhere.prefs.site "サイト"> -<!ENTITY https-everywhere.prefs.notes "履歴"> -<!ENTITY https-everywhere.prefs.list_caption "どのHTTPSリダイレクトスールを適用しますか？"> -<!ENTITY https-everywhere.prefs.enabled "有効"> -<!ENTITY https-everywhere.prefs.ruleset_howto "自分のルール設定の書き方を学べます (他のウェブサイトへのサポートを追加)"> -<!ENTITY https-everywhere.prefs.here_link "ここ"> -<!ENTITY https-everywhere.prefs.toggle "切り替え"> -<!ENTITY https-everywhere.prefs.reset_default "デフォルトにリセット"> -<!ENTITY https-everywhere.prefs.view_xml_source "XMLソースを表示"> <!ENTITY https-everywhere.chrome.stable_rules "安定版ルール"> <!ENTITY https-everywhere.chrome.stable_rules_description "以下のサイトで暗号化された接続のみを利用する："> @@ -53,5 +33,3 @@ <!ENTITY https-everywhere.chrome.regex "一致する正規表現"> <!ENTITY https-everywhere.chrome.redirect_to "リダイレクト先"> <!ENTITY https-everywhere.chrome.status_cancel_button "キャンセル"> - -

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 17 Jan '18

17 Jan '18

commit d533b1b74a96d7161b969b7449ecafbc96a0c45d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 17 02:15:45 2018 +0000 Update translations for https_everywhere --- ja/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd index 2f0f648f9..291f441cd 100644 --- a/ja/https-everywhere.dtd +++ b/ja/https-everywhere.dtd @@ -11,12 +11,12 @@ <!ENTITY https-everywhere.menu.showCounter "カウンターを表示"> <!ENTITY https-everywhere.menu.viewAllRules "すべてのルールを表示"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.generalSettings "一般設定"> +<!ENTITY https-everywhere.options.importSettings "インポートの設定"> +<!ENTITY https-everywhere.options.import "インポート"> +<!ENTITY https-everywhere.options.imported "設定がインポートされました。"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> +<!ENTITY https-everywhere.prefs.export_settings "エクスポートの設定"> <!ENTITY https-everywhere.prefs.reset_defaults "デフォルトにリセット"> <!ENTITY https-everywhere.chrome.stable_rules "安定版ルール">

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit a4781b30def0377d2cfacd56454d0c031ef24785 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 21:49:38 2018 +0000 Update translations for tor-messenger-prefsdtd --- sq/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/prefs.dtd b/sq/prefs.dtd index 2fd3a5904..9a9ab9688 100644 --- a/sq/prefs.dtd +++ b/sq/prefs.dtd @@ -13,7 +13,7 @@ <!ENTITY prefs.verifyNudge "Gjithmonë kërkoni verifikimin e identitetit të kontaktit tuaj"> <!ENTITY prefs.emptyAccountList " S'ka llogari të konfiguruara"> <!ENTITY prefs.generate "Gjeneroni"> -<!ENTITY prefs.coniksConnection "Connection"> +<!ENTITY prefs.coniksConnection "Lidhje"> <!ENTITY prefs.coniksServerAddress "Server Address"> <!ENTITY prefs.coniksServerPort "Port"> <!ENTITY prefs.coniksAccountPolicy "Account Policy">

1 0

[tor/master] fix a check-changes warning
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 5970836af8868fc3460b04d278169929241ab243 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 14:41:43 2018 -0500 fix a check-changes warning --- changes/bug21074_downgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug21074_downgrade b/changes/bug21074_downgrade index c9f81bd13..33d0b2c61 100644 --- a/changes/bug21074_downgrade +++ b/changes/bug21074_downgrade @@ -1,4 +1,4 @@ - o Minor bugfixes: + o Minor bugfixes (OSX): - Don't exit the Tor process if setrlimit() fails to change the file limit (which can happen sometimes on some versions of OSX). Fixes bug 21074; bugfix on 0.0.9pre5.

1 0

[tor/master] Don't treat a setrlimit failure as fatal.
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 68ca6d2e1971372617f920e71a4a51e16900095e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 4 13:20:37 2018 -0500 Don't treat a setrlimit failure as fatal. Fixes bug 21074; bugfix on 4689243242e2e12 in 0.0.9rc5 when we started doing setrlimit() in the first place. --- changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug21074_downgrade b/changes/bug21074_downgrade new file mode 100644 index 000000000..c9f81bd13 --- /dev/null +++ b/changes/bug21074_downgrade @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Don't exit the Tor process if setrlimit() fails to change the file + limit (which can happen sometimes on some versions of OSX). Fixes + bug 21074; bugfix on 0.0.9pre5. diff --git a/src/common/compat.c b/src/common/compat.c index e16dfb1d2..a88e9b514 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1651,7 +1651,7 @@ get_max_sockets(void) * fail by returning -1 and max_out is untouched. * * If we are unable to set the limit value because of setrlimit() failing, - * return -1 and max_out is set to the current maximum value returned + * return 0 and max_out is set to the current maximum value returned * by getrlimit(). * * Otherwise, return 0 and store the maximum we found inside max_out @@ -1716,13 +1716,14 @@ set_max_file_descriptors(rlim_t limit, int *max_out) rlim.rlim_cur = rlim.rlim_max; if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { - int bad = 1; + int couldnt_set = 1; + const int setrlimit_errno = errno; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = try_limit; + rlim.rlim_cur = MIN(try_limit, rlim.rlim_cur); if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " @@ -1737,14 +1738,13 @@ set_max_file_descriptors(rlim_t limit, int *max_out) (unsigned long)try_limit, (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); } - bad = 0; + couldnt_set = 0; } } #endif /* OPEN_MAX */ - if (bad) { + if (couldnt_set) { log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors: %s", - strerror(errno)); - return -1; + strerror(setrlimit_errno)); } } /* leave some overhead for logs, etc, */

1 0

[tor/master] Merge branch 'bug21074_029'
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 454d85436385a7ee0b60f18834d707d72b08b915 Merge: f470756cf 68ca6d2e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 14:13:39 2018 -0500 Merge branch 'bug21074_029' changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --cc src/common/compat.c index b4bd6eba0,a88e9b514..7c9b2f808 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -1761,14 -1738,13 +1762,13 @@@ set_max_file_descriptors(rlim_t limit, (unsigned long)try_limit, (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); } - bad = 0; + couldnt_set = 0; } } -#endif /* OPEN_MAX */ +#endif /* defined(OPEN_MAX) */ - if (bad) { + if (couldnt_set) { log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors: %s", - strerror(errno)); - return -1; + strerror(setrlimit_errno)); } } /* leave some overhead for logs, etc, */

1 0