Commit graph

166 commits

Author SHA1 Message Date
Frederik Rietdijk
6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
Klaas van Schelven
3c65062a43 bash: cleanup unused file
The only usage location was removed in f803270b7e
Grepping for bash-4.3 yields no results
2017-08-18 12:36:30 +03:00
Tuomas Tynkkynen
bd0e161f0c bashInteractive: Fix manpages since previous commits 2017-08-11 21:32:55 +03:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
David McFarland
af165175da bash: fix cygwin build 2017-06-26 09:33:03 -03:00
John Ericson
f75ad79375 bash: Modernize derivation, hopefully fixing cross compilation 2017-06-22 17:53:53 -04:00
Tuomas Tynkkynen
7194179854 bash: Remove unnecessary 'Makefile.inc' that is keeping reference to bootstrap-tools
The file is an example makefile for developing bash plugins, and
contains stuff like:

````
example:	example.o
	$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ example.o $(SHOBJ_LIBS)
````

So no package is really going to depend on that, and it's making the
.dev output keep a reference to the bootstrap tools. Just nuke it.
2017-04-26 13:19:51 +03:00
Eelco Dolstra
48bc3cf9f4
bash: 4.4p5 -> 4.4p12 2017-03-20 16:47:13 +01:00
Tuomas Tynkkynen
dff0ba38a2 bash: Set bash_cv_getcwd_malloc=yes when cross compiling
Because if you don't, the configure script assumes that your getcwd()
function is broken. Which then makes bash use it's own getcwd()
implementation, which doesn't work if the path to the current directory
contains bind mounts in its paths. This shows up as:

shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor

... and fails the aarch64 glibc build with sandboxes enabled.

Sigh.
2017-03-14 00:33:29 +02:00
Vladimír Čunát
f803270b7e
bash: switch the default 4.3 -> 4.4
... and remove the now-unused 4.3 expression.
2017-01-05 01:07:36 +01:00
Vladimír Čunát
57fc4d21b7
bash-4.4: p0 -> p5 + a security patch from Gentoo 2017-01-05 01:01:02 +01:00
Vladimír Čunát
22796f0d4f
bash-4.3: fix security problems via a Gentoo patch 2017-01-05 00:00:24 +01:00
Daiderd Jordan
f04783876c
bash-4.3-p46 -> bash-4.3-p48 2017-01-04 22:37:07 +01:00
Vladimír Čunát
30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Markus Hauck
aafbd40577 Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
Vladimír Čunát
f37566d396 bash 4.4: split headers into .dev 2016-09-17 10:51:32 +02:00
Vladimír Čunát
40a6918af3 bash: bring back 4.3 for the non-interactive version
... until someone looks better at the outputs. The size has grown in 4.4,
and it seems like installing binary plugins, headers, etc.
2016-09-17 10:49:28 +02:00
Vladimír Čunát
bbadb1da2a readline70: init at 7.0p0
Also switch bash-4.4 to it, as it's unable to link with older readline
versions (only bashInteractive is affected).
2016-09-17 01:16:24 +02:00
Vladimír Čunát
02163da708 bash: fixup the patch-list paths 2016-09-17 00:43:13 +02:00
Matthias Beyer
3689be00d8 Add bash-4.4-patches.nix 2016-09-16 22:06:55 +02:00
Matthias Beyer
4a674282e5 bash: 4.3 -> 4.4 2016-09-16 22:05:18 +02:00
Franz Pletz
098680e78e
Revert "Revert "bash: 4.3-p42 -> 4.3-p46""
This reverts commit 36e75a2285.

Sorry, had bash reverted temporarily to test the build of the
sqlite bump and forgot to remove that commit.
2016-08-26 17:08:58 +02:00
Franz Pletz
36e75a2285
Revert "bash: 4.3-p42 -> 4.3-p46"
This reverts commit e39a3237e6.
2016-08-26 17:06:45 +02:00
Eelco Dolstra
e39a3237e6 bash: 4.3-p42 -> 4.3-p46 2016-08-26 16:36:07 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát
c7377b0e4a zlib, bash: mass-rebuild cleanup 2016-04-25 17:12:49 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát
61ebdc192d bash-interactive: better split doc stuff
... while avoiding mass rebuild ATM.
2016-03-08 09:59:24 +01:00
Franz Pletz
baee91ec60 cc-wrapper: Check if ld supports -z, fixes darwin 2016-03-07 21:40:20 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Burke Libbey
3c437a643f GNU apparently modified bash patch 042. 2015-12-03 08:58:30 +01:00
Vladimír Čunát
6d6f8282f4 bash: remove bashbug for non-interactive, refactor 2015-10-28 10:09:33 +01:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III
461a9ee562 bash4.3: p39 -> p42 2015-08-31 10:25:12 -07:00
William A. Kennington III
883fadf6d1 bash: Remove stale 4.1 patches 2015-08-31 10:23:01 -07:00
Jude Taylor
9c153e2227 add binutils to bash build for size 2015-08-12 11:27:54 -07:00
Eelco Dolstra
e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Eelco Dolstra
7c3bf186a6 bash: Update to 4.3-p39 2015-06-22 14:40:29 +02:00
Rok Garbas
bd59bf9a74 cygwin: bash updated to 4.3 for cygwin platform 2015-05-29 10:18:06 +02:00
Marko Durkovic
67ac12795a cygwin: add cygwin compatible bash version. 2015-05-28 10:53:35 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Eelco Dolstra
a628d6ee18 bash: Update to 4.3-p30 2015-01-26 23:42:36 +01:00
Eelco Dolstra
103f5658a4 bash: Update to 4.3 2014-11-03 14:19:53 +01:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Eelco Dolstra
635ca3094f bash: Update to 4.2p53 2014-10-06 20:20:04 +02:00
Peter Simons
88ef0cb750 bash: add patch set 51 to fix http://lcamtuf.blogspot.de/2014/10/bash-bug-how-we-finally-cracked.html 2014-10-01 23:02:56 +02:00
Shell Turner
21c12b4065 Updated bash to patch 50.
This fully mitigates Shellshock and related parsing vulnerabilities,
due to attackers never controlling environment variable names.
2014-09-29 13:44:38 +02:00
Eelco Dolstra
0a0ebd8c44 bash: Fix for CVE-2014-7169 2014-09-25 14:40:44 +02:00
Shell Turner
ad3591cd9d Update bash patchset to fix CVE-2014-6271 2014-09-24 17:09:12 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
01449afa1b bash: Update to 4.2-p47 2014-06-24 13:53:59 +02:00
Eelco Dolstra
2145471304 bash: Update to 4.2-p45 2013-08-26 14:28:56 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Eelco Dolstra
0214514f8b bash: Disable parallel building
Parallel building randomly fails because bash's Makefiles at some
point do a recursive make invocation to build a file "version.h":

  ../version.h: ../config.h ../Makefile Makefile
          -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} version.h )

As a result, both the parent and the child can end up building
version.h at the same time.  This causes the build to fail with

  mv: cannot stat `newversion.h': No such file or directory

http://hydra.nixos.org/build/3853249
2013-01-23 16:32:57 +01:00
Eelco Dolstra
b4dd943f16 bash: Update to 4.2-p42 2013-01-17 12:39:48 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
4065ae9174 bash: Update to 4.2-p39 2012-11-23 17:29:05 +01:00
Eelco Dolstra
fcdfc1c50c bash: Update to 4.2-p37 2012-08-10 14:39:30 -04:00
Eelco Dolstra
69e32e52e2 * Bash 4.2.24.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33554
2012-04-03 11:48:31 +00:00
Eelco Dolstra
1dbbc4581b * Latest bash patches.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30854
2011-12-12 17:10:28 +00:00
Peter Simons
07a5a121fb synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
2011-09-28 14:48:34 +00:00
Peter Simons
dc55be9e05 pkgs/shells/bash: updated "interactive" bash to version 4.2
The non-interactive variant, which is part of stdenv, remains unchanged.

svn path=/nixpkgs/trunk/; revision=29523
2011-09-28 14:37:03 +00:00
Peter Simons
6a1bde84dc pkgs/shells/bash/default.nix: don't install bash completion in non-interactive mode
This patch removes the kludge introduced in trunk to avoid a stdenv rebuild.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29469
2011-09-24 08:06:47 +00:00
Peter Simons
0ad122f4e6 sync with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29468
2011-09-24 08:04:47 +00:00
Peter Simons
3e09798bf4 pkgs/shells/bash/default.nix: revert my earlier revision 29244
Including the bash-completion package in bash itself sounded like a good idea
at the time, but it wasn't. After having actually integrated completion support
into NixOS, it has become obvious that this property isn't required at all.
Keeping bash-completion separate from bash works just fine. Anyone who wants
completion support can just install that package.

svn path=/nixpkgs/trunk/; revision=29467
2011-09-24 07:58:19 +00:00
Shea Levy
01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Peter Simons
9f20aa5df6 bash: install extensive completion library in the interactive version
Add the command-line completion library to the "interactive" version of
bash. That code is *not* active by default. To enable it, run

 | . ${bash}/etc/bash_completion

in your ~/.bashrc. If you prefer to build bashInteractive without that
feature, use the following override in ~/.nixpkgs/config.nix to disable it:

 | {
 |   packageOverrides = pkgs:
 |   {
 |     bashInteractive = pkgs.bashInteractive.override {
 |       bashCompletion = null;
 |     };
 |   };
 | }

svn path=/nixpkgs/trunk/; revision=29244
2011-09-13 17:50:03 +00:00
Ludovic Courtès
0f1ba30626 GNU Bash 4.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=26119
2011-02-25 15:28:29 +00:00
Lluís Batlle i Rossell
1b62c9c061 I made changes to achieve a working cross-built gcc wrapper. Now,
"gcc45.hostDrv" works in the host system, together with libc, binutils, dynamic
linker, ...


svn path=/nixpkgs/branches/stdenv-updates/; revision=24971
2010-12-04 21:45:37 +00:00
Lluís Batlle i Rossell
ab419e9f86 Adding support for job control in bash cross-building, because otherwise it does not get built.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24890
2010-11-27 15:49:43 +00:00
Lluís Batlle i Rossell
d910fcbcee Making bash and kbd cross-build
svn path=/nixpkgs/branches/stdenv-updates/; revision=24851
2010-11-25 09:14:56 +00:00
Eelco Dolstra
6b4de5c25e * None of us is paying attention today ;-)
svn path=/nixpkgs/branches/stdenv-updates/; revision=19690
2010-01-26 20:13:23 +00:00
Ludovic Courtès
6dc132be1e bash: Fix URL.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19688
2010-01-26 19:41:04 +00:00
Eelco Dolstra
0d88060fb6 * Update to bash-4.1-p2 (since we're rebuilding everything anyway).
svn path=/nixpkgs/branches/stdenv-updates/; revision=19680
2010-01-26 16:34:50 +00:00
Rob Vermaas
e8601a4227 explicitly disable readline support for bash on darwin, hacky for now, to avoid massive rebuild
svn path=/nixpkgs/branches/stdenv-updates/; revision=19678
2010-01-26 16:04:53 +00:00
Ludovic Courtès
eea396e744 GNU Bash 4.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19223
2010-01-05 11:27:57 +00:00
Ludovic Courtès
2e9a37cce1 bash: Make `update-patch-set.sh' executable.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19221
2010-01-05 11:27:50 +00:00
Lluís Batlle i Rossell
a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
2009-11-20 22:56:58 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Eelco Dolstra
9d1a6b6c67 * Doh.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15019
2009-04-14 07:35:20 +00:00
Eelco Dolstra
e6cf1abcec * bash: updated to 4.0 patchlevel 17. Removed the dietlibc patch, we
don't need it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15018
2009-04-13 18:38:45 +00:00
Eelco Dolstra
5e9b323363 * Fixed bashInteractive.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14703
2009-03-25 15:59:02 +00:00
Ludovic Courtès
73b66bedd9 Remove redundant Bash 4.0 expression.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14663
2009-03-23 17:33:37 +00:00
Eelco Dolstra
d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Peter Simons
ae474690ea Added bash 4.0 (and readline 6.0, which is required by bash).
svn path=/nixpkgs/trunk/; revision=14573
2009-03-17 14:03:03 +00:00
Ludovic Courtès
a6f044663b GNU Bash 4.0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14210
2009-02-23 21:26:35 +00:00
Eelco Dolstra
a5b607ef4f * Bash 3.2.48.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13876
2009-01-27 11:03:41 +00:00
Eelco Dolstra
c441868a7e * bash: use the global /etc/bashrc and /etc/bash_logout files.
Changed the built-in default $PATH to /no-such-path.  (This also
  applies to the "standard utilities path" used by "command -p", so
  that doesn't work anymore, but it didn't work anyway on NixOS and
  nobody uses it.)  Include the startup files for non-interactive
  login shells.  Use bashrc when started from ssh.

svn path=/nixpkgs/trunk/; revision=12365
2008-07-16 15:05:49 +00:00
Eelco Dolstra
dd91141a06 * bash needs texinfo if you want the manpages / info docs.
svn path=/nixpkgs/trunk/; revision=12363
2008-07-16 13:36:41 +00:00
Eelco Dolstra
90f1d76790 * Bash 3.2 patchlevel 39.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11799
2008-05-09 14:55:03 +00:00
Eelco Dolstra
a18e6606c8 * Bash 3.2 updated to patch level 33.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10512
2008-02-06 13:26:27 +00:00
Eelco Dolstra
8cd1b893cf * coreutils-6.10, findutils-4.2.32.
* Added some meta attributes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10511
2008-02-06 13:18:50 +00:00
Eelco Dolstra
d0fc2251b4 * Bash 3.2 patchlevel 25.
svn path=/nixpkgs/branches/stdenv-updates/; revision=9795
2007-11-26 13:59:46 +00:00
Eelco Dolstra
d384ef5673 * Replace bash with bash-interactive.
svn path=/nixpkgs/trunk/; revision=8761
2007-05-24 15:44:03 +00:00
Eelco Dolstra
5021babc20 svn path=/nixpkgs/trunk/; revision=8760 2007-05-24 15:43:00 +00:00
Eelco Dolstra
cf693caa08 * Another example of an inline hook.
svn path=/nixpkgs/trunk/; revision=6864
2006-10-26 22:30:27 +00:00