sync with latest patch from Fedora

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 6b3d048984ef141294996214452b5ca6bf727235..2e87464d52d02044b1c126659ffbeabc01be09e9 100644 (file)
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,52 +1,52 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 4eb41e471f0b8475284437703a912f9b ChangeLog 15403
 MD5 3da49e27281cbe16582393239ba5b29b bash-2.05b-r11.ebuild 3715
 MD5 a4df32e089db48d7c99fd6be36368475 bash-2.05b-r9.ebuild 3516
 MD5 27a795f52631ec69ef83b28d72e449dc bash-3.0-r11.ebuild 5143
-MD5 79089edfbb4dcf5b62bb04ff10750dee ChangeLog 15143
 MD5 30fb11f3c3ffeebf09fa3ae90dd0d351 bash-3.0-r12.ebuild 5407
-MD5 3b706b4e822e0480f1ba098db4b292f6 files/bash-3.0-parallel.patch 378
-MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
+MD5 6e5c1610b6ebc475ccf11c0f88a4f764 bash-3.0-r13.ebuild 4822
 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
+MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
+MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
+MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
 MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
 MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
-MD5 b518c92ffb4ee61be7e4b1d27264a652 files/bash-3.0-pgrp-pipe-fix.patch 462
-MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
-MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205
-MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
-MD5 e685741a0d3aede0600541b946b99564 files/bash-3.0-force-static-linking.patch 952
+MD5 5b271ebb6e2c7fa763e2b7614b5a6be4 files/bash-3.0-afs.patch 633
+MD5 fb4d7310d9e0a05744f27d03958bd39d files/bash-3.0-array-stripping.patch 383
+MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
+MD5 49f41ffbc5249811bb4e134a746737a5 files/bash-3.0-configs.patch 2538
 MD5 ccc195288edb06eb44f4d5e2a9c1da62 files/bash-3.0-crash.patch 1191
+MD5 d9f3ac9936b8f633c8cada36820e7419 files/bash-3.0-darwin-conn.patch 970
+MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443
+MD5 e685741a0d3aede0600541b946b99564 files/bash-3.0-force-static-linking.patch 952
+MD5 dced48405f7f282987d6e23d6d83499d files/bash-3.0-gentoo.patch 2955
+MD5 340ff85349dde64927124f82b2722fc4 files/bash-3.0-histtimeformat.patch 1718
+MD5 095c2675a00fb2006a23dc1617f257da files/bash-3.0-invisible.patch 846
+MD5 187405c198c05b4a4887211b2e52e17e files/bash-3.0-jobs.patch 1075
+MD5 10903eb578a9ab4992dc6a3b1a23df54 files/bash-3.0-local-array.patch 364
+MD5 34c51cd635ce6c67ad48916664d8bd0d files/bash-3.0-locale.patch 3426
+MD5 2cb2e2808cdef5be2c06f7b0e5e6933d files/bash-3.0-manpage.patch 498
+MD5 5eb765b627bf72c3e0ca6c4261e9f4db files/bash-3.0-multibyteifs.patch 6099
+MD5 3b706b4e822e0480f1ba098db4b292f6 files/bash-3.0-parallel.patch 378
+MD5 b518c92ffb4ee61be7e4b1d27264a652 files/bash-3.0-pgrp-pipe-fix.patch 462
+MD5 92aa5d2ebd4b97eaea0073451bb670b9 files/bash-3.0-posixtrap.patch 1212
+MD5 83c872f8c494e1e9c5b68f44e7791730 files/bash-3.0-prompt.patch 785
+MD5 b20f110700361d0b55176f96245bb029 files/bash-3.0-pwd.patch 717
 MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
-MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
-MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
-MD5 1f2890881a3a8c96772d60974d06fd42 files/bashrc 1709
-MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
-MD5 7d8a8ef90c1818a0cd66808ac2740638 files/dot-bash_logout 127
-MD5 6dcc418c7812b5f8ebf2f6562eb2e57c files/dot-bashrc 983
-MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
-MD5 d76b9aa6b733175df21c2bb6afe8900d files/dot-bash_profile 193
+MD5 b3345c5274b7b08ce50dc5ec0aa11197 files/bash-3.0-read-e-segfault.patch 825
+MD5 d27b7513a05817757fdea6195bbdf80a files/bash-3.0-rl-display.patch 5641
+MD5 5b8b23036c704629f7acdfdffcf69f2f files/bash-3.0-rl-self-insert.patch 2479
 MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
-MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
-MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
-MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
+MD5 47fca8c27b11bcc6641a78a8cc9414e5 files/bash-3.0-ulimit.patch 5226
+MD5 c16b3704ff34112b6f152205c2565f5b files/bash-3.0-utf8.patch 1392
 MD5 a2845a2a194bba75c1875f4a1ad49344 files/bash30-014 698
+MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205
+MD5 1f2890881a3a8c96772d60974d06fd42 files/bashrc 1709
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
-MD5 b3345c5274b7b08ce50dc5ec0aa11197 files/bash-3.0-read-e-segfault.patch 825
-MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
-MD5 00cd6ee276de4810e2209dc426b133e4 files/bash-3.0-ulimit.patch 2659
-MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r12 976
-MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
-MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
-MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
-MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
 MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDQa/KgIKl8Uu19MoRAvrwAJ9ZumnDX611Pg8oHopMei5XN9rlTQCfTOw9
-x9Y2Dt4A2i8qmmUU5SV+oYs=
-=Tiqu
------END PGP SIGNATURE-----
+MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r12 976
+MD5 e1aef7c77cc56da08cb6e99e26dee2cc files/digest-bash-3.0-r13 909
+MD5 7d8a8ef90c1818a0cd66808ac2740638 files/dot-bash_logout 127
+MD5 d76b9aa6b733175df21c2bb6afe8900d files/dot-bash_profile 193
+MD5 6dcc418c7812b5f8ebf2f6562eb2e57c files/dot-bashrc 983
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164

diff --git a/app-shells/bash/files/bash-3.0-ulimit.patch b/app-shells/bash/files/bash-3.0-ulimit.patch
index 8fcffc8c479eabd162b10c3c2926c030c1759e4f..8202b95d276972bb9423a162f39e08eaaeba72ef 100644 (file)
--- a/app-shells/bash/files/bash-3.0-ulimit.patch
+++ b/app-shells/bash/files/bash-3.0-ulimit.patch
@@ -1,8 +1,12 @@
---- bash-3.0/builtins/ulimit.def       2004-08-27 17:29:19.662577512 +0100
-+++ bash-3.0/builtins/ulimit.def       2004-08-31 12:56:27.693244884 +0100
-@@ -35,14 +35,17 @@
+Ripped from Fedora
+
+--- bash-3.0/builtins/ulimit.def
++++ bash-3.0/builtins/ulimit.def
+@@ -34,15 +34,20 @@
+     -a        all current limits are reported
      -c        the maximum size of core files created
      -d        the maximum size of a process's data segment
++    -e        the maximum scheduling priority (`nice')
      -f        the maximum size of files created by the shell
 +    -i        the maximum number of pending signals
      -l        the maximum size a process may lock into memory
@@ -10,6 +14,7 @@
      -n        the maximum number of open file descriptors
      -p        the pipe buffer size
 +    -q        the maximum number of bytes in POSIX message queues
++    -r        the maximum rt priority
      -s        the maximum stack size
      -t        the maximum amount of cpu time in seconds
      -u        the maximum number of user processes
@@ -18,9 +23,13 @@
  
  If LIMIT is given, it is the new value of the specified resource;
  the special LIMIT values `soft', `hard', and `unlimited' stand for
-@@ -200,6 +203,9 @@
+@@ -199,7 +204,13 @@
+ #ifdef RLIMIT_DATA
    { 'd',      RLIMIT_DATA,  1024,     "data seg size",        "kbytes" },
  #endif
++#ifdef RLIMIT_NICE
++  { 'e',      RLIMIT_NICE, 1,         "max nice",             (char *)NULL},
++#endif /* RLIMIT_NICE */
    { 'f',      RLIMIT_FILESIZE, 1024,  "file size",            "blocks" },
 +#ifdef RLIMIT_SIGPENDING
 +  { 'i',      RLIMIT_SIGPENDING, 1,   "pending signals",      (char *)NULL},
@@ -28,17 +37,20 @@
  #ifdef RLIMIT_MEMLOCK
    { 'l',      RLIMIT_MEMLOCK, 1024,   "max locked memory",    "kbytes" },
  #endif
-@@ -208,6 +214,9 @@
+@@ -208,6 +219,12 @@
  #endif /* RLIMIT_RSS */
    { 'n',      RLIMIT_OPENFILES, 1,    "open files",           (char *)NULL},
    { 'p',      RLIMIT_PIPESIZE, 512,   "pipe size",            "512 bytes" },
 +#ifdef RLIMIT_MSGQUEUE
 +  { 'q',      RLIMIT_MSGQUEUE, 1,     "POSIX message queues", "bytes" },
 +#endif
++#ifdef RLIMIT_RTPRIO
++  { 'r',      RLIMIT_RTPRIO, 1,       "max rt priority",      (char *)NULL},
++#endif /* RLIMIT_RTPRIO */
  #ifdef RLIMIT_STACK
    { 's',      RLIMIT_STACK, 1024,     "stack size",           "kbytes" },
  #endif
-@@ -221,6 +230,9 @@
+@@ -221,6 +238,9 @@
  #ifdef RLIMIT_SWAP
    { 'w',      RLIMIT_SWAP,    1024,   "swap size",            "kbytes" },
  #endif
@@ -48,7 +60,7 @@
    { -1, -1, -1, (char *)NULL, (char *)NULL }
  };
  #define NCMDS (sizeof(limits) / sizeof(limits[0]))
-@@ -647,11 +659,11 @@
+@@ -647,11 +667,11 @@
  
    for (i = 0; limits[i].option > 0; i++)
      {
@@ -63,7 +75,7 @@
      }
  }
  
-@@ -670,7 +682,7 @@
+@@ -670,7 +690,7 @@
        else
          sprintf (unitstr, "(-%c) ", limits[limind].option);
  
@@ -72,3 +84,103 @@
      }
    if (curlim == RLIM_INFINITY)
      puts ("unlimited");
+--- bash-3.0/doc/bashref.texi
++++ bash-3.0/doc/bashref.texi
+@@ -3793,7 +3793,7 @@
+ @item ulimit
+ @btindex ulimit
+ @example
+-ulimit [-acdflmnpstuvSH] [@var{limit}]
++ulimit [-acdeflmnpqrstuvxSH] [@var{limit}]
+ @end example
+ @code{ulimit} provides control over the resources available to processes
+ started by the shell, on systems that allow such control.  If an
+@@ -3814,9 +3814,15 @@
+ @item -d
+ The maximum size of a process's data segment.
+ 
++@item -e
++The maximum scheduling priority.
++
+ @item -f
+ The maximum size of files created by the shell.
+ 
++@item -i
++The maximum number of pending signals.
++
+ @item -l
+ The maximum size that may be locked into memory.
+ 
+@@ -3829,6 +3835,12 @@
+ @item -p
+ The pipe buffer size.
+ 
++@item -q
++The maximum number of bytes in POSIX message queues.
++
++@item -r
++The maximum RT priority.
++
+ @item -s
+ The maximum stack size.
+ 
+@@ -3841,6 +3853,9 @@
+ @item -v
+ The maximum amount of virtual memory available to the process.
+ 
++@item -x
++The maximum amount of file locks.
++
+ @end table
+ 
+ If @var{limit} is given, it is the new value of the specified resource;
+--- bash-3.0/doc/bash.1
++++ bash-3.0/doc/bash.1
+@@ -8362,7 +8362,7 @@
+ returns true if any of the arguments are found, false if
+ none are found.
+ .TP
+-\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
++\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]]
+ Provides control over the resources available to the shell and to
+ processes started by it, on systems that allow such control.
+ The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
+@@ -8398,9 +8398,15 @@
+ .B \-d
+ The maximum size of a process's data segment
+ .TP
++.B \-e
++The maximum scheduling priority (`nice')
++.TP
+ .B \-f
+ The maximum size of files created by the shell
+ .TP
++.B \-i
++The maximum number of pending signals
++.TP
+ .B \-l
+ The maximum size that may be locked into memory
+ .TP
+@@ -8414,6 +8420,12 @@
+ .B \-p
+ The pipe size in 512-byte blocks (this may not be set)
+ .TP
++.B \-q
++The maximum number of bytes in POSIX message queues
++.TP
++.B \-r
++The maximum rt priority
++.TP
+ .B \-s
+ The maximum stack size
+ .TP
+@@ -8425,6 +8437,9 @@
+ .TP
+ .B \-v
+ The maximum amount of virtual memory available to the shell
++.TP
++.B \-x
++The maximum number of file locks
+ .PD
+ .PP
+ If