[DRE-maint] Bug#882714: stretch-pu: package ruby-pygments.rb/0.6.3-2

[Cédric Boutillier]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org at packages.debian.org
Usertags: pu

Hi,

the proposed update fixes a reasonable limit to RLIMIT_NOFILE, avoiding
closing too many files at a time. This fixes  #876768

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876768

and fixes weechat.

Best regards,

Cédric

-- System Information:
Debian Release: buster/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr:en_US (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru ruby-pygments.rb-0.6.3/debian/changelog ruby-pygments.rb-0.6.3/debian/changelog
--- ruby-pygments.rb-0.6.3/debian/changelog	2016-07-08 14:43:00.000000000 +0200
+++ ruby-pygments.rb-0.6.3/debian/changelog	2017-11-25 21:48:18.000000000 +0100
@@ -1,3 +1,11 @@
+ruby-pygments.rb (0.6.3-2+deb9u1) stretch; urgency=medium
+
+  * Add Set-reasonable-upper-limit-to-RLIMIT_NOFILE.patch
+    to avoid closing too many files when mentos starts
+    (Closes: #876768)
+
+ -- Cédric Boutillier <boutil at debian.org>  Sat, 25 Nov 2017 21:48:18 +0100
+
 ruby-pygments.rb (0.6.3-2) unstable; urgency=medium
 
   * Team upload
diff -Nru ruby-pygments.rb-0.6.3/debian/gbp.conf ruby-pygments.rb-0.6.3/debian/gbp.conf
--- ruby-pygments.rb-0.6.3/debian/gbp.conf	1970-01-01 01:00:00.000000000 +0100
+++ ruby-pygments.rb-0.6.3/debian/gbp.conf	2017-11-25 21:41:16.000000000 +0100
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = stretch/master
+upstream-branch = stretch/upstream
diff -Nru ruby-pygments.rb-0.6.3/debian/patches/0011-Set-reasonable-upper-limit-to-RLIMIT_NOFILE.patch ruby-pygments.rb-0.6.3/debian/patches/0011-Set-reasonable-upper-limit-to-RLIMIT_NOFILE.patch
--- ruby-pygments.rb-0.6.3/debian/patches/0011-Set-reasonable-upper-limit-to-RLIMIT_NOFILE.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-pygments.rb-0.6.3/debian/patches/0011-Set-reasonable-upper-limit-to-RLIMIT_NOFILE.patch	2017-11-25 21:45:19.000000000 +0100
@@ -0,0 +1,29 @@
+commit d69d8e9ea11f9cd6652ef4cb066356792182af7e
+Author: Cédric Boutillier <boutil at debian.org>
+Date:   Fri Sep 29 22:49:47 2017 +0200
+
+    Set reasonable upper limit to RLIMIT_NOFILE
+    
+    When RLIMIT_NOFILE is too high, the number of files to close
+    can be too important and the process of closing could take more time
+    than the timeout set (default to 8s).
+    
+    This causes asciidoctor to crash on some architectures
+    
+    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876768
+    
+    Gbp-Pq: Name 0008-Set-reasonable-upper-limit-to-RLIMIT_NOFILE.patch
+
+diff --git a/lib/pygments/mentos.py b/lib/pygments/mentos.py
+index 9c7c650..cf70b7b 100755
+--- a/lib/pygments/mentos.py
++++ b/lib/pygments/mentos.py
+@@ -334,7 +334,7 @@ def main():
+         # close fd's inherited from the ruby parent
+         import resource
+         maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
+-        if maxfd == resource.RLIM_INFINITY:
++        if maxfd >= 65536:
+             maxfd = 65536
+ 
+         for fd in range(3, maxfd):
diff -Nru ruby-pygments.rb-0.6.3/debian/patches/series ruby-pygments.rb-0.6.3/debian/patches/series
--- ruby-pygments.rb-0.6.3/debian/patches/series	2016-07-08 14:43:00.000000000 +0200
+++ ruby-pygments.rb-0.6.3/debian/patches/series	2017-11-25 21:46:08.000000000 +0100
@@ -8,3 +8,4 @@
 0008-fix_test_pygments.patch
 0009-adapt-to-new-pygments.patch
 0010-no-relative-path-for-require-in-tests.patch
+0011-Set-reasonable-upper-limit-to-RLIMIT_NOFILE.patch