From c9914f55593a3fa5578d7e8bbeea48374326c64c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Aug 2011 22:04:38 +0000 Subject: [PATCH 001/504] haskell-hackage-db: added version 1.0 svn path=/nixpkgs/trunk/; revision=28803 --- .../libraries/haskell/hackage-db/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hackage-db/default.nix diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix new file mode 100644 index 00000000000..4cfc1527f92 --- /dev/null +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -0,0 +1,18 @@ +{ cabal, tar }: + +cabal.mkDerivation (self: { + pname = "hackage-db"; + version = "1.0"; + sha256 = "0y769ssr9jlyzcdr0l8wh5s3ivc3zbp9mf7xy7vnq6mr9hjh7lcw"; + buildDepends = [ tar ]; + meta = { + homepage = "http://github.com/peti/hackage-db"; + description = "provide access to the Hackage database via Data.Map"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5845c13fbec..bea19adcc16 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -682,6 +682,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; HTTP = self.HTTP_4000_0_6; + hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; + haxr = callPackage ../development/libraries/haskell/haxr { HaXml = self.HaXml_1_22_5; }; From 5b3aa1f8ec3a382916f8d3159f71eaa9bc6cbbe8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 24 Aug 2011 22:52:16 +0000 Subject: [PATCH 002/504] openjdk: Remove extraneous whitespace svn path=/nixpkgs/trunk/; revision=28804 --- pkgs/development/compilers/openjdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index df56df5d5cf..0ea08071aaa 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ - openjdk/hotspot/make/linux/makefiles/sa.make + openjdk/hotspot/make/linux/makefiles/sa.make sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk From 4170da1c96f5c2ca182af2cd097d49a46b27c836 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 25 Aug 2011 01:00:13 +0000 Subject: [PATCH 003/504] add dbench svn path=/nixpkgs/trunk/; revision=28806 --- .../development/tools/misc/dbench/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/development/tools/misc/dbench/default.nix diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix new file mode 100644 index 00000000000..0ef9c47dcc5 --- /dev/null +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchgit, autoconf, popt, zlib}: + +stdenv.mkDerivation rec { + name = "dbench-20101121"; + + buildInputs = [autoconf popt zlib]; + + preConfigure = '' + ./autogen.sh + ''; + + src = fetchgit { + url = git://git.samba.org/sahlberg/dbench.git; + rev = "8b5143bcc0f4409553392fdf12fd21c95a075fae"; + sha256 = "607a62b7ff2e9b1393980777e0ba239215dd8145bc1a34649bcbe2b1e567006d"; + }; + + postInstall = '' + cp -R loadfiles/* $out/share + ''; + +} From 9690dc026b03bcbe7c8d42b357bf535d91bdb54f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 25 Aug 2011 01:00:25 +0000 Subject: [PATCH 004/504] add dbench svn path=/nixpkgs/trunk/; revision=28807 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 576938d2939..5f113ca4fea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -537,6 +537,8 @@ let neon = neon029; }; + dbench = callPackage ../development/tools/misc/dbench { }; + dcraw = callPackage ../tools/graphics/dcraw { }; debootstrap = callPackage ../tools/misc/debootstrap { }; From 54242ed70cc3e911b905ee4bb972781b9263abb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Aug 2011 09:32:30 +0000 Subject: [PATCH 005/504] haskell-dimensional: updated to version 0.10.1.1 svn path=/nixpkgs/trunk/; revision=28809 --- pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 7bf37628d13..a8943965ab7 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.10.1"; - sha256 = "0pnrqm6qny09g8iy191844d0mvvyzg1j637pvwwwhci8lzq3hfyd"; + version = "0.10.1.1"; + sha256 = "198ynnls5l25q6igbhgd892cp1hvzca3wbgsmfxzlmcwmihhp8p9"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From 82bdefea1ecba73dbbd4041bffcd0c7981ffb168 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Aug 2011 09:32:37 +0000 Subject: [PATCH 006/504] haskell-email-validate: updated to version 0.2.7 svn path=/nixpkgs/trunk/; revision=28810 --- pkgs/development/libraries/haskell/email-validate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 1a351edd39b..10c518611d1 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "email-validate"; - version = "0.2.6"; - sha256 = "1nw4r5wyck30r6n0bjxwybpkw2dqr2mp4y8fy6ypra9zhhw1jd8m"; + version = "0.2.7"; + sha256 = "13zam197ph431f351g8srsxwqchjdwx1c1bizmildsc1zxm2nm3q"; buildDepends = [ parsec ranges ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; From 96fcee49c9d460ee121a59bb042b09190415515f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Aug 2011 09:32:41 +0000 Subject: [PATCH 007/504] haskell-fclabels: updated to version 1.0.2 svn path=/nixpkgs/trunk/; revision=28811 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index e7585b88d47..e7e083210a8 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.0.1"; - sha256 = "0kmbdlf4v4651sc8igx5i1pg26xryai06l9nvp5vwsmbjcvrajcq"; + version = "1.0.2"; + sha256 = "14l7q481qx3fnln6xv5xvb8a8kphvh5dyd3d953wwrswqy0dr91l"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From 6401a82424804a882e04c0a584fb2d8f256da08a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Aug 2011 10:41:01 +0000 Subject: [PATCH 008/504] haskell-async: updated to version 1.3 svn path=/nixpkgs/trunk/; revision=28812 --- pkgs/development/libraries/haskell/async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 5b310f433b0..dcfad394438 100755 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "1.2"; - sha256 = "a5963d36fc1ba142d18920f967190b25cf80f700d863372b6d33ad5257a1773a"; + version = "1.3"; + sha256 = "0chpp8kfwccp57hl7mnralyn4s2x8f0vvkblmywfzb8sbdqgnril"; meta = { homepage = "http://gitorious.org/async/"; description = "Asynchronous Computations"; From 59882abab2e029a3f8ca49981fbed2eefaff0965 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Aug 2011 11:12:32 +0000 Subject: [PATCH 009/504] haskell-async: updated to version 1.4 svn path=/nixpkgs/trunk/; revision=28813 --- pkgs/development/libraries/haskell/async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index dcfad394438..20cca829736 100755 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "1.3"; - sha256 = "0chpp8kfwccp57hl7mnralyn4s2x8f0vvkblmywfzb8sbdqgnril"; + version = "1.4"; + sha256 = "1d24bcvmw687jcf75wgavlhfs55f0va02xhl4xdnj2lrlr19s5dl"; meta = { homepage = "http://gitorious.org/async/"; description = "Asynchronous Computations"; From 69a8ca2dc8e2479717208794823a19cbe9f47a31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Aug 2011 18:37:52 +0000 Subject: [PATCH 010/504] * Added Catalyst::View::JSON. svn path=/nixpkgs/trunk/; revision=28815 --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f83a24abac2..19bf73bcea4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -516,6 +516,15 @@ rec { propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; }; + CatalystViewJSON = buildPerlPackage rec { + name = "Catalyst-View-JSON-0.33"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "03yda9skcfnwkm4hf2a3y7g2rdjdia5hzfnll0h7z4wiyb8kxfii"; + }; + propagatedBuildInputs = [ CatalystRuntime JSONAny YAML ]; + }; + CatalystViewTT = buildPerlPackage rec { name = "Catalyst-View-TT-0.37"; src = fetchurl { From 5c90976c6a3f24678d606c8680118a5f954a2e92 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 25 Aug 2011 20:00:55 +0000 Subject: [PATCH 011/504] Add meta to kde-4.7 'subdir' pkgs svn path=/nixpkgs/trunk/; revision=28816 --- pkgs/desktops/kde-4.7/kde-package/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix index cd1cd5be9b9..d06f8a8fd8b 100644 --- a/pkgs/desktops/kde-4.7/kde-package/default.nix +++ b/pkgs/desktops/kde-4.7/kde-package/default.nix @@ -39,13 +39,14 @@ rec { kdeSubdirPkg = module: {name, subdir ? name, sane ? name}: let name_ = name; in - a@{cmakeFlags ? [], name ? name_, ...}: + a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}: stdenv.mkDerivation ({ name = "${name}-${release}"; src = kdesrc module; cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags; - } // (removeAttrs a [ "cmakeFlags" ])); + meta = defMeta // meta; + } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); # A KDE monolithic module kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; From dc7e7b7dcfe065a5de135c2d75b58e72b59814db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 09:20:42 +0000 Subject: [PATCH 012/504] haskell-extensible-exceptions: added version 0.1.1.3 svn path=/nixpkgs/trunk/; revision=28817 --- .../haskell/extensible-exceptions/0.1.1.3.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix new file mode 100644 index 00000000000..d349a1f17e3 --- /dev/null +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "extensible-exceptions"; + version = "0.1.1.3"; + sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm"; + meta = { + description = "Extensible exceptions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bea19adcc16..9cbc9da7119 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -543,6 +543,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; + extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; extensibleExceptions = null; # a core package in recent GHCs failure = callPackage ../development/libraries/haskell/failure {}; From becb1962c20453111679ac590a93fde91670d703 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 09:20:54 +0000 Subject: [PATCH 013/504] haskell-random: added version 1.0.1.0 svn path=/nixpkgs/trunk/; revision=28818 --- .../libraries/haskell/random/1.0.1.0.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/random/1.0.1.0.nix diff --git a/pkgs/development/libraries/haskell/random/1.0.1.0.nix b/pkgs/development/libraries/haskell/random/1.0.1.0.nix new file mode 100644 index 00000000000..275a1a09736 --- /dev/null +++ b/pkgs/development/libraries/haskell/random/1.0.1.0.nix @@ -0,0 +1,17 @@ +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "random"; + version = "1.0.1.0"; + sha256 = "1ghdmjzcn6n02x4gffa4g7wag4g7azrgxk3nsc5fqn9iny6rwp2i"; + buildDepends = [ time ]; + meta = { + description = "random number library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9cbc9da7119..c31cf0ffb33 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -988,6 +988,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); time = self.time_1_2_0_3; }; random_1_0_0_3 = callPackage ../development/libraries/haskell/random/1.0.0.3.nix {}; + random_1_0_1_0 = callPackage ../development/libraries/haskell/random/1.0.1.0.nix {}; random = null; # core package until ghc-7.2.1 random_newtime = self.random_1_0_0_2_newtime; From 506b355d33e06c4a18993171e391f3dd8eb52bb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 09:21:04 +0000 Subject: [PATCH 014/504] haskell-filepath: updated to version 1.2.0.1 svn path=/nixpkgs/trunk/; revision=28819 --- pkgs/development/libraries/haskell/filepath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index 809494c7ae9..6e3362bf42c 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "filepath"; - version = "1.2.0.0"; - sha256 = "14jji7byjlkzsylsnqwfsiw5vsc7nlaisqabzcw9f7nhrxkq2n20"; + version = "1.2.0.1"; + sha256 = "1fq62kxf68y2952qhipllz049cq52yc3wm4i31v2lg5hdcwbw152"; meta = { homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; description = "Library for manipulating FilePaths in a cross platform way"; From dfcddab7e2feb256a44f7a9cbe63d88296fa26c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 09:21:09 +0000 Subject: [PATCH 015/504] haskell-haskell-src-meta: updated to version 0.5 svn path=/nixpkgs/trunk/; revision=28820 --- .../libraries/haskell/haskell-src-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 62e62b78641..fd16c1151f2 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.4.0.2"; - sha256 = "1i3lhik0sa34x6rnkfa9scai9cdgx05h6mrbhwsfc7p2jlsixk92"; + version = "0.5"; + sha256 = "0403j2ks2as61rfl049v4h43xpgx06bm739y80vada6jc85rfinr"; buildDepends = [ haskellSrcExts syb thLift ]; meta = { description = "Parse source to template-haskell abstract syntax"; From 397845a77dc01223c7f91505a381a762150d412d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 09:21:13 +0000 Subject: [PATCH 016/504] haskell-utf8-string: updated to version 0.3.7 svn path=/nixpkgs/trunk/; revision=28821 --- pkgs/development/libraries/haskell/utf8-string/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index 4570a863f99..0928ae0347b 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "utf8-string"; - version = "0.3.6"; - sha256 = "c8c74555174edfb96145585c9b80780d0fc55ba249282b8a4c5968cca7c09d69"; + version = "0.3.7"; + sha256 = "1s59xsw1i311rpxb7arnd280pjqab5mrlfjmxbabknka8wqlnnvq"; meta = { homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; From 1cc2d888999d16b21be234c628fb759fdd539a02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 09:21:17 +0000 Subject: [PATCH 017/504] haskell-zlib-bindings: updated to version 0.0.1 svn path=/nixpkgs/trunk/; revision=28822 --- pkgs/development/libraries/haskell/zlib-bindings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index b5d4fbe83c5..6398ba4b275 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.0.0"; - sha256 = "168sll6mrmcnvdmdx79izqxcrli1s7asp4qilhkqss8w0jlrv1ni"; + version = "0.0.1"; + sha256 = "0m8q155yyrd4q1ddfmmhdx88mg1875ywrlr484qwpcyd58gn3bkv"; isLibrary = true; isExecutable = true; buildDepends = [ zlib ]; From 875cb2965fb29c5edc920f81a03b261084319de8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 26 Aug 2011 09:54:46 +0000 Subject: [PATCH 018/504] Bumped Tomcat connectors to version 1.2.32 svn path=/nixpkgs/trunk/; revision=28823 --- .../http/apache-modules/tomcat-connectors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 96fd594aacb..dbae8aad142 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, apacheHttpd, jdk}: stdenv.mkDerivation { - name = "tomcat-connectors-1.2.31"; + name = "tomcat-connectors-1.2.32"; builder = ./builder.sh; src = fetchurl { - url = http://apache.hippo.nl//tomcat/tomcat-connectors/jk/source/jk-1.2.31/tomcat-connectors-1.2.31-src.tar.gz; - sha256 = "0604mcxj7zdzdl2f8krpj8ig1r5qkga3hia28pijdpvy9n6pxij8"; + url = http://apache.xl-mirror.nl//tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz; + sha256 = "1dim62warzy1hqvc7cvnqsbq475sr6vpgwd6gfmddmkgw155saji"; }; inherit apacheHttpd; From ad24694013d646e40eb73ad35849881103728710 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 10:28:59 +0000 Subject: [PATCH 019/504] haskell-pandoc: enable highlighting and threading svn path=/nixpkgs/trunk/; revision=28825 --- pkgs/development/libraries/haskell/pandoc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 4655593eb7e..455baa9ee1d 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup texmath utf8String xhtml xml zipArchive ]; + configureFlags = "-fhighlighting -fthreaded"; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; From ea5a993ac4ed79aa0afa03a51be925d21504052c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 10:29:06 +0000 Subject: [PATCH 020/504] haskell-X11-xft: cabal2nix can re-generate this expression now svn path=/nixpkgs/trunk/; revision=28826 --- .../libraries/haskell/X11-xft/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix index 8f90606d7a1..14af645928c 100644 --- a/pkgs/development/libraries/haskell/X11-xft/default.nix +++ b/pkgs/development/libraries/haskell/X11-xft/default.nix @@ -1,11 +1,14 @@ -{ ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }: -cabal.mkDerivation (self : { +{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11 +}: + +cabal.mkDerivation (self: { pname = "X11-xft"; version = "0.3"; sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d"; - buildInputs = [ ghc pkgconfig libXft freetype fontconfig ]; - propagatedBuildInputs = [ X11 utf8String ]; - configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"]; + buildDepends = [ utf8String X11 ]; + extraLibraries = [ fontconfig freetype pkgconfig ]; + pkgconfigDepends = [ libXft ]; + configureFlags = "--extra-include-dirs=${freetype}/include/freetype2"; meta = { description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; From 7ccb9f141ab29493b30a011827a7e87f82c02881 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 10:29:11 +0000 Subject: [PATCH 021/504] haskell-nixos-types: updated to version 1.1 svn path=/nixpkgs/trunk/; revision=28827 --- pkgs/development/libraries/haskell/nixos-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/nixos-types/default.nix b/pkgs/development/libraries/haskell/nixos-types/default.nix index edac925eb07..b63f8a9fbdc 100644 --- a/pkgs/development/libraries/haskell/nixos-types/default.nix +++ b/pkgs/development/libraries/haskell/nixos-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "nixos-types"; - version = "1.0"; - sha256 = "0zg2vz790cacl1hlhzbfpb8zw5k19v4p43ynz1wdgg6sfzvwk43s"; + version = "1.1"; + sha256 = "0vnlhq2pjnslq1h9h3lyaxw604s3zdhs7k8hfr35m178rdm3a5az"; buildDepends = [ regexPosix ]; meta = { homepage = "http://github.com/haskell4nix/nixos-types"; From 5412c585bc7a2abf92f58b5c16906717540d60e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 10:29:17 +0000 Subject: [PATCH 022/504] haskell-cabal2nix: updated to version 1.13 svn path=/nixpkgs/trunk/; revision=28828 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index ff0765fd339..7c86f79485a 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,12 +1,12 @@ -{ cabal, HTTP, mtl, nixosTypes, regexPosix }: +{ cabal, hackageDb, HTTP, mtl, nixosTypes, regexPosix }: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.12"; - sha256 = "14bijci07hkm3ksbqpzbnmwiysy5s3ll89r2iqkr1rbmj7bqxdwy"; + version = "1.13"; + sha256 = "1wjxaz3yyc41y4plwixd6p2g7higvjzpi8znbgvnzcpfj3hlh616"; isLibrary = false; isExecutable = true; - buildDepends = [ HTTP mtl nixosTypes regexPosix ]; + buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; meta = { homepage = "http://github.com/haskell4nix/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; From c0fb177ce9e82ace88cc9e28f166a23b9c908c16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Aug 2011 10:51:47 +0000 Subject: [PATCH 023/504] git-annex: pass an older version of QuickCheck to fix build failure of the test suite svn path=/nixpkgs/trunk/; revision=28829 --- pkgs/applications/version-management/git-and-tools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 53e4bfbe83b..2fb2ad431ce 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -47,8 +47,9 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; - inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc + inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc HTTP testpack monadControl; + QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; }; qgit = import ./qgit { From 9c87acf5ab6bce4d91a233064af833040255e5a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 26 Aug 2011 11:21:56 +0000 Subject: [PATCH 024/504] Update Google Talk source. I wonder if there is a way to get it with a fixed version.. svn path=/nixpkgs/trunk/; revision=28830 --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 3ae24bdddf9..1ea41d64465 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "01c8w221azvmqvxf5lgb8l151086d72ll5wnjndwn50dvi6rphvx"; + sha256 = "14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63"; } else throw "Google Talk does not support your platform."; @@ -89,4 +89,4 @@ stdenv.mkDerivation { homepage = http://www.google.com/chat/video/; license = "unfree"; }; -} \ No newline at end of file +} From 8c26e61e42ee0fb4ab41535698920872e7f09ffe Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 26 Aug 2011 13:46:32 +0000 Subject: [PATCH 025/504] Remove outPath from dbus This was a compatibility hack. Packages should depend on dbus.libs explicitly. Should not change any hash. Will fix NixOS dbus.nix in the next commit. svn path=/nixpkgs/trunk/; revision=28831 --- pkgs/development/libraries/dbus/default.nix | 4 ---- pkgs/development/libraries/strigi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 +++++++++- pkgs/top-level/release.nix | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 712ef36bdd7..16d685e4d81 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -58,8 +58,4 @@ in rec { # I'm too lazy to separate daemon and libs now. daemon = libs; - - # FIXME TODO - # After merger it will be better to correct upstart-job instead. - outPath = daemon.outPath; } diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 2f9007c1bb1..78a288e0bc7 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus +, clucene_core, fam, zlib, dbus_tools }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus.tools ]; + [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f113ca4fea..3783eaaff52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3138,7 +3138,15 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = callPackage ../development/libraries/dbus { + dbus = pkgs.dbus_all.libs // { inherit (pkgs.dbus_all) libs; }; + + dbus_daemon = pkgs.dbus_all.daemon; + + dbus_tools = pkgs.dbus_all.tools; + + dbus_libs = pkgs.dbus_all.libs; + + dbus_all = callPackage ../development/libraries/dbus { useX11 = true; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 49c2279a649..fa19853b3d6 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -367,7 +367,7 @@ with (import ./release-lib.nix); ru = all; }; - dbus = { + dbus_all = { libs = linux; tools = linux; }; From 597412252ad2d5c24a2cc457bff3b7c5d3b98179 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 26 Aug 2011 13:49:23 +0000 Subject: [PATCH 026/504] Wrap kde-related packages in kdePackagesFor This lets hydra build kde packages for all available KDE releases. Will commit NixOS-fix in a few minutes. svn path=/nixpkgs/trunk/; revision=28833 --- .../graphics/kipi-plugins/default.nix | 10 +- pkgs/applications/misc/bibletime/default.nix | 6 +- pkgs/applications/misc/krename/default.nix | 4 +- .../networking/p2p/ktorrent/default.nix | 1 + pkgs/desktops/kde-4.5/default.nix | 4 +- pkgs/desktops/kde-4.7/default.nix | 1 - .../libraries/libktorrent/default.nix | 1 + pkgs/top-level/all-packages.nix | 161 ++++++++---------- pkgs/top-level/release.nix | 1 - 9 files changed, 82 insertions(+), 107 deletions(-) diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index 96ab03a2784..e551b152390 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, libkexiv2, libkdcraw, libkipi -, libksane, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gdk_pixbuf -, qjson , pkgconfig }: +{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt +, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig +, cmake, automoc4 +, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics +, libkipi ? kdegraphics, libksane ? kdegraphics }: stdenv.mkDerivation rec { name = "kipi-plugins-1.9.0"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { libksane libxslt gettext opencv libgpod gdk_pixbuf qjson ]; - buildNativeInputs = [ pkgconfig ]; + buildNativeInputs = [ pkgconfig cmake automoc4 ]; meta = { description = "Photo Management Program"; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index e7ae8b4f175..53f3a8dee8d 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, sword, qt, boost, cluceneCore}: +{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "bibletime-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${name}.tar.bz2"; + url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export SWORD_HOME=${sword}; ''; - buildInputs = [ cmake sword qt boost cluceneCore ]; + buildInputs = [ cmake sword qt4 boost cluceneCore ]; cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 373824b419f..e5af706d41c 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt, phonon }: +{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: stdenv.mkDerivation rec { name = "krename-4.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic"; }; - buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt phonon ]; + buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; meta = { homepage = http://www.krename.net; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index dfd65f8d0cc..e4cb4e9089a 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "KDE integrated BtTorrent client"; homepage = http://ktorrent.org; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + inherit (libktorrent.meta) platforms; }; } diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 1f0fd381071..746df45af34 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -1,4 +1,4 @@ -{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } : +{ callPackage, recurseIntoAttrs, callPackageOrig, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } : let @@ -17,7 +17,7 @@ let in -recurseIntoAttrs rec { +rec { recurseForRelease = true; inherit callPackage stdenv; diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 219d0e97ec5..a0c59c4e044 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -41,7 +41,6 @@ in kde.modules // kde.individual // { inherit (kde) manifest modules individual splittedModuleList; - recurseForRelease = true; akonadi = callPackage ./support/akonadi { }; soprano = callPackage ./support/soprano { }; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 30819082969..e452097e50d 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "A BiTtorrent library used by KTorrent"; homepage = http://ktorrent.org; + inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3783eaaff52..f52a624d327 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,8 +411,6 @@ let bfr = callPackage ../tools/misc/bfr { }; - bluedevil = newScope pkgs.kde4 ../tools/bluetooth/bluedevil { }; - bootchart = callPackage ../tools/system/bootchart { }; btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { @@ -876,8 +874,6 @@ let jwhois = callPackage ../tools/networking/jwhois { }; - kdiff3 = newScope pkgs.kde4 ../tools/text/kdiff3 { }; - keychain = callPackage ../tools/misc/keychain { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -1162,8 +1158,6 @@ let polkit_gnome = callPackage ../tools/security/polkit-gnome { }; - polkit_kde_agent = newScope pkgs.kde4 ../tools/security/polkit-kde-agent { }; - povray = callPackage ../tools/graphics/povray { }; ppl = callPackage ../development/libraries/ppl { }; @@ -3625,8 +3619,6 @@ let judy = callPackage ../development/libraries/judy { }; - kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; lcms = lcms1; @@ -3790,14 +3782,10 @@ let useGTK = getConfig [ "libiodbc" "gtk" ] false; }; - libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { }; - liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; liblastfm = callPackage ../development/libraries/liblastfm { }; - liblikeback = newScope pkgs.kde4 ../development/libraries/liblikeback { }; - liblqr1 = callPackage ../development/libraries/liblqr-1 { inherit (gnome) glib; }; @@ -4304,18 +4292,6 @@ let qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; - quassel = newScope pkgs.kde4 ../applications/networking/irc/quassel { }; - - quasselDaemon = appendToName "daemon" (quassel.override { - monolithic = false; - daemon = true; - }); - - quasselClient = appendToName "client" (quassel.override { - monolithic = false; - client = true; - }); - quesoglc = callPackage ../development/libraries/quesoglc { }; qwt = callPackage ../development/libraries/qwt {}; @@ -6109,10 +6085,6 @@ let adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; - akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { }; - - amarok = newScope pkgs.kde4 ../applications/audio/amarok { }; - amsn = callPackage ../applications/networking/instant-messengers/amsn { libstdcpp = gcc33.gcc; }; @@ -6153,8 +6125,6 @@ let cairo = cairo.override { xcbSupport = true; }; }; - bangarang = newScope pkgs.kde4 ../applications/video/bangarang { }; - batik = callPackage ../applications/graphics/batik { }; bazaar = callPackage ../applications/version-management/bazaar { }; @@ -6168,9 +6138,7 @@ let guile = guile_1_8; }; - bibletime = newScope pkgs.kde45 ../applications/misc/bibletime { - qt = qt4; - }; + bibletime = callPackage ../applications/misc/bibletime { }; bitcoin = callPackage ../applications/misc/bitcoin { wxGTK = wxGTK290; @@ -6285,8 +6253,6 @@ let dia = callPackage ../applications/graphics/dia { }; - digikam = newScope pkgs.kde4 ../applications/graphics/digikam { }; - djvulibre = callPackage ../applications/misc/djvulibre { }; djview4 = callPackage ../applications/graphics/djview { }; @@ -6471,9 +6437,6 @@ let feh = callPackage ../applications/graphics/feh { }; - filelight = if pkgs.kde4.kdeutils ? filelight then pkgs.kde4.kdeutils.filelight - else newScope pkgs.kde4 ../applications/misc/filelight { }; - firefox = pkgs.firefoxPkgs.firefox; firefoxWrapper = wrapFirefox pkgs.firefox "firefox" ""; @@ -6778,20 +6741,6 @@ let jwm = callPackage ../applications/window-managers/jwm { }; - k3b = newScope pkgs.kde4 ../applications/misc/k3b { }; - - kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { }; - - kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; - - kde_wacomtablet = newScope pkgs.kde4 ../applications/misc/kde-wacomtablet { }; - - kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { }; - - kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { }; - - kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { }; - keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; }; @@ -6802,28 +6751,6 @@ let inherit (gnome) libglade; }; - kipi_plugins = newScope pkgs.kde47 ../applications/graphics/kipi-plugins { - inherit (pkgs.gtkLibs) gdk_pixbuf; - }; - - kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer { - inherit (pkgs.gtkLibs) pango; - }; - - koffice = newScope pkgs.kde4 ../applications/office/koffice { }; - - konq_plugins = newScope pkgs.kde4 ../applications/networking/browsers/konq-plugins { }; - - konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { }; - - krename = newScope pkgs.kde4 ../applications/misc/krename { - qt = qt4; - }; - - krusader = newScope pkgs.kde4 ../applications/misc/krusader { }; - - ktorrent = newScope pkgs.kde4 ../applications/networking/p2p/ktorrent { }; - lame = callPackage ../applications/audio/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -7042,8 +6969,6 @@ let paraview = callPackage ../applications/graphics/paraview { }; - partitionManager = newScope pkgs.kde4 ../tools/misc/partition-manager { }; - pdftk = callPackage ../tools/typesetting/pdftk { }; pidgin = callPackage ../applications/networking/instant-messengers/pidgin { @@ -7127,10 +7052,6 @@ let libstdcpp5 = gcc33.gcc; }; - rekonq = newScope pkgs.kde4 ../applications/networking/browsers/rekonq { }; - - rsibreak = newScope pkgs.kde4 ../applications/misc/rsibreak { }; - recode = callPackage ../tools/text/recode { }; retroshare = callPackage ../applications/networking/p2p/retroshare { @@ -7166,8 +7087,6 @@ let wxGTK = wxGTK28.override { unicode = false; }; }; - semnotes = newScope pkgs.kde4 ../applications/misc/semnotes { }; - seq24 = callPackage ../applications/audio/seq24 { inherit (gtkLibs) gtkmm; }; @@ -7529,8 +7448,6 @@ let qgis = callPackage ../applications/misc/qgis {}; - yakuake = newScope pkgs.kde4 ../applications/misc/yakuake { }; - yoshimi = callPackage ../applications/audio/yoshimi { fltk = fltk11; }; @@ -7867,16 +7784,74 @@ let }; - kde4 = kde45; + kde4 = recurseIntoAttrs pkgs.kde45; - kde45 = callPackage ../desktops/kde-4.5 { - callPackage = newScope pkgs.kde45; - }; + kde45 = kdePackagesFor pkgs.kde45 "4.5"; + kde47 = kdePackagesFor pkgs.kde47 "4.7"; - kde47 = callPackage ../desktops/kde-4.7 { - callPackage = newScope pkgs.kde47; - callPackageOrig = callPackage; - }; + kdePackagesFor = self: version: + let callPackageOrig = callPackage; in + let + callPackage = newScope self; + kde4 = callPackageOrig (../desktops/kde- + version) { + inherit callPackage callPackageOrig; + }; + in + ({ + inherit kde4; + + recurseForRelease = true; + + akunambol = callPackage ../applications/networking/sync/akunambol { }; + amarok = callPackage ../applications/audio/amarok { }; + bangarang = callPackage ../applications/video/bangarang { }; + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; + digikam = callPackage ../applications/graphics/digikam { }; + filelight = callPackage ../applications/misc/filelight { }; + k3b = callPackage ../applications/misc/k3b { }; + kadu = callPackage ../applications/networking/instant-messengers/kadu { }; + kbluetooth = callPackage ../tools/bluetooth/kbluetooth { }; + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; + kdenlive = callPackage ../applications/video/kdenlive { }; + kdesvn = callPackage ../applications/version-management/kdesvn { }; + kdevelop = callPackage ../applications/editors/kdevelop { }; + kdevplatform = callPackage ../development/libraries/kdevplatform { }; + kdiff3 = callPackage ../tools/text/kdiff3 { }; + kmplayer = callPackage ../applications/video/kmplayer { + inherit (pkgs.gtkLibs) pango; + }; + kipi_plugins = callPackage ../applications/graphics/kipi-plugins { + inherit (pkgs.gtkLibs) gdk_pixbuf; + }; + koffice = callPackage ../applications/office/koffice { }; + konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; + konversation = callPackage ../applications/networking/irc/konversation { }; + krename = callPackage ../applications/misc/krename { }; + krusader = callPackage ../applications/misc/krusader { }; + ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; + libktorrent = callPackage ../development/libraries/libktorrent { }; + liblikeback = callPackage ../development/libraries/liblikeback { }; + partitionManager = callPackage ../tools/misc/partition-manager { }; + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; + + quassel = callPackage ../applications/networking/irc/quassel { }; + + quasselDaemon = appendToName "daemon" (self.quassel.override { + monolithic = false; + daemon = true; + }); + + quasselClient = appendToName "client" (self.quassel.override { + monolithic = false; + client = true; + }); + + rekonq = callPackage ../applications/networking/browsers/rekonq { }; + rsibreak = callPackage ../applications/misc/rsibreak { }; + semnotes = callPackage ../applications/misc/semnotes { }; + yakuake = callPackage ../applications/misc/yakuake { }; + } // kde4); redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm @@ -8257,8 +8232,6 @@ let polytable = callPackage ../misc/tex/polytable { }; - psi = newScope pkgs.kde45 ../applications/networking/instant-messengers/psi { }; - uae = callPackage ../misc/emulators/uae { }; putty = callPackage ../applications/networking/remote/putty { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fa19853b3d6..490d943cf20 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -167,7 +167,6 @@ with (import ./release-lib.nix); kbd = linux; keen4 = ["i686-linux"]; # klibc = linux; - ktorrent = linux; kvm = linux; qemu = linux; qemu_kvm = linux; From fde10569b0adc0a5d0b387dd055252bc7b904f6d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Aug 2011 14:22:09 +0000 Subject: [PATCH 027/504] * Added XML::LibXSLT. * Updated XML::LibXML. svn path=/nixpkgs/trunk/; revision=28835 --- pkgs/top-level/perl-packages.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 19bf73bcea4..ca740b488b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3509,24 +3509,25 @@ rec { propagatedBuildInputs = [XMLRegExp XMLParser LWP libxml_perl]; }; - XMLLibXML = buildPerlPackage { - name = "XML-LibXML-1.70"; + XMLLibXML = buildPerlPackage rec { + name = "XML-LibXML-1.86"; src = fetchurl { - url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz; - sha256 = "181viglnw93kz9w3bvs8dqvx4xnqvf448vnwam8dia9bfw3czrjk"; + url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz"; + sha256 = "0wgf9898vmjac4mr2k4zvz6aw7nx0yvfv8f093y6w44vv6prxchp"; }; - SKIP_SAX_INSTALL=1; - buildInputs = [pkgs.libxml2]; - propagatedBuildInputs = [XMLLibXMLCommon XMLSAX]; + SKIP_SAX_INSTALL = 1; + buildInputs = [ pkgs.libxml2 ]; + propagatedBuildInputs = [ XMLSAX ]; }; - XMLLibXMLCommon = buildPerlPackage { - name = "XML-LibXML-Common-0.13"; + XMLLibXSLT = buildPerlPackage rec { + name = "XML-LibXSLT-1.70"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Common-0.13.tar.gz; - md5 = "13b6d93f53375d15fd11922216249659"; + url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz"; + sha256 = "0x8lqlxr6xhgwwa6zj4shrwrqlgbgs0piripc1fsnw4z1yl2gf9p"; }; - buildInputs = [pkgs.libxml2]; + buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; + propagatedBuildInputs = [ XMLLibXML ]; }; XMLNamespaceSupport = buildPerlPackage { From 2683407fe4fa0386a3b39c9f34763fab6258f11f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 26 Aug 2011 14:57:48 +0000 Subject: [PATCH 028/504] Add newer dbus and dbus-glib Old versions are kept to prevent huge rebuild svn path=/nixpkgs/trunk/; revision=28836 --- pkgs/development/libraries/dbus-glib/0.94.nix | 23 +++++++ .../libraries/dbus-glib/default.nix | 2 +- pkgs/development/libraries/dbus/1.5.6.nix | 61 +++++++++++++++++++ pkgs/development/libraries/dbus/default.nix | 16 ++--- pkgs/os-specific/linux/upower/default.nix | 7 +-- pkgs/top-level/all-packages.nix | 14 ++++- 6 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/dbus-glib/0.94.nix create mode 100644 pkgs/development/libraries/dbus/1.5.6.nix diff --git a/pkgs/development/libraries/dbus-glib/0.94.nix b/pkgs/development/libraries/dbus-glib/0.94.nix new file mode 100644 index 00000000000..83c1693d80f --- /dev/null +++ b/pkgs/development/libraries/dbus-glib/0.94.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: + +stdenv.mkDerivation rec { + name = "dbus-glib-0.94"; + + src = fetchurl { + url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; + sha256 = "16yk106bp58in6vz2li2s3iwk1si65f0n22m8c2mplzh2j9zlq74"; + }; + + buildInputs = [ pkgconfig expat gettext ] + ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + + propagatedBuildInputs = [ dbus glib ]; + + passthru = { inherit dbus glib; }; + + meta = { + homepage = http://dbus.freedesktop.org; + license = "AFL-2.1 or GPL-2"; + description = "GLib bindings for D-Bus lightweight IPC mechanism"; + }; +} diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 4a2cd6f4cf9..467b9c4d506 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "dbus-glib-0.86"; - + src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak"; diff --git a/pkgs/development/libraries/dbus/1.5.6.nix b/pkgs/development/libraries/dbus/1.5.6.nix new file mode 100644 index 00000000000..a5ba03159f1 --- /dev/null +++ b/pkgs/development/libraries/dbus/1.5.6.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: + +let + version = "1.5.6"; + + src = fetchurl { + url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + sha256 = "18g5328wnh25p0hihv5gg55q5l019zzwr04shvp67myvwy07m851"; + }; + + patches = [ ./ignore-missing-includedirs.patch ]; + + configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; + +in rec { + + libs = stdenv.mkDerivation { + name = "dbus-library-" + version; + + buildInputs = [ pkgconfig expat ]; + + inherit src patches configureFlags; + + preConfigure = + '' + sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in + sed -i '/SUBDIRS/s/ tools//' Makefile.in + ''; + + # Enable X11 autolaunch support in libdbus. This doesn't actually + # depend on X11 (it just execs dbus-launch in dbus.tools), + # contrary to what the configure script demands. + NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; + + installFlags = "sysconfdir=$(out)/etc"; + }; + + tools = stdenv.mkDerivation { + name = "dbus-tools-" + version; + + inherit src patches; + + configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; + + buildInputs = [ pkgconfig expat libs ] + ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; + + NIX_LDFLAGS = "-ldbus-1"; + + preConfigure = + '' + sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in + substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' + ''; + + postConfigure = "cd tools"; + }; + + # I'm too lazy to separate daemon and libs now. + daemon = libs; +} diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 16d685e4d81..1d0bcc11146 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -2,25 +2,25 @@ let version = "1.4.14"; - + src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7"; }; patches = [ ./ignore-missing-includedirs.patch ]; - + configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; - + in rec { libs = stdenv.mkDerivation { name = "dbus-library-" + version; - + buildInputs = [ pkgconfig expat ]; - + inherit src patches configureFlags; - + preConfigure = '' sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in @@ -41,10 +41,10 @@ in rec { inherit src patches; configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; - + buildInputs = [ pkgconfig expat libs ] ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; - + NIX_LDFLAGS = "-ldbus-1"; preConfigure = diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 441a1a06c40..b0feb09cb86 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6"; }; - buildInputs = - [ xz pkgconfig glib dbus dbus_glib polkit intltool - libxslt docbook_xsl udev libusb1 - ]; + buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; + + buildNativeInputs = [ xz pkgconfig ]; configureFlags = "--with-backend=linux --localstatedir=/var"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f52a624d327..d416c5eff42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3144,10 +3144,16 @@ let useX11 = true; }; - dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) { - inherit fetchurl stdenv pkgconfig gettext dbus expat glib libiconv; + dbus_all_1_5_6 = callPackage ../development/libraries/dbus/1.5.6.nix { + useX11 = true; }; + dbus_glib_0_94 = callPackage ../development/libraries/dbus-glib/0.94.nix { + dbus = pkgs.dbus_all_1_5_6.libs; + }; + + dbus_glib = callPackage ../development/libraries/dbus-glib { }; + dbus_java = callPackage ../development/libraries/java/dbus-java { }; dclib = callPackage ../development/libraries/dclib { }; @@ -5858,7 +5864,9 @@ let untie = callPackage ../os-specific/linux/untie {}; - upower = callPackage ../os-specific/linux/upower { }; + upower = callPackage ../os-specific/linux/upower { + dbus_glib = pkgs.dbus_glib_0_94; + }; upstart = callPackage ../os-specific/linux/upstart { }; From 5d6cc2ef8442d91f8d373e322601abda94c076bb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 26 Aug 2011 16:02:43 +0000 Subject: [PATCH 029/504] Add note about drop-kde4.5 branch svn path=/nixpkgs/trunk/; revision=28841 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d416c5eff42..b79ecf611a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7794,6 +7794,8 @@ let kde4 = recurseIntoAttrs pkgs.kde45; + # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5 + # This branch removes kde45 and quite a few compatibility hacks kde45 = kdePackagesFor pkgs.kde45 "4.5"; kde47 = kdePackagesFor pkgs.kde47 "4.7"; From 3244114412532610d7927c8a5037fa4ef94e7c6f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 26 Aug 2011 20:08:46 +0000 Subject: [PATCH 030/504] Remove copies from hydra jobs Namely, kde45.kde4.kdenetwork == kde45.kdenetwork etc. svn path=/nixpkgs/trunk/; revision=28843 --- pkgs/desktops/kde-4.5/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 746df45af34..9381107ef6f 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -18,8 +18,6 @@ let in rec { - recurseForRelease = true; - inherit callPackage stdenv; qt4 = qt47; From ce77d02c9e334b8a9fa0342049ed9335bc9c60a5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Aug 2011 07:22:17 +0000 Subject: [PATCH 031/504] Update Wine svn path=/nixpkgs/trunk/; revision=28844 --- pkgs/misc/emulators/wine/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix index 3883a48d056..b6669843896 100644 --- a/pkgs/misc/emulators/wine/src-for-default.nix +++ b/pkgs/misc/emulators/wine/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.3.26"; - name="wine-1.3.26"; - hash="0x2frnggg2nlva1qqx4ysdnhcq9gld0p0516z922rl8c1kcb5bbc"; + version="1.3.27"; + name="wine-1.3.27"; + hash="1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1"; url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2"; - advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.26.tar.bz2"; + advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2"; } From a4d460f52abd28ca1034eddfdffa38b77fdb8015 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Aug 2011 07:27:35 +0000 Subject: [PATCH 032/504] Update SBCL svn path=/nixpkgs/trunk/; revision=28845 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 5c10638805d..364fbd621d7 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.50"; - name="sbcl-1.0.50"; - hash="1asbb43rmrp87ia2kq66ymdlgdx3jvihlz3dlgwhlz7syd9z3wc3"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2"; + version="1.0.51"; + name="sbcl-1.0.51"; + hash="0kh7c7pgiv0k0rsm1iysbcp0hf2148fhpixi4d8kclryzqpzl9yj"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2"; } From f823626fd8534d8a8b539d083b4712a1aad21190 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 27 Aug 2011 13:44:36 +0000 Subject: [PATCH 033/504] * Get Firefox 6.0 to build with an upstream patch for building Firefox separately from Xulrunner (https://bugzilla.mozilla.org/show_bug.cgi?id=639554). svn path=/nixpkgs/trunk/; revision=28846 --- .../firefox/6.0-install-sdk-bin.patch | 35 +++++++++++++++++++ .../networking/browsers/firefox/6.0.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch diff --git a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch new file mode 100644 index 00000000000..30fe15c6e48 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Chris Coulson +# Date 1306390403 -7200 +# Node ID 99672871e93003520189cfe3a684ebbea151cb4b +# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e +Bug 639554 - Install sdk/bin with make install. r=bsmedberg + +diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk +--- a/toolkit/mozapps/installer/packager.mk ++++ b/toolkit/mozapps/installer/packager.mk +@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) + $(NSINSTALL) -D $(DESTDIR)$(idldir) + (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(idldir) && tar -xf -) + # SDK directory is the libs + a bunch of symlinks + $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib ++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin + if test -f $(DIST)/include/xpcom-config.h; then \ + $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ + fi + (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) ++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) + $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl + ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib + ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin + ln -s $(includedir) $(DESTDIR)$(sdkdir)/include + ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl + endif # INSTALL_SDK + + make-sdk: + diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix index 7535cfb201e..7de26f0c521 100644 --- a/pkgs/applications/networking/browsers/firefox/6.0.nix +++ b/pkgs/applications/networking/browsers/firefox/6.0.nix @@ -51,6 +51,8 @@ rec { inherit src; + patches = [ ./6.0-install-sdk-bin.patch ]; + buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b79ecf611a5..3b1cbcf2d0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6449,7 +6449,7 @@ let firefoxWrapper = wrapFirefox pkgs.firefox "firefox" ""; - firefoxPkgs = pkgs.firefox50Pkgs; + firefoxPkgs = pkgs.firefox60Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; @@ -6470,7 +6470,7 @@ let inherit (gnome) libIDL; }; - firefox60Wrapper = lowPrio (wrapFirefox firefox60Pkgs.firefox "firefox" ""); + firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" ""; firefox70b1Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { inherit (gtkLibs) gtk pango; From b44f2c7ad3a9134cee6a7edf57d64039739a0fd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 27 Aug 2011 15:19:05 +0000 Subject: [PATCH 034/504] * Add polkit-kde-agent to the channel. svn path=/nixpkgs/trunk/; revision=28847 --- pkgs/tools/security/polkit-kde-agent/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix index eff290f54fa..10836366b18 100644 --- a/pkgs/tools/security/polkit-kde-agent/default.nix +++ b/pkgs/tools/security/polkit-kde-agent/default.nix @@ -13,4 +13,9 @@ stdenv.mkDerivation rec { buildNativeInputs = [ gettext ]; patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt"; + + meta = { + platforms = stdenv.lib.platforms.linux; + description = "PolicyKit authentication agent for KDE"; + }; } From 3f02dcf735cdada54218192fc8ae2b77cdb5b89c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 27 Aug 2011 15:19:19 +0000 Subject: [PATCH 035/504] * Fix indentation/layout. svn path=/nixpkgs/trunk/; revision=28848 --- pkgs/top-level/all-packages.nix | 151 +++++++++++++++++++------------- 1 file changed, 90 insertions(+), 61 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b1cbcf2d0d..28f0388cd43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7800,68 +7800,97 @@ let kde47 = kdePackagesFor pkgs.kde47 "4.7"; kdePackagesFor = self: version: - let callPackageOrig = callPackage; in - let - callPackage = newScope self; - kde4 = callPackageOrig (../desktops/kde- + version) { - inherit callPackage callPackageOrig; + let callPackageOrig = callPackage; in + let + callPackage = newScope self; + kde4 = callPackageOrig (../desktops/kde- + version) { + inherit callPackage callPackageOrig; + }; + in kde4 // { + inherit kde4; + + recurseForRelease = true; + + akunambol = callPackage ../applications/networking/sync/akunambol { }; + + amarok = callPackage ../applications/audio/amarok { }; + + bangarang = callPackage ../applications/video/bangarang { }; + + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; + + digikam = callPackage ../applications/graphics/digikam { }; + + filelight = callPackage ../applications/misc/filelight { }; + + k3b = callPackage ../applications/misc/k3b { }; + + kadu = callPackage ../applications/networking/instant-messengers/kadu { }; + + kbluetooth = callPackage ../tools/bluetooth/kbluetooth { }; + + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; + + kdenlive = callPackage ../applications/video/kdenlive { }; + + kdesvn = callPackage ../applications/version-management/kdesvn { }; + + kdevelop = callPackage ../applications/editors/kdevelop { }; + + kdevplatform = callPackage ../development/libraries/kdevplatform { }; + + kdiff3 = callPackage ../tools/text/kdiff3 { }; + + kmplayer = callPackage ../applications/video/kmplayer { + inherit (pkgs.gtkLibs) pango; + }; + + kipi_plugins = callPackage ../applications/graphics/kipi-plugins { + inherit (pkgs.gtkLibs) gdk_pixbuf; + }; + + koffice = callPackage ../applications/office/koffice { }; + + konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; + + konversation = callPackage ../applications/networking/irc/konversation { }; + + krename = callPackage ../applications/misc/krename { }; + + krusader = callPackage ../applications/misc/krusader { }; + + ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; + + libktorrent = callPackage ../development/libraries/libktorrent { }; + + liblikeback = callPackage ../development/libraries/liblikeback { }; + + partitionManager = callPackage ../tools/misc/partition-manager { }; + + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; + + psi = callPackage ../applications/networking/instant-messengers/psi { }; + + quassel = callPackage ../applications/networking/irc/quassel { }; + + quasselDaemon = appendToName "daemon" (self.quassel.override { + monolithic = false; + daemon = true; + }); + + quasselClient = appendToName "client" (self.quassel.override { + monolithic = false; + client = true; + }); + + rekonq = callPackage ../applications/networking/browsers/rekonq { }; + + rsibreak = callPackage ../applications/misc/rsibreak { }; + + semnotes = callPackage ../applications/misc/semnotes { }; + + yakuake = callPackage ../applications/misc/yakuake { }; }; - in - ({ - inherit kde4; - - recurseForRelease = true; - - akunambol = callPackage ../applications/networking/sync/akunambol { }; - amarok = callPackage ../applications/audio/amarok { }; - bangarang = callPackage ../applications/video/bangarang { }; - bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - digikam = callPackage ../applications/graphics/digikam { }; - filelight = callPackage ../applications/misc/filelight { }; - k3b = callPackage ../applications/misc/k3b { }; - kadu = callPackage ../applications/networking/instant-messengers/kadu { }; - kbluetooth = callPackage ../tools/bluetooth/kbluetooth { }; - kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; - kdenlive = callPackage ../applications/video/kdenlive { }; - kdesvn = callPackage ../applications/version-management/kdesvn { }; - kdevelop = callPackage ../applications/editors/kdevelop { }; - kdevplatform = callPackage ../development/libraries/kdevplatform { }; - kdiff3 = callPackage ../tools/text/kdiff3 { }; - kmplayer = callPackage ../applications/video/kmplayer { - inherit (pkgs.gtkLibs) pango; - }; - kipi_plugins = callPackage ../applications/graphics/kipi-plugins { - inherit (pkgs.gtkLibs) gdk_pixbuf; - }; - koffice = callPackage ../applications/office/koffice { }; - konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; - konversation = callPackage ../applications/networking/irc/konversation { }; - krename = callPackage ../applications/misc/krename { }; - krusader = callPackage ../applications/misc/krusader { }; - ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; - liblikeback = callPackage ../development/libraries/liblikeback { }; - partitionManager = callPackage ../tools/misc/partition-manager { }; - polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; - - quassel = callPackage ../applications/networking/irc/quassel { }; - - quasselDaemon = appendToName "daemon" (self.quassel.override { - monolithic = false; - daemon = true; - }); - - quasselClient = appendToName "client" (self.quassel.override { - monolithic = false; - client = true; - }); - - rekonq = callPackage ../applications/networking/browsers/rekonq { }; - rsibreak = callPackage ../applications/misc/rsibreak { }; - semnotes = callPackage ../applications/misc/semnotes { }; - yakuake = callPackage ../applications/misc/yakuake { }; - } // kde4); redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm From fb3a64c9345ab5b030fd92537d0349344579e345 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 27 Aug 2011 15:29:04 +0000 Subject: [PATCH 036/504] Gdb: Remove un-neccessary --with-python. svn path=/nixpkgs/trunk/; revision=28849 --- pkgs/development/tools/misc/gdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index c29fcc994e2..b2ce5aa6297 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; '' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline - --with-expat --with-libexpat-prefix=${expat} --with-python + --with-expat --with-libexpat-prefix=${expat} '' + optionalString (target != null) " --target=${target.config}" + optionalString (elem stdenv.system platforms.cygwin) " --without-python" From 6e9492d7fdf8327f1367d409c2161823869a673f Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 27 Aug 2011 15:29:13 +0000 Subject: [PATCH 037/504] Fix mozilla urls. svn path=/nixpkgs/trunk/; revision=28850 --- pkgs/applications/networking/browsers/firefox/3.6.nix | 4 ++-- pkgs/applications/networking/browsers/firefox/5.0.nix | 4 ++-- pkgs/applications/networking/browsers/firefox/6.0.nix | 4 ++-- pkgs/applications/networking/mailreaders/thunderbird/3.x.nix | 2 +- pkgs/applications/networking/mailreaders/thunderbird/5.x.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index e26b5973215..9c3c6c72cc6 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -101,7 +101,7 @@ rec { meta = { description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { inherit gtk; version = xulVersion; }; @@ -141,7 +141,7 @@ rec { meta = { description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix index 1cc625edf7c..f59d50fb6de 100644 --- a/pkgs/applications/networking/browsers/firefox/5.0.nix +++ b/pkgs/applications/networking/browsers/firefox/5.0.nix @@ -108,7 +108,7 @@ rec { meta = { description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { inherit gtk; version = xulVersion; }; @@ -154,7 +154,7 @@ rec { meta = { description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix index 7de26f0c521..15ddc4bffdd 100644 --- a/pkgs/applications/networking/browsers/firefox/6.0.nix +++ b/pkgs/applications/networking/browsers/firefox/6.0.nix @@ -110,7 +110,7 @@ rec { meta = { description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { inherit gtk; version = xulVersion; }; @@ -156,7 +156,7 @@ rec { meta = { description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix index b644837b377..cc21a5b0400 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation { meta = { description = "Mozilla Thunderbird, a full-featured email client"; - homepage = http://www.mozilla.org/en-US/thunderbird/; + homepage = http://www.mozilla.org/thunderbird/; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix index f80fde27654..a8ee384d81d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mozilla Thunderbird, a full-featured email client"; - homepage = http://www.mozilla.org/en-US/thunderbird/; + homepage = http://www.mozilla.org/thunderbird/; license = # Official branding implies thunderbird name and logo cannot be reuse, # see http://www.mozilla.org/foundation/licensing.html From b14e107495d10e89e4e48b642baf1e2dea3f4b52 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 27 Aug 2011 15:29:18 +0000 Subject: [PATCH 038/504] Doc: Fix location of thunderbird (2.x -> 3.x) expression. svn path=/nixpkgs/trunk/; revision=28851 --- doc/quick-start.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 9cacb1fcccf..2651e2a1eee 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -105,7 +105,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Thunderbird: pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix. + xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix">pkgs/applications/networking/mailreaders/thunderbird/3.x.nix. Lots of dependencies. From 6a49d6a92029d3d4fe03eef02b2fd9741e243d73 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Aug 2011 17:04:25 +0000 Subject: [PATCH 039/504] Re-add GNU TLS 2.12 - it does fix glib-networking svn path=/nixpkgs/trunk/; revision=28853 --- pkgs/desktops/gnome-2.28/default.nix | 2 +- .../platform/glib-networking/default.nix | 4 +- pkgs/development/libraries/gnutls/2.12.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/gnutls/2.12.nix diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index db458df1e64..36eb7b70be2 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -143,7 +143,7 @@ pkgs.makeOverridable }; glib_networking = import ./platform/glib-networking { - inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls + inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2 libproxy libgcrypt libtasn1; }; diff --git a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix index 5b7f590b29c..53ab1ba0840 100644 --- a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy +{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy , libgcrypt, libtasn1 }: @@ -19,6 +19,6 @@ stdenv.mkDerivation { ''; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libtool intltool gnutls libproxy libgcrypt + propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt libtasn1]; } diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix new file mode 100644 index 00000000000..c79ca0894cd --- /dev/null +++ b/pkgs/development/libraries/gnutls/2.12.nix @@ -0,0 +1,54 @@ +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle +, guileBindings, guile, pkgconfig }: + +assert guileBindings -> guile != null; + +stdenv.mkDerivation rec { + + name = "gnutls-2.12.9"; + + src = fetchurl { + url = "mirror://gnu/gnutls/${name}.tar.bz2"; + sha256 = "0ilfdyw6xr0w57aygmw1fvx56x2zh5la01y8bkx59crq927wk8bl"; + }; + + configurePhase = '' + ./configure --prefix="$out" \ + --disable-dependency-tracking --enable-fast-install \ + --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --without-p11-kit \ + ${if guileBindings + then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" + else ""} + ''; + + buildInputs = [ zlib lzo libtasn1 pkgconfig ] + ++ stdenv.lib.optional guileBindings guile; + + propagatedBuildInputs = [ nettle ]; + + doCheck = true; + + meta = { + description = "The GNU Transport Layer Security Library"; + + longDescription = '' + GnuTLS is a project that aims to develop a library which + provides a secure layer, over a reliable transport + layer. Currently the GnuTLS library implements the proposed + standards by the IETF's TLS working group. + + Quoting from the TLS protocol specification: + + "The TLS protocol provides communications privacy over the + Internet. The protocol allows client/server applications to + communicate in a way that is designed to prevent eavesdropping, + tampering, or message forgery." + ''; + + homepage = http://www.gnu.org/software/gnutls/; + license = "LGPLv2.1+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28f0388cd43..374193b131b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3438,6 +3438,10 @@ let guileBindings = getConfig ["gnutls" "guile"] true; }; + gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { + guileBindings = getConfig ["gnutls" "guile"] true; + }; + gpgme = callPackage ../development/libraries/gpgme { }; grantlee = callPackage ../development/libraries/grantlee { }; From c7e097251cf3012602162412aebc5e2012e50de0 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 28 Aug 2011 00:16:43 +0000 Subject: [PATCH 040/504] Updating Encfs to 1.7.4 svn path=/nixpkgs/trunk/; revision=28854 --- pkgs/tools/filesystems/encfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index c950810026a..9ebab38984b 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, fuse, boost, rlog }: stdenv.mkDerivation { - name = "encfs-1.6.1"; + name = "encfs-1.7.4"; src = fetchurl { - url = "http://encfs.googlecode.com/files/encfs-1.6-1.tgz"; - sha256 = "0k50ic5nyibb9giif9dqm6sj20q0yzri3drg78m788z17xp060mw"; + url = "http://encfs.googlecode.com/files/encfs-1.7.4.tgz"; + sha256 = "1a3h47f4h0qdc0bf3vic1i8wrdw5nkx22mml4wsvmmrd9zqg0bi8"; }; buildInputs = [ boost fuse openssl rlog ]; From 14de7e8293cc1bbf93d4063b0372cc45baa267fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 28 Aug 2011 13:07:47 +0000 Subject: [PATCH 041/504] haskell-monad-control: updated to version 0.2.0.3 svn path=/nixpkgs/trunk/; revision=28855 --- pkgs/development/libraries/haskell/monad-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index 33ff47b2e05..b3d9208bd25 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.2.0.2"; - sha256 = "18kakshbjr6nspc6m2ckpbi3sx7r10qmmbh8qbzibg19n9mnq2ni"; + version = "0.2.0.3"; + sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh"; buildDepends = [ baseUnicodeSymbols transformers ]; meta = { homepage = "https://github.com/basvandijk/monad-control/"; From 353ec7a1281ab142a0c09125c223b2d5982bf02a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 28 Aug 2011 16:02:18 +0000 Subject: [PATCH 042/504] * CAcert bundle updated to the latest version (it was almost two years old). svn path=/nixpkgs/trunk/; revision=28856 --- pkgs/data/misc/cacert/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index f981c79b692..aa4212ea565 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20090922"; + name = "cacert-20110806"; src = fetchurl { - url = http://nixos.org/tarballs/cacert-20090922.pem.bz2; - sha256 = "1fakipxy5y62vslw6czj24pksh16b042py9v0199mxhzg5nmbmy7"; + url = "http://nixos.org/tarballs/${name}.pem.bz2"; + sha256 = "0vn1hic2a7p1vr2pf9hy8da4zm9qjndid4nwgj1m035y4ldjqlyw"; }; unpackPhase = "true"; From d528cba5b88076f88c7d32c9795811809aa6004e Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sun, 28 Aug 2011 16:03:14 +0000 Subject: [PATCH 043/504] fetchgit: Handle https. svn path=/nixpkgs/trunk/; revision=28857 --- pkgs/build-support/fetchgit/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 714740ee1bf..e94e4185936 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,4 +1,4 @@ -{stdenv, git}: +{stdenv, git, cacert}: {url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }: /* NOTE: @@ -35,6 +35,8 @@ stdenv.mkDerivation { inherit url rev leaveDotGit; + GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; + impureEnvVars = [ # We borrow these environment variables from the caller to allow # easy proxy configuration. This is impure, but a fixed-output diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 374193b131b..c94da50125d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -261,7 +261,7 @@ let }; fetchgit = import ../build-support/fetchgit { - inherit stdenv git; + inherit stdenv git cacert; }; fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; From 346481f4837e283f40882831f8d22846b896e2de Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Aug 2011 01:20:12 +0000 Subject: [PATCH 044/504] Add GHC 7.0.4 binary for x86_64-darwin svn path=/nixpkgs/trunk/; revision=28859 --- .../compilers/ghc/7.0.4-binary.nix | 104 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 108 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.0.4-binary.nix diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix new file mode 100644 index 00000000000..0767759ff16 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -0,0 +1,104 @@ +{stdenv, fetchurl, perl, ncurses, gmp}: + +let + supportedPlatforms = ["x86_64-darwin"]; +in + +assert stdenv.lib.elem stdenv.system supportedPlatforms; + +stdenv.mkDerivation rec { + version = "7.0.4"; + + name = "ghc-${version}-binary"; + + src = + if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; + sha256 = "1m2ml88p1swf4dnv2vq8hz4drcp46n3ahpfi05wh01ajkf8hnn3l"; + } + else throw "cannot bootstrap GHC on this platform"; + + buildInputs = [perl]; + + postUnpack = + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#!/bin/sh' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + PATH="$TMP/bin:$PATH" + done + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \; + '' + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + (if stdenv.isLinux then '' + find . -type f -perm +100 \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + for prog in ld ar gcc strip ranlib; do + find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; + done + '' else ""); + + configurePhase = '' + ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include + ''; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + buildPhase = "true"; + + # The binaries for Darwin use frameworks, so fake those frameworks, + # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so + # that the executables work with no special setup. + postInstall = + (if stdenv.isDarwin then + '' + ensureDir $out/frameworks/GMP.framework/Versions/A + ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP + ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP + # !!! fix this + + mv $out/bin $out/bin-orig + mkdir $out/bin + for i in $(cd $out/bin-orig && ls); do + echo "#! $SHELL -e" >> $out/bin/$i + echo "DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \$@" >> $out/bin/$i + chmod +x $out/bin/$i + done + '' else "") + + + '' + # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way + # sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp}/lib\",\2@" $out/lib/ghc-${version}/package.conf + + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + module Main where + main = putStrLn "yes" + EOF + $out/bin/ghc --make main.hs + echo compilation ok + [ $(./main) == "yes" ] + ''; + + meta.platforms = supportedPlatforms; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c94da50125d..7d90c8796a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2051,6 +2051,10 @@ let inherit fetchurl stdenv perl ncurses gmp; }); + ghc704Binary = lowPrio (import ../development/compilers/ghc/7.0.4-binary.nix { + inherit fetchurl stdenv perl ncurses gmp; + }); + # For several compiler versions, we export a large set of Haskell-related # packages. From e9c8a9307b3f96adb392ac10b46a53edd4461f99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:25:56 +0000 Subject: [PATCH 045/504] pkgs/development/compilers/ghc/7.0.4-binary.nix: support linux, too svn path=/nixpkgs/trunk/; revision=28860 --- pkgs/development/compilers/ghc/7.0.4-binary.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 0767759ff16..a536891d291 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, perl, ncurses, gmp}: let - supportedPlatforms = ["x86_64-darwin"]; + supportedPlatforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; in assert stdenv.lib.elem stdenv.system supportedPlatforms; @@ -12,7 +12,17 @@ stdenv.mkDerivation rec { name = "ghc-${version}-binary"; src = - if stdenv.system == "x86_64-darwin" then + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; + sha256 = "0mfnihiyjl06f5w1yrjp36sw9g67g2ymg5sdl0g23h1pab99jx63"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; + sha256 = "0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; sha256 = "1m2ml88p1swf4dnv2vq8hz4drcp46n3ahpfi05wh01ajkf8hnn3l"; From 33597eee355d835b2e83aae639d75ef4a509ae09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:32:37 +0000 Subject: [PATCH 046/504] pkgs/development/compilers/ghc/7.0.4-binary.nix: pass "$@" in double quotes to avoid issues with arguments that contain whitespace svn path=/nixpkgs/trunk/; revision=28861 --- pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index a536891d291..2f636531718 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { mkdir $out/bin for i in $(cd $out/bin-orig && ls); do echo "#! $SHELL -e" >> $out/bin/$i - echo "DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \$@" >> $out/bin/$i + echo "DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \"\$@\"" >> $out/bin/$i chmod +x $out/bin/$i done '' else "") From 7d9ac730588b1b214bf2a57ec7de34514512e73e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:39:08 +0000 Subject: [PATCH 047/504] pkgs/top-level/all-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=28862 --- pkgs/top-level/all-packages.nix | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d90c8796a7..ac5fcd1cc23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7820,63 +7820,63 @@ let recurseForRelease = true; akunambol = callPackage ../applications/networking/sync/akunambol { }; - + amarok = callPackage ../applications/audio/amarok { }; - + bangarang = callPackage ../applications/video/bangarang { }; - + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - + digikam = callPackage ../applications/graphics/digikam { }; - + filelight = callPackage ../applications/misc/filelight { }; - + k3b = callPackage ../applications/misc/k3b { }; - + kadu = callPackage ../applications/networking/instant-messengers/kadu { }; - + kbluetooth = callPackage ../tools/bluetooth/kbluetooth { }; - + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; - + kdenlive = callPackage ../applications/video/kdenlive { }; - + kdesvn = callPackage ../applications/version-management/kdesvn { }; - + kdevelop = callPackage ../applications/editors/kdevelop { }; - + kdevplatform = callPackage ../development/libraries/kdevplatform { }; - + kdiff3 = callPackage ../tools/text/kdiff3 { }; - + kmplayer = callPackage ../applications/video/kmplayer { inherit (pkgs.gtkLibs) pango; }; - + kipi_plugins = callPackage ../applications/graphics/kipi-plugins { inherit (pkgs.gtkLibs) gdk_pixbuf; }; - + koffice = callPackage ../applications/office/koffice { }; - + konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; - + konversation = callPackage ../applications/networking/irc/konversation { }; - + krename = callPackage ../applications/misc/krename { }; - + krusader = callPackage ../applications/misc/krusader { }; - + ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; - + libktorrent = callPackage ../development/libraries/libktorrent { }; - + liblikeback = callPackage ../development/libraries/liblikeback { }; - + partitionManager = callPackage ../tools/misc/partition-manager { }; - + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; - + psi = callPackage ../applications/networking/instant-messengers/psi { }; quassel = callPackage ../applications/networking/irc/quassel { }; @@ -7892,11 +7892,11 @@ let }); rekonq = callPackage ../applications/networking/browsers/rekonq { }; - + rsibreak = callPackage ../applications/misc/rsibreak { }; - + semnotes = callPackage ../applications/misc/semnotes { }; - + yakuake = callPackage ../applications/misc/yakuake { }; }; From 8286d304531942a0fc1a7ab233222362d94c89ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:39:29 +0000 Subject: [PATCH 048/504] pkgs/development/compilers/ghc/7.0.4.nix: add myself as a maintainer svn path=/nixpkgs/trunk/; revision=28863 --- pkgs/development/compilers/ghc/7.0.4.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 6f7d802fa0b..24ed4060d7e 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons ]; platforms = ghc.meta.platforms; }; From b6d994e9b7d60a0d7bc8818ba5461a2b52b9565b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:46:30 +0000 Subject: [PATCH 049/504] pkgs/top-level/all-packages.nix: bootstrap ghc 7.0.4 and 7.2.1 with 7.0.4-binary on Darwin svn path=/nixpkgs/trunk/; revision=28864 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac5fcd1cc23..9d03b703290 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2148,12 +2148,14 @@ let haskellPackages_ghc704 = haskellPackagesFun ../development/compilers/ghc/7.0.4.nix - ghc6101Binary (x : x.ghc704Prefs) false false (x : x); + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) false false (x : x); haskellPackages_ghc721 = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/7.2.1.nix - ghc6121Binary (x : x.ghc721Prefs) false false lowPrio); + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + (x : x.ghc721Prefs) false false lowPrio); # Still a release candidate. haskellPackages_ghcHEAD = From 7d9c4b06ad52a9bbd91fe8f507890e8fbb12fa38 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:46:38 +0000 Subject: [PATCH 050/504] pkgs/top-level/all-packages.nix: don't use tabs for indention svn path=/nixpkgs/trunk/; revision=28865 --- pkgs/top-level/all-packages.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d03b703290..8c71714ff81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5209,7 +5209,7 @@ let [ kernelPatches.fbcondecor_2_6_25 kernelPatches.sec_perm_2_6_24 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5220,7 +5220,7 @@ let [ kernelPatches.fbcondecor_2_6_25 kernelPatches.sec_perm_2_6_24 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5230,7 +5230,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_27 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5242,7 +5242,7 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.ext4_softlockups_2_6_28 kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 + kernelPatches.cifs_timeout_2_6_25 ]; }; @@ -5251,7 +5251,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_29 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5328,7 +5328,7 @@ let [ kernelPatches.fbcondecor_2_6_33 kernelPatches.aufs2_2_6_33 kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5354,7 +5354,7 @@ let [ /*kernelPatches.fbcondecor_2_6_33*/ kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_34 - kernelPatches.cifs_timeout_2_6_29 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5370,7 +5370,7 @@ let [ #kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_35 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 ] ++ lib.optional (platform.kernelArch == "arm") kernelPatches.sheevaplug_modules_2_6_35; }; @@ -5405,7 +5405,7 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_36 kernelPatches.mips_restart_2_6_36 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 ]; }; @@ -5443,7 +5443,7 @@ let [ kernelPatches.fbcondecor_2_6_37 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_37 - kernelPatches.cifs_timeout_2_6_35 + kernelPatches.cifs_timeout_2_6_35 #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5460,7 +5460,7 @@ let [ kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_38 - kernelPatches.cifs_timeout_2_6_38 + kernelPatches.cifs_timeout_2_6_38 #kernelPatches.mips_restart_2_6_36 ]; }; From f990dd30f7ece188db0236ce7e17f552bc308803 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:49:35 +0000 Subject: [PATCH 051/504] pkgs/development/compilers/ghc/7.0.4-binary.nix: added (untested) support for i686-darwin svn path=/nixpkgs/trunk/; revision=28866 --- pkgs/development/compilers/ghc/7.0.4-binary.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 2f636531718..c9e8e6a332b 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, perl, ncurses, gmp}: let - supportedPlatforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; in assert stdenv.lib.elem stdenv.system supportedPlatforms; @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; sha256 = "0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99"; } + else if stdenv.system == "i686-darwin" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2"; + sha256 = "0qj45hslrrr8zfks8m1jcb3awwx9rh35ndnpfmb0gwb6j7azq5n3"; + } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; From e211161c2c5e6f878940122fbf074985ab7ec46c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 07:57:01 +0000 Subject: [PATCH 052/504] haskell-tagged: updated to version 0.2.3.1 svn path=/nixpkgs/trunk/; revision=28867 --- pkgs/development/libraries/haskell/tagged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 5a2149fa116..1f30245a320 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.2.3"; - sha256 = "0d4nn0lrgj9v5hy7wgm56dgfvb5021z24sz0xmqxjy2pzq7fxwhc"; + version = "0.2.3.1"; + sha256 = "0ldc9w35yzlrz78kakkqial32g2c7da9b5v334jh5wpgsn7lrm3n"; buildDepends = [ dataDefault semigroups ]; meta = { homepage = "http://github.com/ekmett/tagged"; From 9381f1a419f1165b47a1ffe20fb3eeb0fee641b3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Aug 2011 08:00:55 +0000 Subject: [PATCH 053/504] ghc-7.0.4-binary.nix: don't wrap the binaries on darwin ghc-7.0.4 fails at configure with the wrapped binaries and builds fine with the unwrapped binaries. svn path=/nixpkgs/trunk/; revision=28868 --- .../compilers/ghc/7.0.4-binary.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index c9e8e6a332b..e696ddaf9ce 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -83,26 +83,7 @@ stdenv.mkDerivation rec { # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so # that the executables work with no special setup. postInstall = - (if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A - ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP - ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP - # !!! fix this - - mv $out/bin $out/bin-orig - mkdir $out/bin - for i in $(cd $out/bin-orig && ls); do - echo "#! $SHELL -e" >> $out/bin/$i - echo "DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \"\$@\"" >> $out/bin/$i - chmod +x $out/bin/$i - done - '' else "") - + - '' - # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way - # sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp}/lib\",\2@" $out/lib/ghc-${version}/package.conf - # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc From 3fe371b856f534fb8bbf411bd6c8b06758b65aab Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Aug 2011 08:09:27 +0000 Subject: [PATCH 054/504] ghc/7.0.4-binary.nix: Remove comments about wrapper scripts svn path=/nixpkgs/trunk/; revision=28869 --- pkgs/development/compilers/ghc/7.0.4-binary.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index e696ddaf9ce..0baf9718f85 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -79,9 +79,6 @@ stdenv.mkDerivation rec { # calls install-strip ... buildPhase = "true"; - # The binaries for Darwin use frameworks, so fake those frameworks, - # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so - # that the executables work with no special setup. postInstall = '' # Sanity check, can ghc create executables? From 6bd84d04a5446849bf2f86e0cd1aa53ff1ca1bac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 09:54:47 +0000 Subject: [PATCH 055/504] haskell-fclabels: updated to version 1.0.3 svn path=/nixpkgs/trunk/; revision=28870 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index e7e083210a8..01b3c71b4e2 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.0.2"; - sha256 = "14l7q481qx3fnln6xv5xvb8a8kphvh5dyd3d953wwrswqy0dr91l"; + version = "1.0.3"; + sha256 = "0sl45pv18qfyphixl9qyng5m6i19c9n18izkm278z6fvih2x5wd0"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From f9728ee0dbba7683ad7619a93f901b309cf25d57 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Aug 2011 10:06:12 +0000 Subject: [PATCH 056/504] Fix a typo svn path=/nixpkgs/trunk/; revision=28871 --- pkgs/build-support/fetchgit/nix-prefetch-git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 7082c86a2d2..01675ed02a7 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -210,7 +210,7 @@ else # If the hash was given, a file with that hash may already be in the # store. - if -n "$expHash"; then + if test -n "$expHash"; then finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export) if ! nix-store --check-validity "$finalPath" 2> /dev/null; then finalPath= @@ -251,4 +251,4 @@ else if test -n "$PRINT_PATH"; then echo $finalPath fi -fi \ No newline at end of file +fi From 04e84c2c1384c5b97290ca38f713c3921e6fe60d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Aug 2011 10:16:36 +0000 Subject: [PATCH 057/504] Adding netboot svn path=/nixpkgs/trunk/; revision=28872 --- pkgs/tools/networking/netboot/default.nix | 59 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/networking/netboot/default.nix diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix new file mode 100644 index 00000000000..3a191c6ef34 --- /dev/null +++ b/pkgs/tools/networking/netboot/default.nix @@ -0,0 +1,59 @@ +x@{builderDefsPackage + , fetchgit, ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + ["fetchgit"]; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="netboot"; + rev="19a955cd87b399a5b56"; + name="${baseName}-git-head"; + url="git://github.com/ITikhonov/netboot.git"; + hash="7610c734dc46183439c161d327e7ef6a3d5bc07b5173850b92f71ec047b109d6"; + }; +in +rec { + srcDrv = a.fetchgit { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + rev = sourceInfo.rev; + }; + + src=srcDrv + "/"; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doBuild" "doDeploy"]; + + doBuild = a.fullDepEntry '' + gcc netboot.c -o netboot + '' ["doUnpack" "addInputs"]; + + doDeploy = a.fullDepEntry '' + ensureDir "$out/bin" + cp netboot "$out/bin" + '' ["defEnsureDir" "minInit"]; + + meta = { + description = "Mini PXE server"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "free-noncopyleft"; + }; + passthru = { + updateInfo = { + downloadPage = "https://github.com/ITikhonov/netboot"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c71714ff81..79951a80480 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1006,6 +1006,8 @@ let ndisc6 = callPackage ../tools/networking/ndisc6 { }; + netboot = callPackage ../tools/networking/netboot {}; + netcat = callPackage ../tools/networking/netcat { }; netkittftp = callPackage ../tools/networking/netkit/tftp { }; From 946458d4f92f256a264858e3b650d1a1ac8fecb7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Aug 2011 10:31:10 +0000 Subject: [PATCH 058/504] Fixing tarball build svn path=/nixpkgs/trunk/; revision=28873 --- pkgs/tools/networking/netboot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index 3a191c6ef34..a834ffc3739 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -9,6 +9,7 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { + version="git-head-${rev}"; baseName="netboot"; rev="19a955cd87b399a5b56"; name="${baseName}-git-head"; From b612e07c0b7708b6ec59eb1d9de00cf0c08dfbbd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Aug 2011 12:47:39 +0000 Subject: [PATCH 059/504] Adding atftp svn path=/nixpkgs/trunk/; revision=28874 --- .../libraries/tcp-wrappers/default.nix | 74 + .../tcp-wrappers/have-strerror.patch | 20 + .../tcp-wrappers/trivial-fixes.patch | 27 + pkgs/tools/networking/atftp/debian.patch | 14965 ++++++++++++++++ pkgs/tools/networking/atftp/default.nix | 50 + pkgs/top-level/all-packages.nix | 4 + 6 files changed, 15140 insertions(+) create mode 100644 pkgs/development/libraries/tcp-wrappers/default.nix create mode 100644 pkgs/development/libraries/tcp-wrappers/have-strerror.patch create mode 100644 pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch create mode 100644 pkgs/tools/networking/atftp/debian.patch create mode 100644 pkgs/tools/networking/atftp/default.nix diff --git a/pkgs/development/libraries/tcp-wrappers/default.nix b/pkgs/development/libraries/tcp-wrappers/default.nix new file mode 100644 index 00000000000..1cb6472971c --- /dev/null +++ b/pkgs/development/libraries/tcp-wrappers/default.nix @@ -0,0 +1,74 @@ +x@{builderDefsPackage + , flex, bison + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="tcp-wrappers"; + version="7.6"; + name="${baseName}-${version}"; + url="http://ftp.porcupine.org/pub/security/tcp_wrappers_${version}.tar.gz"; + hash="0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["setVars" "doUnpack" "fixMakefile" "doPatch" + "doMake" "doDeploy"]; + + patches = [./have-strerror.patch ./trivial-fixes.patch]; + + makeFlags = [ + "REAL_DAEMON_DIR=$out/bin" + "STYLE='\"-DHAVE_STRERROR -DSYS_ERRLIST_DEFINED\"'" + "generic" + ]; + + setVars = a.noDepEntry '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lnsl" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" + ''; + + fixMakefile = a.fullDepEntry '' + chmod u+w Makefile + echo 'libwrap.so: $(LIB_OBJ)' >> Makefile + echo ' ld $(LIB_OBJ) --shared -o libwrap.so' >> Makefile + '' ["minInit"]; + + doDeploy = a.fullDepEntry '' + ensureDir "$out"/{sbin,lib} + make libwrap.so + cp libwrap.{a,so} "$out/lib" + find . -perm +111 -a ! -name '*.*' -exec cp '{}' "$out/sbin" ';' + '' ["defEnsureDir" "minInit"]; + + meta = { + description = "Network logging TCP wrappers"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "free-noncopyleft"; + }; + passthru = { + updateInfo = { + downloadPage = "http://ftp.porcupine.org/pub/security/index.html"; + }; + }; +}) x diff --git a/pkgs/development/libraries/tcp-wrappers/have-strerror.patch b/pkgs/development/libraries/tcp-wrappers/have-strerror.patch new file mode 100644 index 00000000000..626fce1a88a --- /dev/null +++ b/pkgs/development/libraries/tcp-wrappers/have-strerror.patch @@ -0,0 +1,20 @@ +Debian patch +diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c +--- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100 ++++ tcp_wrappers_7.6/percent_m.c 2003-08-21 02:45:31.000000000 +0200 +@@ -29,11 +29,15 @@ + + while (*bp = *cp) + if (*cp == '%' && cp[1] == 'm') { ++#ifdef HAVE_STRERROR ++ strcpy(bp, strerror(errno)); ++#else + if (errno < sys_nerr && errno > 0) { + strcpy(bp, sys_errlist[errno]); + } else { + sprintf(bp, "Unknown error %d", errno); + } ++#endif + bp += strlen(bp); + cp += 2; + } else { diff --git a/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch b/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch new file mode 100644 index 00000000000..1e55819f8de --- /dev/null +++ b/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch @@ -0,0 +1,27 @@ +Debian patch +diff -ruNp tcp_wrappers_7.6.orig/options.c tcp_wrappers_7.6/options.c +--- tcp_wrappers_7.6.orig/options.c 2006-03-01 23:45:28.000000000 +0100 ++++ tcp_wrappers_7.6/options.c 2006-03-01 22:55:44.000000000 +0100 +@@ -41,6 +41,7 @@ static char sccsid[] = "@(#) options.c 1 + #include + #include + #include ++#include + #include + #include + #include +diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c +--- tcp_wrappers_7.6.orig/scaffold.c 2006-03-01 23:45:28.000000000 +0100 ++++ tcp_wrappers_7.6/scaffold.c 2006-03-01 22:56:13.000000000 +0100 +@@ -17,6 +17,7 @@ static char sccs_id[] = "@(#) scaffold.c + #include + #include + #include ++#include + #include + #include + #include +@@ -28,3 +28,2 @@ + +-extern char *malloc(); + diff --git a/pkgs/tools/networking/atftp/debian.patch b/pkgs/tools/networking/atftp/debian.patch new file mode 100644 index 00000000000..759675973b6 --- /dev/null +++ b/pkgs/tools/networking/atftp/debian.patch @@ -0,0 +1,14965 @@ +--- atftp-0.7.dfsg.orig/tftpd_file.c ++++ atftp-0.7.dfsg/tftpd_file.c +@@ -110,8 +110,9 @@ + int block_number = 0; + int data_size; + int sockfd = data->sockfd; +- struct sockaddr_in *sa = &data->client_info->client; +- struct sockaddr_in from; ++ struct sockaddr_storage *sa = &data->client_info->client; ++ struct sockaddr_storage from; ++ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; + struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; + FILE *fp; + char filename[MAXLEN]; +@@ -269,7 +270,8 @@ + if (number_of_timeout > NB_OF_RETRY) + { + logger(LOG_INFO, "client (%s) not responding", +- inet_ntoa(data->client_info->client.sin_addr)); ++ sockaddr_print_addr(&data->client_info->client, ++ addr_str, sizeof(addr_str))); + state = S_END; + } + else +@@ -290,12 +292,13 @@ + * **** test since the port number is the TID. Use this + * **** only if you know what you're doing. + */ +- if (sa->sin_port != from.sin_port) ++ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) + { + if (data->checkport) + { + logger(LOG_WARNING, "packet discarded <%s>", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, addr_str, ++ sizeof(addr_str))); + break; + } + else +@@ -311,12 +314,13 @@ + break; + case GET_DATA: + /* Check that source port match */ +- if (sa->sin_port != from.sin_port) ++ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) + { + if (data->checkport) + { + logger(LOG_WARNING, "packet discarded <%s>", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, addr_str, ++ sizeof(addr_str))); + break; + } + else +@@ -328,7 +332,8 @@ + case GET_DISCARD: + /* FIXME: should we increment number_of_timeout */ + logger(LOG_WARNING, "packet discarded <%s>", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, addr_str, ++ sizeof(addr_str))); + break; + case ERR: + logger(LOG_ERR, "%s: %d: recvfrom: %s", +@@ -405,8 +410,9 @@ + int block_number = 0; + int last_block = -1; + int data_size; +- struct sockaddr_in *sa = &data->client_info->client; +- struct sockaddr_in from; ++ struct sockaddr_storage *sa = &data->client_info->client; ++ struct sockaddr_storage from; ++ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; + int sockfd = data->sockfd; + struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; + FILE *fp; +@@ -618,6 +624,8 @@ + } + else + { ++ struct addrinfo hints, *result; ++ + /* configure socket, get an IP address */ + if (tftpd_mcast_get_tid(&data->mc_addr, &data->mc_port) != OK) + { +@@ -629,29 +637,37 @@ + data->mc_addr, data->mc_port); + + /* convert address */ +- if (inet_aton(data->mc_addr, &data->sa_mcast.sin_addr) == 0) ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; ++ hints.ai_flags = AI_NUMERICHOST; ++ if (getaddrinfo(data->mc_addr, NULL, &hints, &result) || ++ sockaddr_set_addrinfo(&data->sa_mcast, result)) + { + logger(LOG_ERR, "bad address %s\n",data->mc_addr); + fclose(fp); + return ERR; + } +- data->sa_mcast.sin_family = AF_INET; /* FIXME: IPv6 */ +- data->sa_mcast.sin_port = htons(data->mc_port); ++ freeaddrinfo(result); ++ sockaddr_set_port(&data->sa_mcast, data->mc_port); ++ + /* verify address is multicast */ +- if (!IN_MULTICAST(ntohl(data->sa_mcast.sin_addr.s_addr))) ++ if (!sockaddr_is_multicast(&data->sa_mcast)) + { + logger(LOG_ERR, "bad multicast address %s\n", +- inet_ntoa(data->sa_mcast.sin_addr)); ++ sockaddr_print_addr(&data->sa_mcast, ++ addr_str, sizeof(addr_str))); + fclose(fp); + return ERR; + } + + /* initialise multicast address structure */ +- data->mcastaddr.imr_multiaddr.s_addr = +- data->sa_mcast.sin_addr.s_addr; +- data->mcastaddr.imr_interface.s_addr = htonl(INADDR_ANY); +- setsockopt(data->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, +- &data->mcast_ttl, sizeof(data->mcast_ttl)); ++ sockaddr_get_mreq(&data->sa_mcast, &data->mcastaddr); ++ if (data->sa_mcast.ss_family == AF_INET) ++ setsockopt(data->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, ++ &data->mcast_ttl, sizeof(data->mcast_ttl)); ++ else ++ setsockopt(data->sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, ++ &data->mcast_ttl, sizeof(data->mcast_ttl)); + + /* set options data for OACK */ + opt_set_multicast(data->tftp_options, data->mc_addr, +@@ -660,8 +676,8 @@ + data->mc_port, 1); + + /* the socket must be unconnected for multicast */ +- sa->sin_family = AF_UNSPEC; +- connect(sockfd, (struct sockaddr *)sa, sizeof(sa)); ++ sa->ss_family = AF_UNSPEC; ++ connect(sockfd, (struct sockaddr *)sa, sizeof(*sa)); + + /* set multicast flag */ + multicast = 1; +@@ -689,7 +705,9 @@ + if (data->trace) + { + logger(LOG_DEBUG, "sent ERROR to %s", EUNDEF, +- tftp_errmsg[EUNDEF], inet_ntoa(client_info->client.sin_addr)); ++ tftp_errmsg[EUNDEF], ++ sockaddr_print_addr(&client_info->client, ++ addr_str, sizeof(addr_str))); + } + } while (tftpd_clientlist_next(data, &client_info) == 1); + state = S_ABORT; +@@ -751,7 +769,8 @@ + if (number_of_timeout > NB_OF_RETRY) + { + logger(LOG_INFO, "client (%s) not responding", +- inet_ntoa(client_info->client.sin_addr)); ++ sockaddr_print_addr(&client_info->client, ++ addr_str, sizeof(addr_str))); + state = S_END; + } + else +@@ -780,8 +799,11 @@ + going to OACK state */ + logger(LOG_INFO, + "Serving next client: %s:%d", +- inet_ntoa(client_info->client.sin_addr), +- ntohs(client_info->client.sin_port)); ++ sockaddr_print_addr( ++ &client_info->client, ++ addr_str, sizeof(addr_str)), ++ sockaddr_get_port( ++ &client_info->client)); + sa = &client_info->client; + state = S_SEND_OACK; + break; +@@ -804,8 +826,7 @@ + /* handle case where packet come from un unexpected client */ + if (multicast) + { +- if ((sa->sin_port != from.sin_port) || +- (sa->sin_addr.s_addr != from.sin_addr.s_addr)) ++ if (!sockaddr_equal(sa, &from)) + { + /* We got an ACK from a client that is not the master client. + * If this is an ACK for the last block, mark this client as +@@ -815,10 +836,15 @@ + { + if (tftpd_clientlist_done(data, NULL, &from) == 1) + logger(LOG_DEBUG, "client done <%s>", +- inet_ntoa(client_info->client.sin_addr)); ++ sockaddr_print_addr( ++ &from, addr_str, ++ sizeof(addr_str))); + else + logger(LOG_WARNING, "packet discarded <%s:%d>", +- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++ sockaddr_print_addr( ++ &from, addr_str, ++ sizeof(addr_str)), ++ sockaddr_get_port(&from)); + } + else + /* If not, send and OACK with mc=0 to shut it up. */ +@@ -837,12 +863,14 @@ + else + { + /* check that the packet is from the current client */ +- if (sa->sin_port != from.sin_port) ++ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) + { + if (data->checkport) + { + logger(LOG_WARNING, "packet discarded <%s:%d>", +- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++ sockaddr_print_addr(&from, addr_str, ++ sizeof(addr_str)), ++ sockaddr_get_port(&from)); + break; + } + else +@@ -868,19 +896,21 @@ + if (multicast) + { + /* if packet is not from the current master client */ +- if ((sa->sin_port != from.sin_port) || +- (sa->sin_addr.s_addr != from.sin_addr.s_addr)) ++ if (!sockaddr_equal(sa, &from)) + { + /* mark this client done */ + if (tftpd_clientlist_done(data, NULL, &from) == 1) + { + if (data->trace) + logger(LOG_DEBUG, "client sent ERROR, mark as done <%s>", +- inet_ntoa(client_info->client.sin_addr)); ++ sockaddr_print_addr( ++ &from, addr_str, ++ sizeof(addr_str))); + } + else + logger(LOG_WARNING, "packet discarded <%s>", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, addr_str, ++ sizeof(addr_str))); + /* current state is unchanged */ + break; + } +@@ -888,12 +918,13 @@ + else + { + /* check that the packet is from the current client */ +- if (sa->sin_port != from.sin_port) ++ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) + { + if (data->checkport) + { + logger(LOG_WARNING, "packet discarded <%s>", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, addr_str, ++ sizeof(addr_str))); + break; + } + else +@@ -919,7 +950,8 @@ + case GET_DISCARD: + /* FIXME: should we increment number_of_timeout */ + logger(LOG_WARNING, "packet discarded <%s>", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, addr_str, ++ sizeof(addr_str))); + break; + case ERR: + logger(LOG_ERR, "%s: %d: recvfrom: %s", +@@ -944,8 +976,9 @@ + { + logger(LOG_INFO, + "Serving next client: %s:%d", +- inet_ntoa(client_info->client.sin_addr), +- ntohs(client_info->client.sin_port)); ++ sockaddr_print_addr(&client_info->client, ++ addr_str, sizeof(addr_str)), ++ sockaddr_get_port(&client_info->client)); + /* client is a new client structure */ + sa = &client_info->client; + /* nedd to send an oack to that client */ +--- atftp-0.7.dfsg.orig/tftpd_list.c ++++ atftp-0.7.dfsg/tftpd_list.c +@@ -173,8 +173,7 @@ + + while (1) + { +- if ((tmp->client.sin_port == client->client.sin_port) && +- (tmp->client.sin_addr.s_addr == client->client.sin_addr.s_addr) && ++ if (sockaddr_equal(&tmp->client, &client->client) && + (tmp->done == 0)) + { + /* unlock mutex and exit */ +@@ -249,7 +248,7 @@ + */ + int tftpd_clientlist_done(struct thread_data *thread, + struct client_info *client, +- struct sockaddr_in *sock) ++ struct sockaddr_storage *sock) + { + struct client_info *head = thread->client_info; + +@@ -266,7 +265,7 @@ + /* walk the list to find this client */ + while (head) + { +- if (memcmp(sock, &head->client, sizeof(struct sockaddr_in)) == 0) ++ if (sockaddr_equal(sock, &head->client)) + { + head->done = 1; + pthread_mutex_unlock(&thread->client_mutex); +--- atftp-0.7.dfsg.orig/tftpd_pcre.c ++++ atftp-0.7.dfsg/tftpd_pcre.c +@@ -211,9 +211,9 @@ + chp++; /* point to value indicating substring */ + rc = pcre_get_substring(str, ovector, matches, *chp - 0x30, &tmpstr); + /* found string */ +- if (rc > 0) ++ if (rc > 0 && outchp - outstr + rc+1 < outsize) + { +- Strncpy(outchp, tmpstr, rc); ++ Strncpy(outchp, tmpstr, rc+1); + outchp += rc; + pcre_free_substring(tmpstr); + continue; +--- atftp-0.7.dfsg.orig/tftp_mtftp.c ++++ atftp-0.7.dfsg/tftp_mtftp.c +@@ -112,18 +112,20 @@ + int data_size; /* size of data received */ + int sockfd = data->sockfd; /* just to simplify calls */ + int sock; +- struct sockaddr_in sa; /* a copy of data.sa_peer */ +- struct sockaddr_in from; ++ struct sockaddr_storage sa; /* a copy of data.sa_peer */ ++ struct sockaddr_storage from; ++ char from_str[SOCKADDR_PRINT_ADDR_LEN]; + struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; + FILE *fp = NULL; /* the local file pointer */ + int number_of_timeout = 0; + int timeout = 0; + +- struct in_addr mcast_addr; ++ struct sockaddr_storage sa_mcast_group; + int mcast_sockfd = 0; +- struct sockaddr_in sa_mcast; +- struct ip_mreq mreq; +- struct hostent *host; ++ struct sockaddr_storage sa_mcast; ++ union ip_mreq_storage mreq; ++ struct addrinfo hints, *addrinfo; ++ int err; + + int mode = LISTEN; + unsigned int file_bitmap[NB_BLOCK]; +@@ -132,13 +134,13 @@ + + data->file_size = 0; + tftp_cancel = 0; +- from.sin_addr.s_addr = 0; ++ memset(&from, 0, sizeof(from)); + +- memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); ++ memset(&sa_mcast, 0, sizeof(struct sockaddr_storage)); + memset(&file_bitmap, 0, sizeof(file_bitmap)); + + /* make sure the socket is not connected */ +- sa.sin_family = AF_UNSPEC; ++ sa.ss_family = AF_UNSPEC; + connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); + + /* copy sa_peer structure */ +@@ -170,13 +172,14 @@ + } + + /* Configure multicast stuff, look up the host */ +- host = gethostbyname(data->mtftp_mcast_ip); + /* if valid, update s_inn structure */ +- if (host) ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; ++ if (!getaddrinfo(data->mtftp_mcast_ip, NULL, &hints, &addrinfo) && ++ !sockaddr_set_addrinfo(&sa_mcast_group, addrinfo)) + { +- memcpy(&mcast_addr, host->h_addr_list[0], +- host->h_length); +- if (!IN_MULTICAST(ntohl(mcast_addr.s_addr))) ++ freeaddrinfo(addrinfo); ++ if (!sockaddr_is_multicast(&sa_mcast_group)) + { + fprintf(stderr, + "mtftp: bad multicast address %s\n", +@@ -196,9 +199,9 @@ + perror("atftp: socket"); + exit(1); + } +- sa_mcast.sin_family = AF_INET; +- sa_mcast.sin_addr.s_addr = htonl(INADDR_ANY); +- sa_mcast.sin_port = htons(data->mtftp_client_port); ++ memset(&sa_mcast, 0, sizeof(sa_mcast)); ++ sa_mcast.ss_family = sa_mcast_group.ss_family; ++ sockaddr_set_port(&sa, data->mtftp_client_port); + + if (bind(mcast_sockfd, (struct sockaddr *)&sa_mcast, + sizeof(sa_mcast)) < 0) +@@ -206,13 +209,15 @@ + perror("atftp: bind"); + exit(1); + } +- +- mreq.imr_multiaddr.s_addr = mcast_addr.s_addr; +- mreq.imr_interface.s_addr = htonl(INADDR_ANY); +- +- if (setsockopt(mcast_sockfd, IPPROTO_IP, +- IP_ADD_MEMBERSHIP, +- &mreq, sizeof(mreq)) < 0) ++ ++ sockaddr_get_mreq(&sa_mcast_group, &mreq); ++ if (sa_mcast_group.ss_family == AF_INET) ++ err = setsockopt(mcast_sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, ++ &mreq.v4, sizeof(mreq.v4)); ++ else ++ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, ++ &mreq.v6, sizeof(mreq.v6)); ++ if (err < 0) + { + perror("atftp: setsockopt"); + exit(1); +@@ -228,7 +233,7 @@ + #endif + if (tftp_cancel) + { +- if (from.sin_addr.s_addr == 0) ++ if (from.ss_family == 0) + state = S_ABORT; + else + { +@@ -298,7 +303,7 @@ + else + state = S_WAIT_PACKET; + +- sa.sin_port = 0; /* must be set to 0 before the fist call to ++ sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to + tftp_get_packet, but it was set before the + call to tftp_send_request with the server port */ + break; +@@ -351,10 +356,10 @@ + break; + } + /* Can only receive this error from unicast */ +- if (sa.sin_addr.s_addr != from.sin_addr.s_addr) ++ if (!sockaddr_equal_addr(&sa, &from)) + { + fprintf(stderr, "mtftp: error packet discarded from <%s>.\n", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, from_str, sizeof(from_str))); + break; + } + /* packet is for us */ +@@ -367,7 +372,7 @@ + /* Specification state that server source IP must matches, but + port is not a requierement (anyway we may not know the source + port yet) */ +- if (sa.sin_addr.s_addr == from.sin_addr.s_addr) ++ if (sockaddr_equal_addr(&sa, &from)) + { + if (mode != LISTEN) + { +@@ -380,7 +385,7 @@ + fprintf(stderr, + "mtftp: unexpected unicast packet from <%s>," + " continuing\n", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, from_str, sizeof(from_str))); + else + mode = RECEIVE; + } +@@ -404,7 +409,7 @@ + { + fprintf(stderr, + "mtftp: unexpected unicast packet from <%s>.\n", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, from_str, sizeof(from_str))); + break; + } + } +@@ -412,7 +417,7 @@ + else + { + fprintf(stderr, "mtftp: unexpected packet from <%s>\n", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, from_str, sizeof(from_str))); + break; + } + number_of_timeout = 0; +@@ -424,7 +429,7 @@ + mcast IP or port */ + number_of_timeout++; + fprintf(stderr, "mtftp: packet discard <%s>.\n", +- inet_ntoa(from.sin_addr)); ++ sockaddr_print_addr(&from, from_str, sizeof(from_str))); + if (number_of_timeout > NB_OF_RETRY) + state = S_ABORT; + break; +@@ -495,9 +500,15 @@ + if (fp) + fclose(fp); + /* drop multicast membership */ +- if (setsockopt(mcast_sockfd, IPPROTO_IP, +- IP_DROP_MEMBERSHIP, +- &mreq, sizeof(mreq)) < 0) ++ if (sa_mcast_group.ss_family == AF_INET) ++ err = setsockopt(mcast_sockfd, IPPROTO_IP, ++ IP_DROP_MEMBERSHIP, ++ &mreq.v4, sizeof(mreq.v4)); ++ else ++ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, ++ IPV6_DROP_MEMBERSHIP, ++ &mreq.v6, sizeof(mreq.v6)); ++ if (err < 0) + { + perror("setsockopt"); + exit(1); +--- atftp-0.7.dfsg.orig/configure ++++ atftp-0.7.dfsg/configure +@@ -1,81 +1,415 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.59. ++# Generated by GNU Autoconf 2.67. ++# ++# ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. ++# + # +-# Copyright (C) 2003 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +-DUALCASE=1; export DUALCASE # for MKS sh + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false ++ ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + +-# Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in #(( ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test "x$CONFIG_SHELL" = x; then ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST ++else ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac ++fi ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } ++ ++exitcode=0 ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : ++ ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ as_found=: ++ case $as_dir in #( ++ /*) ++ for as_base in sh bash ksh sh5; do ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi ++ done;; ++ esac ++ as_found=false ++done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } ++IFS=$as_save_IFS ++ ++ ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else +- $as_unset $as_var ++ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, ++$0: including any error possibly output before this ++$0: message. Then install a modern shell, or manually run ++$0: the script under such a shell if you do have one." + fi +-done ++ exit 1 ++fi ++fi ++fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} # as_fn_error + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + +- +-# PATH needs CR, and LINENO needs CR and PATH. + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +@@ -83,146 +417,107 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh +-fi +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done +- +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in +- /*) +- if ("$as_dir/$as_base" -c ' +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac + +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ chmod +x "$as_me.lineno" || ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + +- +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in #((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then +- as_expr=expr ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file + else +- as_expr=false ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +- +-rm -f conf$$ conf$$.exe conf$$.file +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links +- as_ln_s='cp -p' +- else ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else ++ as_ln_s='cp -p' + fi +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' ++fi ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -231,38 +526,25 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +-exec 6>&1 +- + # + # Initializations. + # + ac_default_prefix=/usr/local ++ac_clean_files= + ac_config_libobj_dir=. ++LIBOBJS= + cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} +- +-# Maximum number of lines to put in a shell here document. +-# This variable seems obsolete. It should probably be removed, and +-# only ac_max_sed_lines should be used. +-: ${ac_max_here_lines=38} + + # Identity of this package. + PACKAGE_NAME= +@@ -270,51 +552,164 @@ + PACKAGE_VERSION= + PACKAGE_STRING= + PACKAGE_BUGREPORT= ++PACKAGE_URL= + + ac_unique_file="tftp.c" + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include +-#else +-# if HAVE_STDINT_H +-# include +-# endif + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_STDINT_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PLATFORM CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBPTHREAD LIBTERMCAP LIBREADLINE LIBWRAP LIBPCRE LIBOBJS LTLIBOBJS' ++ac_subst_vars='LTLIBOBJS ++LIBOBJS ++LIBPCRE ++LIBWRAP ++LIBREADLINE ++LIBTERMCAP ++LIBPTHREAD ++EGREP ++GREP ++CPP ++am__fastdepCC_FALSE ++am__fastdepCC_TRUE ++CCDEPMODE ++AMDEPBACKSLASH ++AMDEP_FALSE ++AMDEP_TRUE ++am__quote ++am__include ++DEPDIR ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++PLATFORM ++host_os ++host_vendor ++host_cpu ++host ++build_os ++build_vendor ++build_cpu ++build ++ISODATE ++am__leading_dot ++SET_MAKE ++AWK ++mkdir_p ++INSTALL_STRIP_PROGRAM ++STRIP ++install_sh ++AMTAR ++MAKEINFO ++AUTOHEADER ++AUTOMAKE ++AUTOCONF ++ACLOCAL ++VERSION ++PACKAGE ++CYGPATH_W ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_URL ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' + ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++enable_libreadline ++enable_libwrap ++enable_libpcre ++enable_mtftp ++enable_debug ++enable_dependency_tracking ++' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CPP' ++ + + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -337,34 +732,49 @@ + # and all the variables that are supposed to be based on exec_prefix + # by default will actually change. + # Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++docdir='${datarootdir}/doc/${PACKAGE}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' + + ac_prev= ++ac_dashdash= + for ac_option + do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then +- eval "$ac_prev=\$ac_option" ++ eval $ac_prev=\$ac_option + ac_prev= + continue + fi + +- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` ++ case $ac_option in ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; ++ esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case $ac_option in ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; +@@ -386,33 +796,59 @@ + --config-cache | -C) + cache_file=config.cache ;; + +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ++ -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +- | --da=*) ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ + -disable-* | --disable-*) +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- eval "enable_$ac_feature=no" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; + esac +- eval "enable_$ac_feature='$ac_optarg'" ;; ++ eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -439,6 +875,12 @@ + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; ++ + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; +@@ -463,13 +905,16 @@ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; ++ + -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst \ +- | --locals | --local | --loca | --loc | --lo) ++ | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +@@ -534,6 +979,16 @@ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; ++ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; +@@ -584,26 +1039,36 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; + esac +- eval "with_$ac_package='$ac_optarg'" ;; ++ eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` +- eval "with_$ac_package=no" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. +@@ -623,26 +1088,25 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } +- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` +- eval "$ac_envvar='$ac_optarg'" ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; ++ esac ++ eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -651,31 +1115,36 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "missing argument to $ac_option" + fi + +-# Be sure to have absolute paths. +-for ac_var in exec_prefix prefix +-do +- eval ac_val=$`echo $ac_var` +- case $ac_val in +- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; ++if test -n "$ac_unrecognized_opts"; then ++ case $enable_option_checking in ++ no) ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +-done ++fi + +-# Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +- localstatedir libdir includedir oldincludedir infodir mandir ++# Check all directory arguments for consistency. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir + do +- eval ac_val=$`echo $ac_var` ++ eval ac_val=\$$ac_var ++ # Remove trailing slashes. + case $ac_val in +- [\\/$]* | ?:[\\/]* ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; + esac ++ # Be sure to have absolute directory names. ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -689,8 +1158,8 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -702,74 +1171,72 @@ + test "$silent" = yes && exec 6>/dev/null + + ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ as_fn_error $? "working directory cannot be determined" ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ as_fn_error $? "pwd does not report name of working directory" ++ ++ + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes +- # Try the directory containing this script, then its parent. +- ac_confdir=`(dirname "$0") 2>/dev/null || +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$0" : 'X\(//\)[^/]' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$0" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + srcdir=$ac_confdir +- if test ! -r $srcdir/$ac_unique_file; then ++ if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi +-if test ! -r $srcdir/$ac_unique_file; then +- if test "$ac_srcdir_defaulted" = yes; then +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +- { (exit 1); exit 1; }; } +- else +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } +- fi +-fi +-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +- { (exit 1); exit 1; }; } +-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +-ac_env_build_alias_set=${build_alias+set} +-ac_env_build_alias_value=$build_alias +-ac_cv_env_build_alias_set=${build_alias+set} +-ac_cv_env_build_alias_value=$build_alias +-ac_env_host_alias_set=${host_alias+set} +-ac_env_host_alias_value=$host_alias +-ac_cv_env_host_alias_set=${host_alias+set} +-ac_cv_env_host_alias_value=$host_alias +-ac_env_target_alias_set=${target_alias+set} +-ac_env_target_alias_value=$target_alias +-ac_cv_env_target_alias_set=${target_alias+set} +-ac_cv_env_target_alias_value=$target_alias +-ac_env_CC_set=${CC+set} +-ac_env_CC_value=$CC +-ac_cv_env_CC_set=${CC+set} +-ac_cv_env_CC_value=$CC +-ac_env_CFLAGS_set=${CFLAGS+set} +-ac_env_CFLAGS_value=$CFLAGS +-ac_cv_env_CFLAGS_set=${CFLAGS+set} +-ac_cv_env_CFLAGS_value=$CFLAGS +-ac_env_LDFLAGS_set=${LDFLAGS+set} +-ac_env_LDFLAGS_value=$LDFLAGS +-ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +-ac_cv_env_LDFLAGS_value=$LDFLAGS +-ac_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_env_CPPFLAGS_value=$CPPFLAGS +-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_cv_env_CPPFLAGS_value=$CPPFLAGS +-ac_env_CPP_set=${CPP+set} +-ac_env_CPP_value=$CPP +-ac_cv_env_CPP_set=${CPP+set} +-ac_cv_env_CPP_value=$CPP ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} ++done + + # + # Report the --help message. +@@ -792,20 +1259,17 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +-_ACEOF +- +- cat <<_ACEOF + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -815,18 +1279,25 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -847,6 +1318,7 @@ + cat <<\_ACEOF + + Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-libreadline enable readline support in client +@@ -862,162 +1334,540 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory +- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have +- headers in a nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory + CPP C preprocessor + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + ++Report bugs to the package provider. + _ACEOF ++ac_status=$? + fi + + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. +- ac_popdir=`pwd` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d $ac_dir || continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue + ac_builddir=. + +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac +- +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + +- cd $ac_dir +- # Check for guested configure; otherwise get Cygnus style configure. +- if test -f $ac_srcdir/configure.gnu; then +- echo +- $SHELL $ac_srcdir/configure.gnu --help=recursive +- elif test -f $ac_srcdir/configure; then +- echo +- $SHELL $ac_srcdir/configure --help=recursive +- elif test -f $ac_srcdir/configure.ac || +- test -f $ac_srcdir/configure.in; then +- echo +- $ac_configure --help ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive + else +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi +- cd "$ac_popdir" ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } + done + fi + +-test -n "$ac_init_help" && exit 0 ++test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF ++configure ++generated by GNU Autoconf 2.67 + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +- exit 0 ++ exit + fi +-exec 5>config.log +-cat >&5 <<_ACEOF +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. + +-It was created by $as_me, which was +-generated by GNU Autoconf 2.59. Invocation command line was +- +- $ $0 $@ +- +-_ACEOF ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () + { +-cat <<_ASUNAME +-## --------- ## +-## Platform. ## +-## --------- ## +- +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++} # ac_fn_c_try_compile + +-_ASUNAME ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } > conftest.i && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" +-done ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-} >&5 ++} # ac_fn_c_try_cpp + +-cat >&5 <<_ACEOF ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if eval "test \"\${$3+set}\"" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_mongrel ++ ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_run ++ ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_link ++ ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++# ------------------------------------------- ++# Tests whether TYPE exists after having included INCLUDES, setting cache ++# variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_type ++ ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_func ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by $as_me, which was ++generated by GNU Autoconf 2.67. Invocation command line was ++ ++ $ $0 $@ ++ ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++ ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++ ++_ASUNAME ++ ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ $as_echo "PATH: $as_dir" ++ done ++IFS=$as_save_IFS ++ ++} >&5 ++ ++cat >&5 <<_ACEOF + + + ## ----------- ## +@@ -1035,7 +1885,6 @@ + ac_configure_args= + ac_configure_args0= + ac_configure_args1= +-ac_sep= + ac_must_keep_next=false + for ac_pass in 1 2 + do +@@ -1046,13 +1895,13 @@ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else +@@ -1068,104 +1917,115 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +- # Get rid of the leading space. +- ac_sep=" " ++ as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done + done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there + # would cause problems or look ugly. +-# WARNING: Be sure not to use single quotes in there, as some shells, +-# such as our DU 5.0 friend, will then `close' the trap. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. + trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done + (set) 2>&1 | +- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) + sed -n \ +- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" +- ;; ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( + *) +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} ++ esac | ++ sort ++) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------- ## +-## Output files. ## +-## ------------- ## +-_ASBOX ++ $as_echo "## ------------------- ## ++## File substitutions. ## ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo +- sed "/^$/d" confdefs.h | sort ++ cat confdefs.h + echo + fi + test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" +- echo "$as_me: exit $exit_status" ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" + } >&5 +- rm -f core *.core && +- rm -rf conftest* confdefs* conf$$* $ac_clean_files && ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +- ' 0 ++' 0 + for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo >confdefs.h ++rm -f -r conftest* confdefs.h ++ ++$as_echo "/* confdefs.h */" > confdefs.h + + # Predefined preprocessor variables. + +@@ -1173,112 +2033,137 @@ + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ + + # Let the site file select an alternate cache file if it wants to. +-# Prefer explicitly selected file to automatically selected ones. +-if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi +-fi +-for ac_site_file in $CONFIG_SITE; do +- if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-echo "$as_me: loading cache $cache_file" >&6;} ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +- [\\/]* | ?:[\\/]* ) . $cache_file;; +- *) . ./$cache_file;; ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; + esac + fi + else +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-echo "$as_me: creating cache $cache_file" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +-for ac_var in `(set) 2>&1 | +- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do ++for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val="\$ac_cv_env_${ac_var}_value" +- eval ac_new_val="\$ac_env_${ac_var}_value" ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +-echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +-echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -1287,48 +2172,35 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + am__api_version="1.8" + ac_aux_dir= +-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do +- if test -f $ac_dir/install-sh; then ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break +- elif test -f $ac_dir/install.sh; then ++ elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break +- elif test -f $ac_dir/shtool; then ++ elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} +- { (exit 1); exit 1; }; } +-fi +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" +-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++fi ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -1343,22 +2215,23 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 ++$as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++if test "${ac_cv_path_install+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -1366,7 +2239,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -1376,30 +2249,43 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac +-done + ++ done ++IFS=$as_save_IFS ++ ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. We don't cache a +- # path for INSTALL within a source directory, because that will ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is +- # removed, or if the path is relative. ++ # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -1409,8 +2295,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -1433,11 +2319,8 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -1446,26 +2329,20 @@ + # Ok. + : + else +- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + test "$program_prefix" != NONE && +- program_transform_name="s,^,$program_prefix,;$program_transform_name" ++ program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && +- program_transform_name="s,\$,$program_suffix,;$program_transform_name" +-# Double any \ or $. echo might interpret backslashes. ++ program_transform_name="s&\$&$program_suffix&;$program_transform_name" ++# Double any \ or $. + # By default was `s,x,x', remove it if useless. +-cat <<\_ACEOF >conftest.sed +-s/[\\$]/&&/g;s/;s,x,x,$// +-_ACEOF +-program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +-rm conftest.sed ++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -1476,8 +2353,8 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + + if mkdir -p -- . 2>/dev/null; then +@@ -1509,10 +2386,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_AWK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AWK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +@@ -1522,55 +2399,59 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ + test -n "$AWK" && break + done + +-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh + all: +- @echo 'ac_maketemp="$(MAKE)"' ++ @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac + rm -f conftest.make + fi +-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + SET_MAKE= + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -1586,9 +2467,7 @@ + # test to see if srcdir already configured + if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + + # test whether we have cygpath +@@ -1644,10 +2523,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -1657,35 +2536,37 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -1695,28 +2576,38 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + +- STRIP=$ac_ct_STRIP ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi + else + STRIP="$ac_cv_prog_STRIP" + fi +@@ -1730,123 +2621,140 @@ + + + +- ac_config_headers="$ac_config_headers config.h" ++ac_config_headers="$ac_config_headers config.h" + + + ISODATE=`date +%Y-%m-%d` + + + # Make sure we can run config.sub. +-$ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +-echo "$as_me: error: cannot run $ac_config_sub" >&2;} +- { (exit 1); exit 1; }; } +- +-echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6 +-if test "${ac_cv_build+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_build_alias=$build_alias +-test -z "$ac_cv_build_alias" && +- ac_cv_build_alias=`$ac_config_guess` +-test -z "$ac_cv_build_alias" && +- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } +-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-fi +-echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } ++if test "${ac_cv_build+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; ++esac + build=$ac_cv_build +-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +- +- +-echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6 +-if test "${ac_cv_host+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_host_alias=$host_alias +-test -z "$ac_cv_host_alias" && +- ac_cv_host_alias=$ac_cv_build_alias +-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } ++if test "${ac_cv_host+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++fi + + fi +-echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 ++$as_echo "$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; ++esac + host=$ac_cv_host +-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + PLATFORM="${host_vendor}-${host_cpu}-${host_os}" + + +-# Check whether --enable-libreadline or --disable-libreadline was given. +-if test "${enable_libreadline+set}" = set; then +- enableval="$enable_libreadline" +- case "${enableval}" in ++# Check whether --enable-libreadline was given. ++if test "${enable_libreadline+set}" = set; then : ++ enableval=$enable_libreadline; case "${enableval}" in + yes) libreadline=true ;; + no) libreadline=false ;; + esac + else + libreadline=true +-fi; ++fi + +-# Check whether --enable-libwrap or --disable-libwrap was given. +-if test "${enable_libwrap+set}" = set; then +- enableval="$enable_libwrap" +- case "${enableval}" in ++ ++# Check whether --enable-libwrap was given. ++if test "${enable_libwrap+set}" = set; then : ++ enableval=$enable_libwrap; case "${enableval}" in + yes) libwrap=true ;; + no) libwrap=flase ;; + esac + else + libwrap=true +-fi; ++fi + +-# Check whether --enable-libpcre or --disable-libpcre was given. +-if test "${enable_libpcre+set}" = set; then +- enableval="$enable_libpcre" +- case "${enableval}" in ++ ++# Check whether --enable-libpcre was given. ++if test "${enable_libpcre+set}" = set; then : ++ enableval=$enable_libpcre; case "${enableval}" in + yes) libpcre=true ;; + no) libpcre=flase ;; + esac + else + libpcre=true +-fi; ++fi + +-# Check whether --enable-mtftp or --disable-mtftp was given. +-if test "${enable_mtftp+set}" = set; then +- enableval="$enable_mtftp" +- case "${enableval}" in ++ ++# Check whether --enable-mtftp was given. ++if test "${enable_mtftp+set}" = set; then : ++ enableval=$enable_mtftp; case "${enableval}" in + yes) mtftp=true ;; + no) mtftp=flase ;; + esac + else + mtftp=true +-fi; ++fi + +-# Check whether --enable-debug or --disable-debug was given. +-if test "${enable_debug+set}" = set; then +- enableval="$enable_debug" +- case "${enableval}" in ++ ++# Check whether --enable-debug was given. ++if test "${enable_debug+set}" = set; then : ++ enableval=$enable_debug; case "${enableval}" in + yes) debug=true ;; + no) debug=false ;; + esac + else + debug=false +-fi; ++fi ++ + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -1856,10 +2764,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -1869,35 +2777,37 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -1907,39 +2817,50 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + else + CC="$ac_cv_prog_CC" + fi + + if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -1949,99 +2870,60 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ ++ fi + fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC ++if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. + else ++ ac_prog_rejected=no + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ done ++IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. +@@ -2059,24 +2941,25 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ + fi + if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2086,39 +2969,41 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ + test -n "$CC" && break + done + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2128,66 +3013,78 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ + test -n "$ac_ct_CC" && break + done + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + fi + + fi + + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2199,112 +3096,108 @@ + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +- (eval $ac_link_default) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Find the output, starting from the most likely. This scheme is +-# not robust to junk in `.', hence go to wildcards (a.*) only as a last +-# resort. +- +-# Be careful to initialize this variable, since it used to be cached. +-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +-ac_cv_exeext= +-# b.out is created by i960 compilers. +-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { { ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) +- ;; +- conftest.$ac_ext ) +- # This is the source file. ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- # FIXME: I believe we export ac_cv_exeext for Libtool, +- # but it would be cool to find out if it's true. Does anybody +- # maintain Libtool? --akim. +- export ac_cv_exeext ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. + break;; + * ) + break;; + esac + done ++test "$ac_cv_exeext" = no && ac_cv_exeext= ++ + else +- echo "$as_me: failed program was:" >&5 ++ ac_file='' ++fi ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5 ; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6 + +-# Check the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi +-fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- +-rm -f a.out a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6 +- +-echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -2312,38 +3205,90 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- export ac_cv_exeext + break;; + * ) break;; + esac + done + else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-rm -f conftest$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5 ; } ++fi ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +-if test "${ac_cv_objext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5 ; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if test "${ac_cv_objext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2355,45 +3300,46 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do ++if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5 ; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2407,54 +3353,34 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +-GCC=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-CFLAGS="-g" +-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2465,38 +3391,49 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + +-ac_cv_prog_cc_g=no ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -2512,18 +3449,14 @@ + CFLAGS= + fi + fi +-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- ac_cv_prog_cc_stdc=no ++ ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -2551,12 +3484,17 @@ + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std1 is added to get ++ as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std1. */ ++ that's true only with -std. */ + int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; +@@ -2571,201 +3509,37 @@ + return 0; + } + _ACEOF +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_cc_stdc=$ac_arg +-break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- ++ if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_c89=$ac_arg + fi +-rm -f conftest.err conftest.$ac_objext ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break + done +-rm -f conftest.$ac_ext conftest.$ac_objext ++rm -f conftest.$ac_ext + CC=$ac_save_CC + + fi +- +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6 ;; ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; ++ xno) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +- CC="$CC $ac_cv_prog_cc_stdc" ;; ++ CC="$CC $ac_cv_prog_cc_c89" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac +- +-# Some people use a C++ compiler to compile C. Since we use `exit', +-# in C++ we need to declare it. In case someone uses the same compiler +-# for both compiling C and C++ we need to have the C++ compiler decide +-# the declaration of exit, since it's the most demanding environment. +-cat >conftest.$ac_ext <<_ACEOF +-#ifndef __cplusplus +- choke me +-#endif +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-#include +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if test "x$ac_cv_prog_cc_c89" != xno; then : + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2773,7 +3547,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" + +- ac_config_commands="$ac_config_commands depfiles" ++ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} +@@ -2783,8 +3557,8 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 ++$as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= + _am_result=none +@@ -2811,15 +3585,15 @@ + fi + + +-echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 ++$as_echo "$_am_result" >&6; } + rm -f confinc confmf + +-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then +- enableval="$enable_dependency_tracking" ++# Check whether --enable-dependency-tracking was given. ++if test "${enable_dependency_tracking+set}" = set; then : ++ enableval=$enable_dependency_tracking; ++fi + +-fi; + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +@@ -2839,10 +3613,10 @@ + + depcc="$CC" am_compiler_list= + +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -2922,8 +3696,8 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + +@@ -2940,21 +3714,20 @@ + + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test "${ac_cv_prog_CPP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +@@ -2968,11 +3741,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -2981,78 +3750,34 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : + break + fi + +@@ -3064,8 +3789,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -3075,11 +3800,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -3088,85 +3809,40 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ + else +- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -3176,49 +3852,328 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +-if test "${ac_cv_prog_egrep+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 ++$as_echo_n "checking for grep that handles long lines and -e... " >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$GREP"; then ++ ac_path_GREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++# Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_GREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_GREP"; then ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 ++$as_echo "$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 ++$as_echo_n "checking for egrep... " >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ if test -z "$EGREP"; then ++ ac_path_EGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++# Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_EGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_EGREP"; then ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_EGREP=$EGREP + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +-echo "${ECHO_T}$ac_cv_prog_egrep" >&6 +- EGREP=$ac_cv_prog_egrep + ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 ++$as_echo "$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include + ++int ++main () ++{ + +-echo "$as_me:$LINENO: checking for AIX" >&5 +-echo $ECHO_N "checking for AIX... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++ ; ++ return 0; ++} + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#ifdef _AIX +- yes +-#endif ++#include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-cat >>confdefs.h <<\_ACEOF +-#define _ALL_SOURCE 1 ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++ + _ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : + + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ ac_cv_header_stdc=no + fi + rm -f conftest* + ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then : ++ : ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h ++ ++fi ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" ++if test "x$ac_cv_header_minix_config_h" = x""yes; then : ++ MINIX=yes ++else ++ MINIX= ++fi ++ ++ ++ if test "$MINIX" = yes; then ++ ++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h ++ ++ ++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h ++ ++ ++$as_echo "#define _MINIX 1" >>confdefs.h ++ ++ fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 ++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } ++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++# define __EXTENSIONS__ 1 ++ $ac_includes_default ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_safe_to_define___extensions__=yes ++else ++ ac_cv_safe_to_define___extensions__=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 ++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } ++ test $ac_cv_safe_to_define___extensions__ = yes && ++ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h ++ ++ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h ++ ++ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h ++ ++ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ++ ++ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h ++ ++ ++ ++ + + + CFLAGS="-g -Wall -D_REENTRANT" +@@ -3244,463 +4199,248 @@ + fi + fi + +-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh + all: +- @echo 'ac_maketemp="$(MAKE)"' ++ @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac + rm -f conftest.make + fi +-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + SET_MAKE= + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +-# Find a good install program. We prefer a C program (faster), +-# so one script is as good as another. But avoid the broken or +-# incompatible versions: +-# SysV /etc/install, /usr/sbin/install +-# SunOS /usr/etc/install +-# IRIX /sbin/install +-# AIX /bin/install +-# AmigaOS /C/install, which installs bootblocks on floppy discs +-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +-# AFS /usr/afsws/bin/install, which mishandles nonexistent args +-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +-# OS/2's system install, which has a completely different semantic +-# ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +-if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ +- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ +- /usr/ucb/* ) ;; +- *) +- # OSF1 and SCO ODT 3.0 have their own names for install. +- # Don't use installbsd from OSF since it installs stuff as root +- # by default. +- for ac_prog in ginstall scoinst install; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then +- if test $ac_prog = install && +- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # AIX install. It has an incompatible calling convention. +- : +- elif test $ac_prog = install && +- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # program-specific install script used by HP pwplus--don't use. +- : +- else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi +- fi +- done +- done +- ;; +-esac +-done +- +- +-fi +- if test "${ac_cv_path_install+set}" = set; then +- INSTALL=$ac_cv_path_install +- else +- # As a last resort, use the slow shell script. We don't cache a +- # path for INSTALL within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the path is relative. +- INSTALL=$ac_install_sh +- fi +-fi +-echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6 +- +-# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +-# It thinks the first close brace ends the variable substitution. +-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +- +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +- +-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + + if test x$mtftp = xtrue; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_MTFTP 1 +-_ACEOF ++$as_echo "#define HAVE_MTFTP 1" >>confdefs.h + + fi + +-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 +-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 ++$as_echo_n "checking for pthread_create in -lpthread... " >&6; } ++if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpthread $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char pthread_create (); + int + main () + { +-pthread_create (); ++return pthread_create (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_pthread_create=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_pthread_pthread_create=no ++ ac_cv_lib_pthread_pthread_create=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 +-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 +-if test $ac_cv_lib_pthread_pthread_create = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 ++$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } ++if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : + LIBPTHREAD=-lpthread + else +- { { echo "$as_me:$LINENO: error: not found" >&5 +-echo "$as_me: error: not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "not found" "$LINENO" 5 + fi + + + + if test x$libreadline = xtrue; then +- echo "$as_me:$LINENO: checking for tgetent in -lreadline" >&5 +-echo $ECHO_N "checking for tgetent in -lreadline... $ECHO_C" >&6 +-if test "${ac_cv_lib_readline_tgetent+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lreadline" >&5 ++$as_echo_n "checking for tgetent in -lreadline... " >&6; } ++if test "${ac_cv_lib_readline_tgetent+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lreadline $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char tgetent (); + int + main () + { +-tgetent (); ++return tgetent (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_tgetent=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_readline_tgetent=no ++ ac_cv_lib_readline_tgetent=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_tgetent" >&5 +-echo "${ECHO_T}$ac_cv_lib_readline_tgetent" >&6 +-if test $ac_cv_lib_readline_tgetent = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_tgetent" >&5 ++$as_echo "$ac_cv_lib_readline_tgetent" >&6; } ++if test "x$ac_cv_lib_readline_tgetent" = x""yes; then : + LIBTERMCAP="" + else +- echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 +-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 +-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 ++$as_echo_n "checking for tgetent in -lncurses... " >&6; } ++if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lncurses $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char tgetent (); + int + main () + { +-tgetent (); ++return tgetent (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncurses_tgetent=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_ncurses_tgetent=no ++ ac_cv_lib_ncurses_tgetent=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 +-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 +-if test $ac_cv_lib_ncurses_tgetent = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 ++$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } ++if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then : + LIBTERMCAP=-lncurses + else +- echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 +-echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6 +-if test "${ac_cv_lib_curses_tgetent+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5 ++$as_echo_n "checking for tgetent in -lcurses... " >&6; } ++if test "${ac_cv_lib_curses_tgetent+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcurses $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char tgetent (); + int + main () + { +-tgetent (); ++return tgetent (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curses_tgetent=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_curses_tgetent=no ++ ac_cv_lib_curses_tgetent=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5 +-echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6 +-if test $ac_cv_lib_curses_tgetent = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5 ++$as_echo "$ac_cv_lib_curses_tgetent" >&6; } ++if test "x$ac_cv_lib_curses_tgetent" = x""yes; then : + LIBTERMCAP=-lcurses + else +- echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 +-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 +-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 ++$as_echo_n "checking for tgetent in -ltermcap... " >&6; } ++if test "${ac_cv_lib_termcap_tgetent+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltermcap $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char tgetent (); + int + main () + { +-tgetent (); ++return tgetent (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_termcap_tgetent=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_termcap_tgetent=no ++ ac_cv_lib_termcap_tgetent=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 +-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 +-if test $ac_cv_lib_termcap_tgetent = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 ++$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } ++if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then : + LIBTERMCAP=-ltermcap + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + fi +@@ -3711,225 +4451,138 @@ + + + +- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 +-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 +-if test "${ac_cv_lib_readline_readline+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 ++$as_echo_n "checking for readline in -lreadline... " >&6; } ++if test "${ac_cv_lib_readline_readline+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lreadline $LIBTERMCAP $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char readline (); + int + main () + { +-readline (); ++return readline (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_readline=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_readline_readline=no ++ ac_cv_lib_readline_readline=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 +-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 +-if test $ac_cv_lib_readline_readline = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 ++$as_echo "$ac_cv_lib_readline_readline" >&6; } ++if test "x$ac_cv_lib_readline_readline" = x""yes; then : + LIBREADLINE=-lreadline + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_READLINE 1 +-_ACEOF ++$as_echo "#define HAVE_READLINE 1" >>confdefs.h + + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + +- echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5 +-echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6 +-if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5 ++$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; } ++if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lreadline $LIBTERMCAP $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char rl_completion_matches (); + int + main () + { +-rl_completion_matches (); ++return rl_completion_matches (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_rl_completion_matches=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_readline_rl_completion_matches=no ++ ac_cv_lib_readline_rl_completion_matches=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5 +-echo "${ECHO_T}$ac_cv_lib_readline_rl_completion_matches" >&6 +-if test $ac_cv_lib_readline_rl_completion_matches = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5 ++$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; } ++if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then : + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_RL_COMPLETION_MATCHES 1 +-_ACEOF ++$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h + + else +- echo "$as_me:$LINENO: checking for completion_matches in -lreadline" >&5 +-echo $ECHO_N "checking for completion_matches in -lreadline... $ECHO_C" >&6 +-if test "${ac_cv_lib_readline_completion_matches+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for completion_matches in -lreadline" >&5 ++$as_echo_n "checking for completion_matches in -lreadline... " >&6; } ++if test "${ac_cv_lib_readline_completion_matches+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lreadline $LIBTERMCAP $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char completion_matches (); + int + main () + { +-completion_matches (); ++return completion_matches (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_completion_matches=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_readline_completion_matches=no ++ ac_cv_lib_readline_completion_matches=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_completion_matches" >&5 +-echo "${ECHO_T}$ac_cv_lib_readline_completion_matches" >&6 +-if test $ac_cv_lib_readline_completion_matches = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_completion_matches" >&5 ++$as_echo "$ac_cv_lib_readline_completion_matches" >&6; } ++if test "x$ac_cv_lib_readline_completion_matches" = x""yes; then : + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_COMPLETION_MATCHES 1 +-_ACEOF ++$as_echo "#define HAVE_COMPLETION_MATCHES 1" >>confdefs.h + + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + fi +@@ -3939,13 +4592,9 @@ + if test x$libwrap = xtrue; then + orig_LIBS="$LIBS" + LIBS="-lnsl -lwrap" +- echo "$as_me:$LINENO: checking for hosts_ctl in -lwrap" >&5 +-echo $ECHO_N "checking for hosts_ctl in -lwrap... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hosts_ctl in -lwrap" >&5 ++$as_echo_n "checking for hosts_ctl in -lwrap... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -3961,138 +4610,80 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + LIBWRAP="-lnsl -lwrap" + LIBS="$orig_LIBS" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_WRAP 1 +-_ACEOF ++$as_echo "#define HAVE_WRAP 1" >>confdefs.h + + + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-LIBWRAP="" ++ LIBWRAP="" + LIBS="$orig_LIBS" +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi + + if test x$libpcre = xtrue; then +- echo "$as_me:$LINENO: checking for pcre_version in -lpcre" >&5 +-echo $ECHO_N "checking for pcre_version in -lpcre... $ECHO_C" >&6 +-if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_version in -lpcre" >&5 ++$as_echo_n "checking for pcre_version in -lpcre... " >&6; } ++if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcre $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char pcre_version (); + int + main () + { +-pcre_version (); ++return pcre_version (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pcre_pcre_version=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_pcre_pcre_version=no ++ ac_cv_lib_pcre_pcre_version=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_version" >&5 +-echo "${ECHO_T}$ac_cv_lib_pcre_pcre_version" >&6 +-if test $ac_cv_lib_pcre_pcre_version = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_version" >&5 ++$as_echo "$ac_cv_lib_pcre_pcre_version" >&6; } ++if test "x$ac_cv_lib_pcre_pcre_version" = x""yes; then : + LIBPCRE=-lpcre + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_PCRE 1 +-_ACEOF ++$as_echo "#define HAVE_PCRE 1" >>confdefs.h + + fi + + + fi + +-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +-if test "${ac_cv_header_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -4107,50 +4698,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -4160,18 +4724,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -4181,16 +4741,13 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include ++#include + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -4210,1330 +4767,140 @@ + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi ++ + fi + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "$as_ac_Header=no" +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++for ac_header in sys/time.h sys/types.h sys/socket.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + +- +- +- +- +-for ac_header in sys/time.h sys/types.h sys/socket.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++for ac_header in arpa/inet.h arpa/tftp.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 + +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> ++done ++ ++for ac_header in getopt.h unistd.h signal.h pthread.h argz.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++done + +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++for ac_header in netdb.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default" ++if test "x$ac_cv_header_netdb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_NETDB_H 1 + _ACEOF + + fi + + done + +- +- +-for ac_header in arpa/inet.h arpa/tftp.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++for ac_header in readline/readline.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" ++if test "x$ac_cv_header_readline_readline_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_READLINE_READLINE_H 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 + +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> ++done ++ ++for ac_header in readline/history.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" ++if test "x$ac_cv_header_readline_history_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_READLINE_HISTORY_H 1 + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++done + +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++if test x$libwrap = xtrue; then ++for ac_header in tcpd.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default" ++if test "x$ac_cv_header_tcpd_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_TCPD_H 1 + _ACEOF + + fi + + done + +- +- +- +- +- +-for ac_header in getopt.h unistd.h signal.h pthread.h argz.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++if test x$libpcre = xtrue; then ++for ac_header in pcre.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" ++if test "x$ac_cv_header_pcre_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_PCRE_H 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 + +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++done + +- ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 ++$as_echo_n "checking for an ANSI C-conforming const... " >&6; } ++if test "${ac_cv_c_const+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_header in netdb.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_header in readline/readline.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_header in readline/history.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +-if test x$libwrap = xtrue; then +- +-for ac_header in tcpd.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +-fi +-if test x$libpcre = xtrue; then +- +-for ac_header in pcre.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +-fi +- +-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +-if test "${ac_cv_c_const+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + int + main () +@@ -5542,10 +4909,10 @@ + #ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; +- const charset x; ++ const charset cs; + /* SunOS 4.1.1 cc rejects this. */ +- char const *const *ccp; +- char **p; ++ char const *const *pcpcc; ++ char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; +@@ -5554,16 +4921,17 @@ + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; +- ccp = &g + (g ? g-g : 0); ++ pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ +- ++ccp; +- p = (char**) ccp; +- ccp = (char const *const *) p; ++ ++pcpcc; ++ ppc = (char**) pcpcc; ++ pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; ++ if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; +@@ -5576,576 +4944,158 @@ + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying +- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; }; +- struct s *b; b->j = 5; +- } +- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ +- const int foo = 10; +- } +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_c_const=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_c_const=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +-echo "${ECHO_T}$ac_cv_c_const" >&6 +-if test $ac_cv_c_const = no; then +- +-cat >>confdefs.h <<\_ACEOF +-#define const +-_ACEOF +- +-fi +- +-echo "$as_me:$LINENO: checking for size_t" >&5 +-echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +-if test "${ac_cv_type_size_t+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-if ((size_t *) 0) +- return 0; +-if (sizeof (size_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_type_size_t=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_type_size_t=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +-echo "${ECHO_T}$ac_cv_type_size_t" >&6 +-if test $ac_cv_type_size_t = yes; then +- : +-else +- +-cat >>confdefs.h <<_ACEOF +-#define size_t unsigned +-_ACEOF +- +-fi +- +-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +-if test "${ac_cv_header_time+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-#include +-#include +- +-int +-main () +-{ +-if ((struct tm *) 0) +-return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_header_time=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_header_time=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +-echo "${ECHO_T}$ac_cv_header_time" >&6 +-if test $ac_cv_header_time = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define TIME_WITH_SYS_TIME 1 +-_ACEOF +- +-fi +- +-echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +-if test "${ac_cv_type_signal+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-#include +-#ifdef signal +-# undef signal +-#endif +-#ifdef __cplusplus +-extern "C" void (*signal (int, void (*)(int)))(int); +-#else +-void (*signal ()) (); +-#endif +- +-int +-main () +-{ +-int i; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_type_signal=void +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_type_signal=int +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-echo "${ECHO_T}$ac_cv_type_signal" >&6 +- +-cat >>confdefs.h <<_ACEOF +-#define RETSIGTYPE $ac_cv_type_signal +-_ACEOF +- +- +- +- +- +- +- +- +- +- +-for ac_func in strchr memcpy strstr strcmp strncmp strncpy strlen +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ if (!foo) return 0; ++ } ++ return !cs[0] && !zero.x; + #endif + +-int +-main () +-{ +-return f != $ac_func; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_const=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "$as_ac_var=no" ++ ac_cv_c_const=no + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +-if test `eval echo '${'$as_ac_var'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 ++$as_echo "$ac_cv_c_const" >&6; } ++if test $ac_cv_c_const = no; then + ++$as_echo "#define const /**/" >>confdefs.h + ++fi + ++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" ++if test "x$ac_cv_type_size_t" = x""yes; then : + +-for ac_func in strncasecmp strcasecmp strncmp +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++cat >>confdefs.h <<_ACEOF ++#define size_t unsigned int ++_ACEOF + +-#undef $ac_func ++fi + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} +-#endif ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 ++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } ++if test "${ac_cv_header_time+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++#include + + int + main () + { +-return f != $ac_func; ++if ((struct tm *) 0) ++return 0; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_time=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "$as_ac_var=no" +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_header_time=no + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +-if test `eval echo '${'$as_ac_var'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-done +- +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 ++$as_echo "$ac_cv_header_time" >&6; } ++if test $ac_cv_header_time = yes; then + ++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + ++fi + +-for ac_func in socket gethostbyname gethostbyname_r gethostbyaddr +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 ++$as_echo_n "checking return type of signal handlers... " >&6; } ++if test "${ac_cv_type_signal+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} +-#endif ++#include ++#include + + int + main () + { +-return f != $ac_func; ++return *(signal (0, 0)) (0) == 1; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_type_signal=int + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_type_signal=void ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 ++$as_echo "$ac_cv_type_signal" >&6; } ++ ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE $ac_cv_type_signal ++_ACEOF ++ ++ ++ ++for ac_func in strchr memcpy strstr strcmp strncmp strncpy strlen ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++done ++ ++for ac_func in strncasecmp strcasecmp strncmp ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++done ++ ++for ac_func in socket gethostbyname gethostbyname_r gethostbyaddr ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + +- ac_config_commands="$ac_config_commands default-1" ++ac_config_commands="$ac_config_commands default-1" + + +- ac_config_files="$ac_config_files Makefile test/Makefile redhat/atftp.spec" ++ac_config_files="$ac_config_files Makefile test/Makefile redhat/atftp.spec" ++ + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -6164,39 +5114,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} | ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -6205,32 +5175,19 @@ + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +-# trailing colons and then remove the whole line if VPATH becomes empty +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/; +-s/:*\${srcdir}:*/:/; +-s/:*@srcdir@:*/:/; +-s/^\([^=]*=[ ]*\):*/\1/; +-s/:*$//; +-s/^[^=]*=[ ]*$//; +-}' +-fi +- + DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. +- ac_i=`echo "$ac_i" | +- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` +- # 2. Add them. +- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -6238,26 +5195,22 @@ + + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + : ${CONFIG_STATUS=./config.status} ++ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -6267,81 +5220,252 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +-DUALCASE=1; export DUALCASE # for MKS sh + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false ++ ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + +-# Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in #(( ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- $as_unset $as_var +- fi +-done ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + +-# PATH needs CR, and LINENO needs CR and PATH. + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +@@ -6349,148 +5473,123 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh +-fi +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done +- +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in +- /*) +- if ("$as_dir/$as_base" -c ' +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | +- sed ' +- N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, +- t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, +- ' >$as_me.lineno && +- chmod +x $as_me.lineno || +- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno +- # Exit status is that of the last command. +- exit +-} +- +- +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in #((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then +- as_expr=expr ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file + else +- as_expr=false ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +- +-rm -f conf$$ conf$$.exe conf$$.file +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links +- as_ln_s='cp -p' +- else ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else ++ as_ln_s='cp -p' + fi +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" ++ + ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' ++fi ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -6499,31 +5598,20 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Open the log real soon, to keep \$[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their +-# values after options handling. Logging --version etc. is OK. +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +-} >&5 +-cat >&5 <<_CSEOF +- ++# values after options handling. ++ac_log=" + This file was extended by $as_me, which was +-generated by GNU Autoconf 2.59. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -6531,45 +5619,47 @@ + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +-_CSEOF +-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +-echo >&5 ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ + _ACEOF + +-# Files that config.status was made for. +-if test -n "$ac_config_files"; then +- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +-fi ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac + +-if test -n "$ac_config_headers"; then +- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +-fi ++case $ac_config_headers in *" ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;; ++esac + +-if test -n "$ac_config_links"; then +- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +-fi + +-if test -n "$ac_config_commands"; then +- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +-fi ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++# Files that config.status was made for. ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" + +-cat >>$CONFIG_STATUS <<\_ACEOF ++_ACEOF + ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTIONS] [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit +- -q, --quiet do not print progress messages ++ -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit ++ -q, --quiet, --silent ++ do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -6580,84 +5670,91 @@ + Configuration commands: + $config_commands + +-Report bugs to ." +-_ACEOF ++Report bugs to the package provider." + +-cat >>$CONFIG_STATUS <<_ACEOF ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.59, +- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.67, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." +-srcdir=$srcdir +-INSTALL="$INSTALL" ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-# If no file are specified by the user, then we need to provide default +-# value. By we need to know if files were specified by the user. ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. + ac_need_defaults=: + while test $# != 0 + do + case $1 in +- --*=*) +- ac_option=`expr "x$1" : 'x\([^=]*\)='` +- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ++ --*=?*) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; +- -*) ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; ++ *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; +- *) # This is not an option, so the user has probably given explicit +- # arguments. +- ac_option=$1 +- ac_need_defaults=false;; + esac + + case $ac_option in + # Handling of the options. +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; +- --version | --vers* | -V ) +- echo "$ac_cs_version"; exit 0 ;; +- --he | --h) +- # Conflict between --help and --header +- { { echo "$as_me:$LINENO: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; };; +- --help | --hel | -h ) +- echo "$ac_cs_usage"; exit 0 ;; +- --debug | --d* | -d ) ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; ++ esac ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift +- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ as_fn_error $? "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; ++ --help | --hel | -h ) ++ $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error $? "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ;; ++ *) as_fn_append ac_config_targets " $1" ++ ac_need_defaults=false ;; + + esac + shift +@@ -6671,43 +5768,55 @@ + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' ++ export CONFIG_SHELL ++ exec "\$@" + fi + + _ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++ $as_echo "$ac_log" ++} >&5 + +-cat >>$CONFIG_STATUS <<_ACEOF ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # +-# INIT-COMMANDS section. ++# INIT-COMMANDS + # +- + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + PLATFORM=$PLATFORM + + _ACEOF + ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +- +-cat >>$CONFIG_STATUS <<\_ACEOF ++# Handling of arguments. + for ac_config_target in $ac_config_targets + do +- case "$ac_config_target" in +- # Handling of arguments. +- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; +- "redhat/atftp.spec" ) CONFIG_FILES="$CONFIG_FILES redhat/atftp.spec" ;; +- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; +- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; +- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; ++ "redhat/atftp.spec") CONFIG_FILES="$CONFIG_FILES redhat/atftp.spec" ;; ++ ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + esac + done + ++ + # If the user did not use the arguments to specify the items to instantiate, + # then the envvar interface is used. Set only those that are not. + # We use the long form for the default assignment because of an extremely +@@ -6719,728 +5828,575 @@ + fi + + # Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason to put it here, and in addition, ++# simply because there is no reason against having it here, and in addition, + # creating and moving files from /tmp can sometimes cause problems. +-# Create a temporary directory, and hook for its removal unless debugging. ++# Hook for its removal unless debugging. ++# Note that there is a small window in which the directory will not be cleaned: ++# after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 ++ trap 'as_fn_exit 1' 1 2 13 15 + } +- + # Create a (secure) tmp directory for tmp files. + + { +- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" + } || + { +- tmp=./confstat$$-$RANDOM +- (umask 077 && mkdir $tmp) +-} || ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. ++if test -n "$CONFIG_FILES"; then ++ ++ ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ++ ac_cs_awk_cr='\\r' ++else ++ ac_cs_awk_cr=$ac_cr ++fi ++ ++echo 'BEGIN {' >"$tmp/subs1.awk" && ++_ACEOF ++ ++ ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && ++ echo "_ACEOF" ++} >conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ . ./conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ ++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ++ if test $ac_delim_n = $ac_delim_num; then ++ break ++ elif $ac_last_try; then ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++rm -f conf$$subs.sh ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++_ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\)..*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\)..*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' >$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" ++ ++} + { +- echo "$me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } ++ ++ print line + } + ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++else ++ cat ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-cat >>$CONFIG_STATUS <<_ACEOF ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// ++s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// ++s/^[^=]*=[ ]*$// ++}' ++fi + +-# +-# CONFIG_FILES section. +-# ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++fi # test -n "$CONFIG_FILES" + +-# No need to generate the scripts if there are no CONFIG_FILES. +-# This happens for instance when ./config.status config.h +-if test -n "\$CONFIG_FILES"; then +- # Protect against being on the right side of a sed subst in config.status. +- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; +- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +-s,@SHELL@,$SHELL,;t t +-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +-s,@exec_prefix@,$exec_prefix,;t t +-s,@prefix@,$prefix,;t t +-s,@program_transform_name@,$program_transform_name,;t t +-s,@bindir@,$bindir,;t t +-s,@sbindir@,$sbindir,;t t +-s,@libexecdir@,$libexecdir,;t t +-s,@datadir@,$datadir,;t t +-s,@sysconfdir@,$sysconfdir,;t t +-s,@sharedstatedir@,$sharedstatedir,;t t +-s,@localstatedir@,$localstatedir,;t t +-s,@libdir@,$libdir,;t t +-s,@includedir@,$includedir,;t t +-s,@oldincludedir@,$oldincludedir,;t t +-s,@infodir@,$infodir,;t t +-s,@mandir@,$mandir,;t t +-s,@build_alias@,$build_alias,;t t +-s,@host_alias@,$host_alias,;t t +-s,@target_alias@,$target_alias,;t t +-s,@DEFS@,$DEFS,;t t +-s,@ECHO_C@,$ECHO_C,;t t +-s,@ECHO_N@,$ECHO_N,;t t +-s,@ECHO_T@,$ECHO_T,;t t +-s,@LIBS@,$LIBS,;t t +-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +-s,@INSTALL_DATA@,$INSTALL_DATA,;t t +-s,@CYGPATH_W@,$CYGPATH_W,;t t +-s,@PACKAGE@,$PACKAGE,;t t +-s,@VERSION@,$VERSION,;t t +-s,@ACLOCAL@,$ACLOCAL,;t t +-s,@AUTOCONF@,$AUTOCONF,;t t +-s,@AUTOMAKE@,$AUTOMAKE,;t t +-s,@AUTOHEADER@,$AUTOHEADER,;t t +-s,@MAKEINFO@,$MAKEINFO,;t t +-s,@AMTAR@,$AMTAR,;t t +-s,@install_sh@,$install_sh,;t t +-s,@STRIP@,$STRIP,;t t +-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +-s,@mkdir_p@,$mkdir_p,;t t +-s,@AWK@,$AWK,;t t +-s,@SET_MAKE@,$SET_MAKE,;t t +-s,@am__leading_dot@,$am__leading_dot,;t t +-s,@ISODATE@,$ISODATE,;t t +-s,@build@,$build,;t t +-s,@build_cpu@,$build_cpu,;t t +-s,@build_vendor@,$build_vendor,;t t +-s,@build_os@,$build_os,;t t +-s,@host@,$host,;t t +-s,@host_cpu@,$host_cpu,;t t +-s,@host_vendor@,$host_vendor,;t t +-s,@host_os@,$host_os,;t t +-s,@PLATFORM@,$PLATFORM,;t t +-s,@CC@,$CC,;t t +-s,@CFLAGS@,$CFLAGS,;t t +-s,@LDFLAGS@,$LDFLAGS,;t t +-s,@CPPFLAGS@,$CPPFLAGS,;t t +-s,@ac_ct_CC@,$ac_ct_CC,;t t +-s,@EXEEXT@,$EXEEXT,;t t +-s,@OBJEXT@,$OBJEXT,;t t +-s,@DEPDIR@,$DEPDIR,;t t +-s,@am__include@,$am__include,;t t +-s,@am__quote@,$am__quote,;t t +-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +-s,@CCDEPMODE@,$CCDEPMODE,;t t +-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +-s,@CPP@,$CPP,;t t +-s,@EGREP@,$EGREP,;t t +-s,@LIBPTHREAD@,$LIBPTHREAD,;t t +-s,@LIBTERMCAP@,$LIBTERMCAP,;t t +-s,@LIBREADLINE@,$LIBREADLINE,;t t +-s,@LIBWRAP@,$LIBWRAP,;t t +-s,@LIBPCRE@,$LIBPCRE,;t t +-s,@LIBOBJS@,$LIBOBJS,;t t +-s,@LTLIBOBJS@,$LTLIBOBJS,;t t +-CEOF +- +-_ACEOF +- +- cat >>$CONFIG_STATUS <<\_ACEOF +- # Split the substitutions into bite-sized pieces for seds with +- # small command number limits, like on Digital OSF/1 and HP-UX. +- ac_max_sed_lines=48 +- ac_sed_frag=1 # Number of current file. +- ac_beg=1 # First line for current file. +- ac_end=$ac_max_sed_lines # Line after last line for current file. +- ac_more_lines=: +- ac_sed_cmds= +- while $ac_more_lines; do +- if test $ac_beg -gt 1; then +- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- else +- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- fi +- if test ! -s $tmp/subs.frag; then +- ac_more_lines=false +- else +- # The purpose of the label and of the branching condition is to +- # speed up the sed processing (if there are no `@' at all, there +- # is no need to browse any of the substitutions). +- # These are the two extra sed commands mentioned above. +- (echo ':t +- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" +- fi +- ac_sed_frag=`expr $ac_sed_frag + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_lines` +- fi +- done +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$tmp/defines.awk" <<\_ACAWK || ++BEGIN { ++_ACEOF ++ ++# Transform confdefs.h into an awk script `defines.awk', embedded as ++# here-document in config.status, that substitutes the proper values into ++# config.h.in to produce config.h. ++ ++# Create a delimiter string that does not exist in confdefs.h, to ease ++# handling of long lines. ++ac_delim='%!_!# ' ++for ac_last_try in false false :; do ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_t"; then ++ break ++ elif $ac_last_try; then ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +-fi # test -n "$CONFIG_FILES" ++done + ++# For the awk script, D is an array of macro values keyed by name, ++# likewise P contains macro parameters if any. Preserve backslash ++# newline sequences. ++ ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++sed -n ' ++s/.\{148\}/&'"$ac_delim"'/g ++t rset ++:rset ++s/^[ ]*#[ ]*define[ ][ ]*/ / ++t def ++d ++:def ++s/\\$// ++t bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3"/p ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p ++d ++:bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3\\\\\\n"\\/p ++t cont ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p ++t cont ++d ++:cont ++n ++s/.\{148\}/&'"$ac_delim"'/g ++t clear ++:clear ++s/\\$// ++t bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/"/p ++d ++:bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p ++b cont ++' >$CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ for (key in D) D_is_set[key] = 1 ++ FS = "" ++} ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { ++ line = \$ 0 ++ split(line, arg, " ") ++ if (arg[1] == "#") { ++ defundef = arg[2] ++ mac1 = arg[3] ++ } else { ++ defundef = substr(arg[1], 2) ++ mac1 = arg[2] ++ } ++ split(mac1, mac2, "(") #) ++ macro = mac2[1] ++ prefix = substr(line, 1, index(line, defundef) - 1) ++ if (D_is_set[macro]) { ++ # Preserve the white space surrounding the "#". ++ print prefix "define", macro P[macro] D[macro] ++ next ++ } else { ++ # Replace #undef with comments. This is necessary, for example, ++ # in the case of _POSIX_SOURCE, which is predefined and required ++ # on some systems where configure will not decide to define it. ++ if (defundef == "undef") { ++ print "/*", prefix defundef, macro, "*/" ++ next ++ } ++ } ++} ++{ print } ++_ACAWK + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 ++fi # test -n "$CONFIG_HEADERS" ++ ++ ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" ++shift ++for ac_tag ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; ++ esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift ++ ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; ++ esac ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ as_fn_append ac_file_inputs " '$ac_f'" ++ done ++ ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input='Generated from '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} ++ fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; ++ esac ++ ;; + esac + +- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +- ac_dir=`(dirname "$ac_file") 2>/dev/null || ++ ac_dir=`$as_dirname -- "$ac_file" || + $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac + ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++_ACEOF + +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- configure_input= +- else +- configure_input="$ac_file. " +- fi +- configure_input=$configure_input"Generated from `echo $ac_file_in | +- sed 's,.*/,,'` by configure." +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } +- +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= ++ac_sed_dataroot=' ++/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF +- sed "$ac_vpsub ++ ++# Neutralize VPATH when `$srcdir' = `.'. ++# Shell code in configure.ac might set extrasub. ++# FIXME: do we really want to maintain this feature? ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s,@configure_input@,$configure_input,;t t +-s,@srcdir@,$ac_srcdir,;t t +-s,@abs_srcdir@,$ac_abs_srcdir,;t t +-s,@top_srcdir@,$ac_top_srcdir,;t t +-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +-s,@builddir@,$ac_builddir,;t t +-s,@abs_builddir@,$ac_abs_builddir,;t t +-s,@top_builddir@,$ac_top_builddir,;t t +-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +-s,@INSTALL@,$ac_INSTALL,;t t +-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out +- rm -f $tmp/stdin +- if test x"$ac_file" != x-; then +- mv $tmp/out $ac_file +- else +- cat $tmp/out +- rm -f $tmp/out +- fi +- +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_HEADER section. +-# +- +-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +-# NAME is the cpp macro being defined and VALUE is the value it is being given. +-# +-# ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='[ ].*$,\1#\2' +-ac_dC=' ' +-ac_dD=',;t' +-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='$,\1#\2define\3' +-ac_uC=' ' +-ac_uD=',;t' ++s|@configure_input@|$ac_sed_conf_input|;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++$ac_datarootdir_hack ++" ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ ++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined" >&5 ++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined" >&2;} + +-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ rm -f "$tmp/stdin" + case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; +- esac +- +- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- # Do quote $f, to prevent DOS paths from being IFS'd. +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } +- # Remove the trailing spaces. +- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in +- +-_ACEOF +- +-# Transform confdefs.h into two sed scripts, `conftest.defines' and +-# `conftest.undefs', that substitutes the proper values into +-# config.h.in to produce config.h. The first handles `#define' +-# templates, and the second `#undef' templates. +-# And first: Protect against being on the right side of a sed subst in +-# config.status. Protect against being in an unquoted here document +-# in config.status. +-rm -f conftest.defines conftest.undefs +-# Using a here document instead of a string reduces the quoting nightmare. +-# Putting comments in sed scripts is not portable. +-# +-# `end' is used to avoid that the second main sed command (meant for +-# 0-ary CPP macros) applies to n-ary macro definitions. +-# See the Autoconf documentation for `clear'. +-cat >confdef2sed.sed <<\_ACEOF +-s/[\\&,]/\\&/g +-s,[\\$`],\\&,g +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +-t end +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +-: end +-_ACEOF +-# If some macros were called several times there might be several times +-# the same #defines, which is useless. Nevertheless, we may not want to +-# sort them, since we want the *last* AC-DEFINE to be honored. +-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +-rm -f confdef2sed.sed +- +-# This sed command replaces #undef with comments. This is necessary, for +-# example, in the case of _POSIX_SOURCE, which is predefined and required +-# on some systems where configure will not decide to define it. +-cat >>conftest.undefs <<\_ACEOF +-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +-_ACEOF +- +-# Break up conftest.defines because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +-echo ' :' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.defines >/dev/null +-do +- # Write a limited-size here document to $tmp/defines.sed. +- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#define' lines. +- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS +- echo 'CEOF +- sed -f $tmp/defines.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail +- rm -f conftest.defines +- mv conftest.tail conftest.defines +-done +-rm -f conftest.defines +-echo ' fi # grep' >>$CONFIG_STATUS +-echo >>$CONFIG_STATUS +- +-# Break up conftest.undefs because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.undefs >/dev/null +-do +- # Write a limited-size here document to $tmp/undefs.sed. +- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#undef' +- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS +- echo 'CEOF +- sed -f $tmp/undefs.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail +- rm -f conftest.undefs +- mv conftest.tail conftest.undefs +-done +-rm -f conftest.undefs +- +-cat >>$CONFIG_STATUS <<\_ACEOF +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- echo "/* Generated by configure. */" >$tmp/config.h +- else +- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h +- fi +- cat $tmp/in >>$tmp/config.h +- rm -f $tmp/in ++ -) cat "$tmp/out" && rm -f "$tmp/out";; ++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ esac \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # + if test x"$ac_file" != x-; then +- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +-echo "$as_me: $ac_file is unchanged" >&6;} ++ { ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" ++ } >"$tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 ++$as_echo "$as_me: $ac_file is unchanged" >&6;} + else +- ac_dir=`(dirname "$ac_file") 2>/dev/null || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- +- rm -f $ac_file +- mv $tmp/config.h $ac_file ++ rm -f "$ac_file" ++ mv "$tmp/config.h" "$ac_file" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else +- cat $tmp/config.h +- rm -f $tmp/config.h ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi +-# Compute $ac_file's index in $config_headers. ++# Compute "$ac_file"'s index in $config_headers. + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ "$ac_file" | "$ac_file":* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X$ac_file | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'`/stamp-h$_am_stamp_count +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_COMMANDS section. +-# +-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue +- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` +- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_dir=`(dirname "$ac_dest") 2>/dev/null || +-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_dest" : 'X\(//\)[^/]' \| \ +- X"$ac_dest" : 'X\(//\)$' \| \ +- X"$ac_dest" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_dest" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- +- ac_builddir=. +- +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi +- +-case $srcdir in +- .) # No --srcdir option. We are building in place. +- ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac ++echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; + +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac + + +- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +-echo "$as_me: executing $ac_dest commands" >&6;} +- case $ac_dest in +- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. +@@ -7450,18 +6406,29 @@ + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`(dirname "$mf") 2>/dev/null || ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ +- X"$mf" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$mf" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$mf" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + else + continue + fi +@@ -7489,66 +6456,54 @@ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +- fdir=`(dirname "$file") 2>/dev/null || ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ +- X"$file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p $dirpart/$fdir +- else +- as_dir=$dirpart/$fdir +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} +- { (exit 1); exit 1; }; }; } +- ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + ;; +- default-1 ) ++ "default-1":C) + outfile=PLATFORM + tmpfile=${outfile} + cat > $tmpfile << _EOF_ + $PLATFORM + _EOF_ + ;; ++ + esac +-done +-_ACEOF ++done # for ac_tag + +-cat >>$CONFIG_STATUS <<\_ACEOF + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + ++test $ac_write_fail = 0 || ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -7568,6 +6523,10 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit 1 ++fi ++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + +--- atftp-0.7.dfsg.orig/PLATFORM ++++ atftp-0.7.dfsg/PLATFORM +@@ -0,0 +1 @@ ++pc-i686-linux-gnu +--- atftp-0.7.dfsg.orig/configure.ac ++++ atftp-0.7.dfsg/configure.ac +@@ -62,6 +62,7 @@ + + dnl Check for programs + AC_PROG_CC ++AC_GNU_SOURCE + + dnl Check for AIX + AC_AIX +--- atftp-0.7.dfsg.orig/config.guess ++++ atftp-0.7.dfsg/config.guess +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. + +-timestamp='2004-01-05' ++timestamp='2008-01-23' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,13 +18,15 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++ + # Originally written by Per Bothner . + # Please send patches to . Submit a context + # diff and a properly formatted ChangeLog entry. +@@ -53,8 +56,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +69,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -104,7 +107,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -123,7 +126,7 @@ + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -158,6 +161,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -196,53 +200,32 @@ + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pegasos:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU +@@ -280,45 +263,49 @@ + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms +- exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 +- exit 0 ;; ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -326,32 +313,32 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -360,10 +347,10 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -375,10 +362,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -389,37 +376,40 @@ + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -443,32 +433,33 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` +@@ -484,29 +475,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -514,7 +505,7 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -529,15 +520,19 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -550,28 +545,28 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -633,9 +628,19 @@ + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else +@@ -643,11 +648,11 @@ + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -675,163 +680,192 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using +- # FreeBSD's kernel, but not the complete OS. +- case ${LIBC} in gnu) kernel_only='k' ;; esac +- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; ++ exit ;; ++ *:Interix*:[3456]*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T | authenticamd) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix +- exit 0 ;; ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- exit 0 ;; ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ exit ;; + arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu +- exit 0 ;; ++ exit ;; ++ crisv32:Linux:*:*) ++ echo crisv32-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo frv-unknown-linux-gnu ++ exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -848,8 +882,12 @@ + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build +@@ -867,15 +905,22 @@ + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -889,7 +934,7 @@ + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -897,25 +942,31 @@ + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; ++ exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent +@@ -933,15 +984,15 @@ + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; ++ exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; ++ exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; ++ exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build +@@ -958,7 +1009,7 @@ + LIBC=gnulibc1 + # endif + #else +- #ifdef __INTEL_COMPILER ++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout +@@ -968,16 +1019,23 @@ + LIBC=dietlibc + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^LIBC/{ ++ s: ::g ++ p ++ }'`" ++ test x"${LIBC}" != x && { ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ++ } ++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... +@@ -985,27 +1043,27 @@ + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:syllable:*:*) ++ exit ;; ++ i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable +- exit 0 ;; ++ exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -1013,15 +1071,16 @@ + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -1113,68 +1172,81 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; ++ exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) +- case `uname -p` in +- *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +@@ -1182,22 +1254,25 @@ + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1208,31 +1283,47 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; +- *:DRAGONFLY:*:*) +- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +@@ -1264,7 +1355,7 @@ + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -1353,11 +1444,12 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1366,22 +1458,22 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +@@ -1392,7 +1484,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- ftp://ftp.gnu.org/pub/gnu/config/ ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++and ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +--- atftp-0.7.dfsg.orig/tftpd.c ++++ atftp-0.7.dfsg/tftpd.c +@@ -57,9 +57,12 @@ + int tftpd_max_thread = 100; /* number of concurent thread allowed */ + int tftpd_timeout = 300; /* number of second of inactivity + before exiting */ +-char directory[MAXLEN] = "/tftpboot/"; ++char directory[MAXLEN] = "/srv/tftp/"; + int retry_timeout = S_TIMEOUT; + ++int on = 1; ++int listen_local = 0; ++ + int tftpd_daemon = 0; /* By default we are started by inetd */ + int tftpd_daemon_no_fork = 0; /* For who want a false daemon mode */ + short tftpd_port = 0; /* Port atftpd listen to */ +@@ -153,10 +156,10 @@ + int run = 1; /* while (run) loop */ + struct thread_data *new; /* for allocation of new thread_data */ + int sockfd; /* used in daemon mode */ +- struct sockaddr_in sa; /* used in daemon mode */ +- struct servent *serv; ++ struct sockaddr_storage sa; /* used in daemon mode */ + struct passwd *user; + struct group *group; ++ pthread_t tid; + + #ifdef HAVE_MTFTP + pthread_t mtftp_thread; +@@ -228,32 +231,48 @@ + exit(2); + } + +- /* find the port */ +- if (tftpd_port == 0) ++ /* find the port; initialise sockaddr_storage structure */ ++ if (strlen(tftpd_addr) > 0 || tftpd_port == 0) + { +- if ((serv = getservbyname("tftp", "udp")) == NULL) ++ struct addrinfo hints, *result; ++ int err; ++ ++ /* look up the service and host */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; ++ hints.ai_flags = AI_NUMERICHOST; ++ err = getaddrinfo(tftpd_addr, tftpd_port ? NULL : "tftp", ++ &hints, &result); ++ if (err == EAI_SERVICE) + { + logger(LOG_ERR, "atftpd: udp/tftp, unknown service"); + exit(1); + } +- tftpd_port = ntohs(serv->s_port); +- } +- /* initialise sockaddr_in structure */ +- memset(&sa, 0, sizeof(sa)); +- sa.sin_family = AF_INET; +- sa.sin_port = htons(tftpd_port); +- if (strlen(tftpd_addr) > 0) +- { +- if (inet_aton(tftpd_addr, &(sa.sin_addr)) == 0) ++ if (err || sockaddr_set_addrinfo(&sa, result)) + { + logger(LOG_ERR, "atftpd: invalid IP address %s", tftpd_addr); + exit(1); + } ++ ++ if (!tftpd_port) ++ tftpd_port = sockaddr_get_port(&sa); ++ else { ++ sa.ss_family = AF_INET; ++ sockaddr_set_port(&sa, tftpd_port); ++ } ++ ++ freeaddrinfo(result); + } +- else +- sa.sin_addr.s_addr = htonl(INADDR_ANY); ++ ++ if (strlen(tftpd_addr) == 0) ++ { ++ memset(&sa, 0, sizeof(sa)); ++ sa.ss_family = AF_INET; ++ sockaddr_set_port(&sa, tftpd_port); ++ } ++ + /* open the socket */ +- if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) ++ if ((sockfd = socket(sa.ss_family, SOCK_DGRAM, 0)) == 0) + { + logger(LOG_ERR, "atftpd: can't open socket"); + exit(1); +@@ -300,11 +319,13 @@ + open_logger("atftpd", log_file, logging_level); + } + ++#if defined(SOL_IP) && defined(IP_PKTINFO) + /* We need to retieve some information from incomming packets */ + if (setsockopt(0, SOL_IP, IP_PKTINFO, &one, sizeof(one)) != 0) + { + logger(LOG_WARNING, "Failed to set socket option: %s", strerror(errno)); + } ++#endif + + /* save main thread ID for proper signal handling */ + main_thread_id = pthread_self(); +@@ -387,10 +408,18 @@ + packets */ + if (!tftpd_cancel) + { ++ int rv; ++ + if ((tftpd_timeout == 0) || (tftpd_daemon)) +- select(FD_SETSIZE, &rfds, NULL, NULL, NULL); ++ rv = select(FD_SETSIZE, &rfds, NULL, NULL, NULL); + else +- select(FD_SETSIZE, &rfds, NULL, NULL, &tv); ++ rv = select(FD_SETSIZE, &rfds, NULL, NULL, &tv); ++ if (rv < 0) { ++ logger(LOG_ERR, "%s: %d: select: %s", ++ __FILE__, __LINE__, strerror(errno)); ++ /* Clear the bits, they are undefined! */ ++ FD_ZERO(&rfds); ++ } + } + + #ifdef RATE_CONTROL +@@ -466,7 +495,7 @@ + new->client_info->next = NULL; + + /* Start a new server thread. */ +- if (pthread_create(&new->tid, NULL, tftpd_receive_request, ++ if (pthread_create(&tid, NULL, tftpd_receive_request, + (void *)new) != 0) + { + logger(LOG_ERR, "Failed to start new thread"); +@@ -558,16 +587,15 @@ + int num_of_threads; + int abort = 0; /* 1 if we need to abort because the maximum + number of threads have been reached*/ +- struct sockaddr_in to; /* destination of client's packet */ +- socklen_t len = sizeof(struct sockaddr); ++ struct sockaddr_storage to; /* destination of client's packet */ ++ socklen_t len = sizeof(to); + +-#ifdef HAVE_WRAP +- char client_addr[16]; +-#endif ++ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; + + /* Detach ourself. That way the main thread does not have to + * wait for us with pthread_join. */ +- pthread_detach(pthread_self()); ++ data->tid = pthread_self(); ++ pthread_detach(data->tid); + + /* Read the first packet from stdin. */ + data_size = data->data_buffer_size; +@@ -591,12 +619,12 @@ + { + /* Verify the client has access. We don't look for the name but + rely only on the IP address for that. */ +- inet_ntop(AF_INET, &data->client_info->client.sin_addr, +- client_addr, sizeof(client_addr)); +- if (hosts_ctl("in.tftpd", STRING_UNKNOWN, client_addr, ++ sockaddr_print_addr(&data->client_info->client, ++ addr_str, sizeof(addr_str)); ++ if (hosts_ctl("in.tftpd", STRING_UNKNOWN, addr_str, + STRING_UNKNOWN) == 0) + { +- logger(LOG_ERR, "Connection refused from %s", client_addr); ++ logger(LOG_ERR, "Connection refused from %s", addr_str); + abort = 1; + } + } +@@ -612,9 +640,27 @@ + else + { + /* open a socket for client communication */ +- data->sockfd = socket(PF_INET, SOCK_DGRAM, 0); +- to.sin_family = AF_INET; +- to.sin_port = 0; ++ data->sockfd = socket(data->client_info->client.ss_family, ++ SOCK_DGRAM, 0); ++ memset(&to, 0, sizeof(to)); ++ to.ss_family = data->client_info->client.ss_family; ++ /* Force socket to listen on local address. Do not listen on broadcast address 255.255.255.255. ++ If the socket listens on the broadcast address, Linux tells the remote client the port ++ is unreachable. This happens even if SO_BROADCAST is set in setsockopt for this socket. ++ I was unable to find a kernel option or /proc/sys flag to make the kernel pay attention to ++ these requests, so the workaround is to force listening on the local address. */ ++ if (listen_local == 1) ++ { ++ logger(LOG_INFO, "forcing socket to listen on local address"); ++ if (setsockopt(data->sockfd, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)) != 0) { ++ logger(LOG_ERR, "setsockopt: %s", strerror(errno)); ++ } ++ } ++ else ++ { ++ logger(LOG_INFO, "socket may listen on any address, including broadcast"); ++ } ++ + if (data->sockfd > 0) + { + /* bind the socket to the interface */ +@@ -624,13 +670,16 @@ + retval = ABORT; + } + /* read back assigned port */ +- len = sizeof(struct sockaddr); ++ len = sizeof(to); + if (getsockname(data->sockfd, (struct sockaddr *)&to, &len) == -1) + { + logger(LOG_ERR, "getsockname: %s", strerror(errno)); + retval = ABORT; + } + /* connect the socket, faster for kernel operation */ ++ /* this is not a good idea on FreeBSD, because sendto() cannot ++ be used on a connected datagram socket */ ++#if !defined(__FreeBSD_kernel__) + if (connect(data->sockfd, + (struct sockaddr *)&data->client_info->client, + sizeof(data->client_info->client)) == -1) +@@ -638,8 +687,10 @@ + logger(LOG_ERR, "connect: %s", strerror(errno)); + retval = ABORT; + } ++#endif + logger(LOG_DEBUG, "Creating new socket: %s:%d", +- inet_ntoa(to.sin_addr), ntohs(to.sin_port)); ++ sockaddr_print_addr(&to, addr_str, sizeof(addr_str)), ++ sockaddr_get_port(&to)); + + /* read options from request */ + opt_parse_request(data->data_buffer, data_size, +@@ -657,8 +708,9 @@ + case GET_RRQ: + logger(LOG_NOTICE, "Serving %s to %s:%d", + data->tftp_options[OPT_FILENAME].value, +- inet_ntoa(data->client_info->client.sin_addr), +- ntohs(data->client_info->client.sin_port)); ++ sockaddr_print_addr(&data->client_info->client, ++ addr_str, sizeof(addr_str)), ++ sockaddr_get_port(&data->client_info->client)); + if (data->trace) + logger(LOG_DEBUG, "received RRQ <%s>", string); + if (tftpd_send_file(data) == OK) +@@ -668,7 +720,8 @@ + break; + case GET_WRQ: + logger(LOG_NOTICE, "Fetching from %s to %s", +- inet_ntoa(data->client_info->client.sin_addr), ++ sockaddr_print_addr(&data->client_info->client, ++ addr_str, sizeof(addr_str)), + data->tftp_options[OPT_FILENAME].value); + if (data->trace) + logger(LOG_DEBUG, "received WRQ <%s>", string); +@@ -693,7 +746,9 @@ + break; + default: + logger(LOG_NOTICE, "Invalid request <%d> from %s", +- retval, inet_ntoa(data->client_info->client.sin_addr)); ++ retval, ++ sockaddr_print_addr(&data->client_info->client, ++ addr_str, sizeof(addr_str))); + tftp_send_error(data->sockfd, &data->client_info->client, + EBADOP, data->data_buffer, data->data_buffer_size); + if (data->trace) +@@ -732,8 +787,8 @@ + tftpd_clientlist_free(data); + + /* free the thread structure */ +- free(data); +- ++ free(data); ++ + logger(LOG_INFO, "Server thread exiting"); + pthread_exit(NULL); + } +@@ -811,6 +866,7 @@ + { "no-multicast", 0, NULL, 'M' }, + { "logfile", 1, NULL, 'L' }, + { "pidfile", 1, NULL, 'I'}, ++ { "listen-local", 0, NULL, 'F'}, + { "daemon", 0, NULL, 'D' }, + { "no-fork", 0, NULL, 'N'}, + { "user", 1, NULL, 'U'}, +@@ -888,6 +944,9 @@ + case 'I': + pidfile = strdup(optarg); + break; ++ case 'F': ++ listen_local = 1; ++ break; + case 'D': + tftpd_daemon = 1; + break; +@@ -1015,6 +1074,10 @@ + logger(LOG_INFO, " log file: %s", (log_file==NULL) ? "syslog":log_file); + if (pidfile) + logger(LOG_INFO, " pid file: %s", pidfile); ++ if (listen_local == 1) ++ logger(LOG_INFO, " forcing to listen on local interfaces: on."); ++ else ++ logger(LOG_INFO, " not forcing to listen on local interfaces."); + if (tftpd_daemon == 1) + logger(LOG_INFO, " server timeout: Not used"); + else +@@ -1111,11 +1174,12 @@ + " output messages\n" + " --trace : log all sent and received packets\n" + " --no-timeout : disable 'timeout' from RFC2349\n" +- " --no-tisize : disable 'tsize' from RFC2349\n" ++ " --no-tsize : disable 'tsize' from RFC2349\n" + " --no-blksize : disable 'blksize' from RFC2348\n" + " --no-multicast : disable 'multicast' from RFC2090\n" + " --logfile : logfile to log logs to ;-)\n" + " --pidfile : write PID to this file\n" ++ " --listen-local : force listen on local network address\n" + " --daemon : run atftpd standalone (no inetd)\n" + " --no-fork : run as a daemon, don't fork\n" + " --user : default is nobody\n" +--- atftp-0.7.dfsg.orig/tftpd.h ++++ atftp-0.7.dfsg/tftpd.h +@@ -44,8 +44,8 @@ + /* multicast stuff */ + short mc_port; /* multicast port */ + char *mc_addr; /* multicast address */ +- struct sockaddr_in sa_mcast; +- struct ip_mreq mcastaddr; ++ struct sockaddr_storage sa_mcast; ++ union ip_mreq_storage mcastaddr; + u_char mcast_ttl; + + /* +@@ -69,7 +69,7 @@ + }; + + struct client_info { +- struct sockaddr_in client; ++ struct sockaddr_storage client; + int done; /* that client as receive it's file */ + struct client_info *next; + }; +@@ -99,7 +99,7 @@ + void tftpd_clientlist_free(struct thread_data *thread); + int tftpd_clientlist_done(struct thread_data *thread, + struct client_info *client, +- struct sockaddr_in *sock); ++ struct sockaddr_storage *sock); + int tftpd_clientlist_next(struct thread_data *thread, + struct client_info **client); + void tftpd_list_kill_threads(void); +--- atftp-0.7.dfsg.orig/config.sub ++++ atftp-0.7.dfsg/config.sub +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. + +-timestamp='2004-01-05' ++timestamp='2008-01-16' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,14 +22,15 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, +-# Boston, MA 02111-1307, USA. +- ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++ + # Please send patches to . Submit a context + # diff and a properly formatted ChangeLog entry. + # +@@ -70,8 +72,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -83,11 +85,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -99,7 +101,7 @@ + *local*) + # First pass through any local machine types. + echo $1 +- exit 0;; ++ exit ;; + + * ) + break ;; +@@ -118,8 +120,9 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ +- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -145,7 +148,7 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis) ++ -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; +@@ -170,6 +173,10 @@ + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -186,6 +193,10 @@ + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -230,14 +241,16 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +- | fr30 | frv \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m68000 | m68k | m88k | mcore \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -246,6 +259,7 @@ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ +@@ -254,20 +268,24 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | mt \ + | msp430 \ ++ | nios | nios2 \ + | ns16k | ns32k \ +- | openrisc | or32 \ ++ | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ +- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ +- | strongarm \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xstormy16 | xtensa \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; +@@ -278,6 +296,9 @@ + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and +@@ -297,20 +318,20 @@ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ +- | bs2000-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ +- | clipper-* | cydra-* \ ++ | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* \ ++ | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -319,6 +340,7 @@ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ +@@ -326,27 +348,35 @@ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ + | msp430-* \ +- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ +- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ +- | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-*) + ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) +@@ -363,6 +393,9 @@ + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout +@@ -414,6 +447,14 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + c90) + basic_machine=c90-cray + os=-unicos +@@ -442,12 +483,27 @@ + basic_machine=j90-cray + os=-unicos + ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16) ++ basic_machine=cr16-unknown ++ os=-elf ++ ;; + crds | unos) + basic_machine=m68k-crds + ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; +@@ -470,6 +526,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx +@@ -620,6 +680,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -635,6 +703,10 @@ + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -648,10 +720,6 @@ + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; +- mmix*) +- basic_machine=mmix-knuth +- os=-mmixware +- ;; + monitor) + basic_machine=m68k-rom68k + os=-coff +@@ -664,6 +732,9 @@ + basic_machine=i386-pc + os=-msdos + ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs +@@ -732,10 +803,6 @@ + np1) + basic_machine=np1-gould + ;; +- nv1) +- basic_machine=nv1-cray +- os=-unicosmp +- ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -743,9 +810,8 @@ + basic_machine=hppa1.1-oki + os=-proelf + ;; +- or32 | or32-*) ++ openrisc | openrisc-*) + basic_machine=or32-unknown +- os=-coff + ;; + os400) + basic_machine=powerpc-ibm +@@ -767,6 +833,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -776,6 +850,12 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +@@ -832,6 +912,10 @@ + basic_machine=i586-unknown + os=-pw32 + ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff +@@ -858,6 +942,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -869,6 +957,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -958,6 +1049,10 @@ + basic_machine=tic6x-unknown + os=-coff + ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; + tx39) + basic_machine=mipstx39-unknown + ;; +@@ -1018,6 +1113,10 @@ + basic_machine=hppa1.1-winbond + os=-proelf + ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; +@@ -1048,6 +1147,9 @@ + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; +@@ -1064,13 +1166,10 @@ + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sh64) +- basic_machine=sh64-unknown +- ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) +@@ -1143,19 +1242,23 @@ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ +- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1173,7 +1276,7 @@ + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) +@@ -1282,6 +1385,9 @@ + -kaos*) + os=-kaos + ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; + -none) + ;; + *) +@@ -1304,6 +1410,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1313,9 +1425,9 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +@@ -1341,6 +1453,9 @@ + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; +@@ -1359,9 +1474,15 @@ + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +@@ -1527,7 +1648,7 @@ + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) +--- atftp-0.7.dfsg.orig/stats.c ++++ atftp-0.7.dfsg/stats.c +@@ -157,8 +157,8 @@ + + logger(LOG_INFO, " Load measurements:"); + logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs", +- (double)(s_stats.tms.tms_utime) / CLK_TCK, +- (double)(s_stats.tms.tms_stime) / CLK_TCK); ++ (double)(s_stats.tms.tms_utime) / CLOCKS_PER_SEC, ++ (double)(s_stats.tms.tms_stime) / CLOCKS_PER_SEC); + logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%", + (double)(tmp.tv_sec + tmp.tv_usec * 1e-6), + (double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) / +--- atftp-0.7.dfsg.orig/argz.h ++++ atftp-0.7.dfsg/argz.h +@@ -180,7 +180,7 @@ + #ifdef __USE_EXTERN_INLINES + extern inline char * + __argz_next (__const char *__argz, size_t __argz_len, +- __const char *__entry) __THROW ++ __const char *__entry) + { + if (__entry) + { +@@ -194,7 +194,7 @@ + } + extern inline char * + argz_next (__const char *__argz, size_t __argz_len, +- __const char *__entry) __THROW ++ __const char *__entry) + { + return __argz_next (__argz, __argz_len, __entry); + } +--- atftp-0.7.dfsg.orig/Makefile.am ++++ atftp-0.7.dfsg/Makefile.am +@@ -16,6 +16,7 @@ + DIST_SUBDIRS = $(SUBDIRS) + CLEANFILES = *~ + DISTCLEANFILES = libtool config.status ++AM_CPPFLAGS = -D_GNU_SOURCE + + man_MANS = atftp.1 atftpd.8 + dist_scripts = autogen.sh +@@ -32,7 +33,7 @@ + argz.c tftp_mtftp.c + + sbin_PROGRAMS = atftpd +-atftpd_LDADD = $(LIBPTHREAD) $(LIBWRAP) $(LIBPCRE) ++atftpd_LDADD = $(LIBWRAP) $(LIBPTHREAD) $(LIBPCRE) + atftpd_SOURCES = tftpd.c logger.c options.c stats.c tftp_io.c tftp_def.c \ + tftpd_file.c tftpd_list.c tftpd_mcast.c argz.c tftpd_pcre.c \ + tftpd_mtftp.c +--- atftp-0.7.dfsg.orig/Makefile.in ++++ atftp-0.7.dfsg/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.8.2 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -68,7 +68,7 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = redhat/atftp.spec +-am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) +@@ -230,7 +230,7 @@ + atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \ + argz.c tftp_mtftp.c + +-atftpd_LDADD = $(LIBPTHREAD) $(LIBWRAP) $(LIBPCRE) ++atftpd_LDADD = $(LIBWRAP) $(LIBPTHREAD) $(LIBPCRE) + atftpd_SOURCES = tftpd.c logger.c options.c stats.c tftp_io.c tftp_def.c \ + tftpd_file.c tftpd_list.c tftpd_mcast.c argz.c tftpd_pcre.c \ + tftpd_mtftp.c +@@ -294,14 +294,14 @@ + cd $(top_builddir) && $(SHELL) ./config.status $@ + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkdir_p) $(DESTDIR)$(bindir) ++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -309,22 +309,22 @@ + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + + clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + install-sbinPROGRAMS: $(sbin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkdir_p) $(DESTDIR)$(sbindir) ++ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -332,8 +332,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ +- rm -f $(DESTDIR)$(sbindir)/$$f; \ ++ echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(sbindir)/$$f"; \ + done + + clean-sbinPROGRAMS: +@@ -385,7 +385,7 @@ + uninstall-info-am: + install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- $(mkdir_p) $(DESTDIR)$(man1dir) ++ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -404,8 +404,8 @@ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done + uninstall-man1: + @$(NORMAL_UNINSTALL) +@@ -425,12 +425,12 @@ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ +- rm -f $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done + install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- $(mkdir_p) $(DESTDIR)$(man8dir) ++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -449,8 +449,8 @@ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done + uninstall-man8: + @$(NORMAL_UNINSTALL) +@@ -470,8 +470,8 @@ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ +- rm -f $(DESTDIR)$(man8dir)/$$inst; \ ++ echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ ++ rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -547,14 +547,16 @@ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -564,9 +566,11 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -678,7 +682,7 @@ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +@@ -701,7 +705,7 @@ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ +- (cd ../.. && $(mkdir_p) "$$dc_destdir") \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ +@@ -738,7 +742,9 @@ + all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h + installdirs: installdirs-recursive + installdirs-am: +- $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +--- atftp-0.7.dfsg.orig/tftpd_mtftp.c ++++ atftp-0.7.dfsg/tftpd_mtftp.c +@@ -74,7 +74,7 @@ + + int line = 0; + struct stat file_stat; +- struct hostent host; ++ struct addrinfo hints, *addrinfo; + + /* open file */ + if ((fp = fopen(filename, "r")) == NULL) +@@ -208,13 +208,15 @@ + continue; + } + /* verify IP is valid */ +- if (Gethostbyname(thread->mcast_ip, &host) == OK) ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; ++ if (!getaddrinfo(thread->mcast_ip, thread->client_port, ++ &hints, &addrinfo) && ++ !sockaddr_set_addrinfo(&thread->sa_mcast, addrinfo)) + { +- thread->sa_mcast.sin_family = host.h_addrtype; +- memcpy(&thread->sa_mcast.sin_addr.s_addr, +- host.h_addr_list[0], host.h_length); +- thread->sa_mcast.sin_port = htons(thread->mcast_port); +- if (!IN_MULTICAST(ntohl(thread->sa_mcast.sin_addr.s_addr))) ++ thread->mcast_port = sockaddr_get_port(&thread->sa_mcast); ++ freeaddrinfo(addrinfo); ++ if (!sockaddr_is_multicast(&thread->sa_mcast)) + { + logger(LOG_WARNING, "mtftp: bad multicast address %s\n", + thread->mcast_ip); +@@ -345,11 +347,9 @@ + struct mtftp_thread *thread; + + int sockfd; +- struct sockaddr_in sa; ++ struct sockaddr_storage sa; + socklen_t len = sizeof(struct sockaddr); +-#ifdef HAVE_WRAP +- char client_addr[16]; +-#endif ++ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; + int retval; /* hold return value for testing */ + int data_size; /* returned size by recvfrom */ + char filename[MAXLEN]; +@@ -357,14 +357,13 @@ + + logger(LOG_NOTICE, "mtftp main server thread started"); + +- /* initialise sockaddr_in structure */ ++ /* initialise sockaddr_storage structure */ + memset(&sa, 0, sizeof(sa)); +- sa.sin_family = AF_INET; +- sa.sin_addr.s_addr = htonl(INADDR_ANY); +- sa.sin_port = htons(data->server_port); ++ sa.ss_family = AF_INET; /* FIXME */ ++ sockaddr_set_port(&sa, data->server_port); + + /* open the socket */ +- if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) ++ if ((sockfd = socket(sa.ss_family, SOCK_DGRAM, 0)) == 0) + { + logger(LOG_ERR, "mtftp: can't open socket"); + pthread_exit(NULL); +@@ -396,12 +395,11 @@ + #ifdef HAVE_WRAP + /* Verify the client has access. We don't look for the name but + rely only on the IP address for that. */ +- inet_ntop(AF_INET, &sa.sin_addr, +- client_addr, sizeof(client_addr)); +- if (hosts_ctl("in.tftpd", STRING_UNKNOWN, client_addr, ++ sockaddr_print_addr(&sa, addr_str, sizeof(addr_str)); ++ if (hosts_ctl("in.tftpd", STRING_UNKNOWN, addr_str, + STRING_UNKNOWN) == 0) + { +- logger(LOG_ERR, "mtftp: connection refused from %s", client_addr); ++ logger(LOG_ERR, "mtftp: connection refused from %s", addr_str); + continue; + } + #endif +@@ -415,7 +413,8 @@ + if (retval != GET_RRQ) + { + logger(LOG_WARNING, "unsupported request <%d> from %s", +- retval, inet_ntoa(sa.sin_addr)); ++ retval, ++ sockaddr_print_addr(&sa, addr_str, sizeof(addr_str))); + tftp_send_error(sockfd, &sa, EBADOP, data->data_buffer, data->data_buffer_size); + if (data->trace) + logger(LOG_DEBUG, "sent ERROR ", EBADOP, +@@ -425,7 +424,7 @@ + else + { + logger(LOG_NOTICE, "Serving %s to %s:%d", filename, +- inet_ntoa(sa.sin_addr), ntohs(sa.sin_port)); ++ sockaddr_print_addr(&sa, addr_str, sizeof(addr_str))); + if (data->trace) + logger(LOG_DEBUG, "received RRQ <%s>", string); + } +@@ -453,7 +452,7 @@ + continue; + } + /* copy client info for server */ +- memcpy(&thread->sa_in, &sa, sizeof(struct sockaddr_in)); ++ memcpy(&thread->sa_in, &sa, sizeof(struct sockaddr_storage)); + /* open a socket for client communication */ + if ((thread->sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) + { +@@ -462,7 +461,7 @@ + } + getsockname(sockfd, (struct sockaddr *)&(sa), &len); + //memset(&sa, 0, sizeof(sa)); +- sa.sin_port = 0; ++ sockaddr_set_port(&sa, 0); + /* bind the socket to the tftp port */ + if (bind(thread->sockfd, (struct sockaddr*)&sa, sizeof(sa)) < 0) + { +@@ -472,10 +471,13 @@ + getsockname(thread->sockfd, (struct sockaddr *)&(sa), &len); + + /* configure multicast socket */ +- thread->mcastaddr.imr_multiaddr.s_addr = thread->sa_mcast.sin_addr.s_addr; +- thread->mcastaddr.imr_interface.s_addr = htonl(INADDR_ANY); +- setsockopt(thread->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, +- &data->mcast_ttl, sizeof(data->mcast_ttl)); ++ sockaddr_get_mreq(&thread->sa_mcast, &thread->mcastaddr); ++ if (thread->sa_mcast.ss_family == AF_INET) ++ setsockopt(thread->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, ++ &data->mcast_ttl, sizeof(data->mcast_ttl)); ++ else ++ setsockopt(thread->sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, ++ &data->mcast_ttl, sizeof(data->mcast_ttl)); + + /* give server thread access to mtftp options */ + thread->mtftp_data = data; +@@ -511,8 +513,9 @@ + int data_size; + + struct mtftp_thread *data = (struct mtftp_thread *)arg; +- struct sockaddr_in *sa = &data->sa_in; +- struct sockaddr_in from; ++ struct sockaddr_storage *sa = &data->sa_in; ++ struct sockaddr_storage from; ++ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; + int sockfd = data->sockfd; + + struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; +@@ -591,7 +594,8 @@ + if (number_of_timeout > NB_OF_RETRY) + { + logger(LOG_INFO, "client (%s) not responding", +- inet_ntoa(data->sa_in.sin_addr)); ++ sockaddr_print_addr(&data->sa_in, addr_str, ++ sizeof(addr_str))); + state = S_END; + break; + } +@@ -599,14 +603,13 @@ + state = timeout_state; + break; + case GET_ACK: +- if (sa->sin_port != from.sin_port) ++ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) + { + logger(LOG_WARNING, "packet discarded"); + break; + } + /* handle case where packet come from un unexpected client */ +- if ((sa->sin_port == from.sin_port) && +- (sa->sin_addr.s_addr == from.sin_addr.s_addr)) ++ if (sockaddr_equal(sa, &from)) + { + /* The ACK is from the exected client */ + number_of_timeout = 0; +@@ -623,14 +626,13 @@ + } + break; + case GET_ERROR: +- if (sa->sin_port != from.sin_port) ++ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) + { + logger(LOG_WARNING, "packet discarded"); + break; + } + /* handle case where packet come from un unexpected client */ +- if ((sa->sin_port == from.sin_port) && +- (sa->sin_addr.s_addr == from.sin_addr.s_addr)) ++ if (sockaddr_equal(sa, &from)) + { + /* Got an ERROR from the current master client */ + Strncpy(string, tftphdr->th_msg, +--- atftp-0.7.dfsg.orig/tftpd_mtftp.h ++++ atftp-0.7.dfsg/tftpd_mtftp.h +@@ -57,13 +57,13 @@ + FILE *fp; + + int sockfd; +- struct sockaddr_in sa_in; +- struct sockaddr_in sa_client; ++ struct sockaddr_storage sa_in; ++ struct sockaddr_storage sa_client; + + int mcast_sockfd; + int mcast_port; +- struct sockaddr_in sa_mcast; +- struct ip_mreq mcastaddr; ++ struct sockaddr_storage sa_mcast; ++ union ip_mreq_storage mcastaddr; + + char *data_buffer; + int data_buffer_size; +--- atftp-0.7.dfsg.orig/config.h.in ++++ atftp-0.7.dfsg/config.h.in +@@ -138,6 +138,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +@@ -150,18 +153,43 @@ + /* Define to 1 if you can safely include both and . */ + #undef TIME_WITH_SYS_TIME + +-/* Version number of package */ +-#undef VERSION +- +-/* Define to 1 if on AIX 3. +- System headers sometimes define this. +- We just want to avoid a redefinition error message. */ ++/* Enable extensions on AIX 3, Interix. */ + #ifndef _ALL_SOURCE + # undef _ALL_SOURCE + #endif ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++/* Enable threading extensions on Solaris. */ ++#ifndef _POSIX_PTHREAD_SEMANTICS ++# undef _POSIX_PTHREAD_SEMANTICS ++#endif ++/* Enable extensions on HP NonStop. */ ++#ifndef _TANDEM_SOURCE ++# undef _TANDEM_SOURCE ++#endif ++/* Enable general extensions on Solaris. */ ++#ifndef __EXTENSIONS__ ++# undef __EXTENSIONS__ ++#endif ++ ++ ++/* Version number of package */ ++#undef VERSION ++ ++/* Define to 1 if on MINIX. */ ++#undef _MINIX ++ ++/* Define to 2 if the system does not provide POSIX.1 features except with ++ this defined. */ ++#undef _POSIX_1_SOURCE ++ ++/* Define to 1 if you need to in order for `stat' and other things to work. */ ++#undef _POSIX_SOURCE + + /* Define to empty if `const' does not conform to ANSI C. */ + #undef const + +-/* Define to `unsigned' if does not define. */ ++/* Define to `unsigned int' if does not define. */ + #undef size_t +--- atftp-0.7.dfsg.orig/tftp_io.c ++++ atftp-0.7.dfsg/tftp_io.c +@@ -42,7 +42,7 @@ + * < OptN | 0 | ValueN | 0 | + * >-------------------------------- + */ +-int tftp_send_request(int socket, struct sockaddr_in *sa, short type, ++int tftp_send_request(int socket, struct sockaddr_storage *sa, short type, + char *data_buffer, int data_buffer_size, + struct tftp_opt *tftp_options) + { +@@ -94,7 +94,7 @@ + *| Opcode | Block # | + * ------------------- + */ +-int tftp_send_ack(int socket, struct sockaddr_in *sa, short block_number) ++int tftp_send_ack(int socket, struct sockaddr_storage *sa, short block_number) + { + struct tftphdr tftphdr; + int result; +@@ -115,7 +115,7 @@ + *| Opcode | Opt1 | 0 | Value1 | 0 | OptN | 0 | ValueN | 0 | + * --------------------------------------------------------------------------- + */ +-int tftp_send_oack(int socket, struct sockaddr_in *sa, struct tftp_opt *tftp_options, ++int tftp_send_oack(int socket, struct sockaddr_storage *sa, struct tftp_opt *tftp_options, + char *buffer, int buffer_size) + { + +@@ -154,7 +154,7 @@ + *| Opcode | ErrorCode | ErrMsg | 0 | + * --------------------------------------- + */ +-int tftp_send_error(int socket, struct sockaddr_in *sa, short err_code, ++int tftp_send_error(int socket, struct sockaddr_storage *sa, short err_code, + char *buffer, int buffer_size) + { + int size; +@@ -182,7 +182,7 @@ + *| Opcode | Block # | Data | + * ---------------------------- + */ +-int tftp_send_data(int socket, struct sockaddr_in *sa, short block_number, ++int tftp_send_data(int socket, struct sockaddr_storage *sa, short block_number, + int size, char *data) + { + struct tftphdr *tftphdr = (struct tftphdr *)data; +@@ -202,19 +202,20 @@ + * Wait for a packet. This function can listen on 2 sockets. This is + * needed by the multicast tftp client. + */ +-int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_in *sa, +- struct sockaddr_in *sa_from, struct sockaddr_in *sa_to, ++int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_storage *sa, ++ struct sockaddr_storage *sa_from, struct sockaddr_storage *sa_to, + int timeout, int *size, char *data) + { + int result; + struct timeval tv; + fd_set rfds; +- struct sockaddr_in from; ++ struct sockaddr_storage from; + struct tftphdr *tftphdr = (struct tftphdr *)data; + + struct msghdr msg; /* used to get client's packet info */ + struct cmsghdr *cmsg; +- struct in_pktinfo *pktinfo; ++ struct in_pktinfo *pktinfo4; ++ struct in6_pktinfo *pktinfo6; + struct iovec iov; + char cbuf[1024]; + +@@ -284,12 +285,26 @@ + cmsg != NULL && cmsg->cmsg_len >= sizeof(*cmsg); + cmsg = CMSG_NXTHDR(&msg, cmsg)) + { ++#if defined(SOL_IP) && defined(IP_PKTINFO) + if (cmsg->cmsg_level == SOL_IP + && cmsg->cmsg_type == IP_PKTINFO) + { +- pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg); +- sa_to->sin_addr = pktinfo->ipi_addr; ++ pktinfo4 = (struct in_pktinfo *)CMSG_DATA(cmsg); ++ sa_to->ss_family = AF_INET; ++ ((struct sockaddr_in *)sa_to)->sin_addr = ++ pktinfo4->ipi_addr; + } ++#endif ++#if defined(SOL_IPV6) && defined(IPV6_PKTINFO) ++ if (cmsg->cmsg_level == SOL_IPV6 ++ && cmsg->cmsg_type == IPV6_PKTINFO) ++ { ++ pktinfo6 = (struct in6_pktinfo *)CMSG_DATA(cmsg); ++ sa_to->ss_family = AF_INET6; ++ ((struct sockaddr_in6 *)sa_to)->sin6_addr = ++ pktinfo6->ipi6_addr; ++ } ++#endif + break; + } + } +@@ -301,8 +316,8 @@ + if (sa_from != NULL) + memcpy(sa_from, &from, sizeof(from)); + +- /* if sa as never been initialised, sa->sin_port is still 0 */ +- if (sa->sin_port == htons(0)) ++ /* if sa as never been initialised, port is still 0 */ ++ if (sockaddr_get_port(&sa) == 0) + memcpy(sa, &from, sizeof(from)); + + +@@ -428,8 +443,10 @@ + if (!convert) + { + /* Simple case, just seek and write */ +- fseek(fp, (block_number - 1) * data_buffer_size, SEEK_SET); +- data_size = fwrite(data_buffer, 1, data_size, fp); ++ if (fseek(fp, (block_number - 1) * data_buffer_size, SEEK_SET) == 0) ++ data_size = fwrite(data_buffer, 1, data_size, fp); ++ else ++ data_size = 0; + return data_size; + } + else +--- atftp-0.7.dfsg.orig/tftp_io.h ++++ atftp-0.7.dfsg/tftp_io.h +@@ -39,18 +39,18 @@ + #define GET_DATA 7 + + /* functions prototype */ +-int tftp_send_request(int socket, struct sockaddr_in *s_inn, short type, ++int tftp_send_request(int socket, struct sockaddr_storage *s_inn, short type, + char *data_buffer, int data_buffer_size, + struct tftp_opt *tftp_options); +-int tftp_send_ack(int socket, struct sockaddr_in *s_inn, short block_number); +-int tftp_send_oack(int socket, struct sockaddr_in *s_inn, struct tftp_opt *tftp_options, ++int tftp_send_ack(int socket, struct sockaddr_storage *s_inn, short block_number); ++int tftp_send_oack(int socket, struct sockaddr_storage *s_inn, struct tftp_opt *tftp_options, + char *buffer, int buffer_size); +-int tftp_send_error(int socket, struct sockaddr_in *s_inn, short err_code, ++int tftp_send_error(int socket, struct sockaddr_storage *s_inn, short err_code, + char *buffer, int buffer_size); +-int tftp_send_data(int socket, struct sockaddr_in *s_inn, short block_number, ++int tftp_send_data(int socket, struct sockaddr_storage *s_inn, short block_number, + int size, char *data); +-int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_in *sa, +- struct sockaddr_in *from, struct sockaddr_in *to, ++int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_storage *sa, ++ struct sockaddr_storage *from, struct sockaddr_storage *to, + int timeout, int *size, char *data); + int tftp_file_read(FILE *fp, char *buffer, int buffer_size, int block_number, int convert, + int *prev_block_number, int *prev_file_pos, int *temp); +--- atftp-0.7.dfsg.orig/tftp_def.c ++++ atftp-0.7.dfsg/tftp_def.c +@@ -16,10 +16,12 @@ + + #include "config.h" + ++#include + #include + #include + #include + #include ++#include + #include "tftp_def.h" + #include "options.h" + #include "logger.h" +@@ -140,8 +142,10 @@ + */ + inline char *Strncpy(char *to, const char *from, size_t size) + { +- to[size-1] = '\000'; +- return strncpy(to, from, size - 1); ++ strncpy(to, from, size); ++ if (size>0) ++ to[size-1] = '\000'; ++ return to; + } + + +@@ -182,3 +186,135 @@ + + return OK; + } ++ ++char * ++sockaddr_print_addr(const struct sockaddr_storage *ss, char *buf, size_t len) ++{ ++ const void *addr; ++ if (ss->ss_family == AF_INET) ++ addr = &((const struct sockaddr_in *)ss)->sin_addr; ++ else if (ss->ss_family == AF_INET6) ++ addr = &((const struct sockaddr_in6 *)ss)->sin6_addr; ++ else ++ assert(!"sockaddr_print: unsupported address family"); ++ return (char *)inet_ntop(ss->ss_family, addr, buf, len); ++} ++ ++uint16_t sockaddr_get_port(const struct sockaddr_storage *ss) ++{ ++ if (ss->ss_family == AF_INET) ++ return ntohs(((const struct sockaddr_in *)ss)->sin_port); ++ if (ss->ss_family == AF_INET6) ++ return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port); ++ return 0; ++} ++ ++void sockaddr_set_port(struct sockaddr_storage *ss, uint16_t port) ++{ ++ if (ss->ss_family == AF_INET) ++ ((struct sockaddr_in *)ss)->sin_port = htons(port); ++ else if (ss->ss_family == AF_INET6) ++ ((struct sockaddr_in6 *)ss)->sin6_port = htons(port); ++ else ++ assert(!"sockaddr_set_port: unsupported address family"); ++} ++ ++int sockaddr_equal(const struct sockaddr_storage *left, ++ const struct sockaddr_storage *right) ++{ ++ if (left->ss_family != right->ss_family) ++ return 0; ++ if (left->ss_family == AF_INET) ++ { ++ const struct sockaddr_in ++ *sa_left = (const struct sockaddr_in *)left, ++ *sa_right = (const struct sockaddr_in *)right; ++ return (sa_left->sin_port == sa_right->sin_port && ++ sa_left->sin_addr.s_addr == sa_right->sin_addr.s_addr); ++ } ++ if (left->ss_family == AF_INET6) ++ { ++ const struct sockaddr_in6 ++ *sa_left = (const struct sockaddr_in6 *)left, ++ *sa_right = (const struct sockaddr_in6 *)right; ++ return (sa_left->sin6_port == sa_right->sin6_port && ++ memcmp(&sa_left->sin6_addr, &sa_right->sin6_addr, ++ sizeof(sa_left->sin6_addr)) == 0 && ++ sa_left->sin6_scope_id == sa_right->sin6_scope_id); ++ } ++ assert(!"sockaddr_equal: unsupported address family"); ++} ++ ++int sockaddr_equal_addr(const struct sockaddr_storage *left, ++ const struct sockaddr_storage *right) ++{ ++ if (left->ss_family != right->ss_family) ++ return 0; ++ if (left->ss_family == AF_INET) ++ { ++ const struct sockaddr_in ++ *sa_left = (const struct sockaddr_in *)left, ++ *sa_right = (const struct sockaddr_in *)right; ++ return sa_left->sin_addr.s_addr == sa_right->sin_addr.s_addr; ++ } ++ if (left->ss_family == AF_INET6) ++ { ++ const struct sockaddr_in6 ++ *sa_left = (const struct sockaddr_in6 *)left, ++ *sa_right = (const struct sockaddr_in6 *)right; ++ return (memcmp(&sa_left->sin6_addr, &sa_right->sin6_addr, ++ sizeof(sa_left->sin6_addr)) == 0 && ++ sa_left->sin6_scope_id == sa_right->sin6_scope_id); ++ } ++ assert(!"sockaddr_equal_addr: unsupported address family"); ++} ++ ++int sockaddr_is_multicast(const struct sockaddr_storage *ss) ++{ ++ if (ss->ss_family == AF_INET) ++ return IN_MULTICAST(ntohl(((const struct sockaddr_in *)ss) ++ ->sin_addr.s_addr)); ++ if (ss->ss_family == AF_INET6) ++ return IN6_IS_ADDR_MULTICAST(&((const struct sockaddr_in6 *)ss) ++ ->sin6_addr); ++ return 0; ++} ++ ++void sockaddr_get_mreq(const struct sockaddr_storage *ss, ++ union ip_mreq_storage *mreq) ++{ ++ if (ss->ss_family == AF_INET) ++ { ++ const struct sockaddr_in *sa = (const struct sockaddr_in *)ss; ++ mreq->v4.imr_multiaddr = sa->sin_addr; ++ mreq->v4.imr_interface.s_addr = htonl(INADDR_ANY); ++ } ++ else if (ss->ss_family == AF_INET6) ++ { ++ const struct sockaddr_in6 *sa = (const struct sockaddr_in6 *)ss; ++ mreq->v6.ipv6mr_multiaddr = sa->sin6_addr; ++ mreq->v6.ipv6mr_interface = 0; /* ??? */ ++ } ++ else ++ { ++ assert(!"sockaddr_get_mreq: unsupported address family"); ++ } ++} ++ ++int ++sockaddr_set_addrinfo(struct sockaddr_storage *ss, const struct addrinfo *ai) ++{ ++ while (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) ++ { ++ ai = ai->ai_next; ++ if (!ai) ++ { ++ errno = EAFNOSUPPORT; ++ return -1; ++ } ++ } ++ ++ assert(sizeof(*ss) >= ai->ai_addrlen); ++ memcpy(ss, ai->ai_addr, ai->ai_addrlen); ++ return 0; ++} +--- atftp-0.7.dfsg.orig/tftp_def.h ++++ atftp-0.7.dfsg/tftp_def.h +@@ -40,7 +40,7 @@ + #define OPT_TIMEOUT 3 + #define OPT_BLKSIZE 4 + #define OPT_MULTICAST 5 +-#define OPT_NUMBER 7 ++#define OPT_NUMBER 6 + + #define OPT_SIZE 12 + #define VAL_SIZE MAXLEN +@@ -52,4 +52,25 @@ + inline char *Strncpy(char *to, const char *from, size_t size); + int Gethostbyname(char *addr, struct hostent *host); + ++char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t); ++#define SOCKADDR_PRINT_ADDR_LEN INET6_ADDRSTRLEN ++uint16_t sockaddr_get_port(const struct sockaddr_storage *); ++void sockaddr_set_port(struct sockaddr_storage *, uint16_t); ++int sockaddr_equal(const struct sockaddr_storage *, ++ const struct sockaddr_storage *); ++int sockaddr_equal_addr(const struct sockaddr_storage *, ++ const struct sockaddr_storage *); ++int sockaddr_is_multicast(const struct sockaddr_storage *); ++ ++union ip_mreq_storage ++{ ++ struct ip_mreq v4; ++ struct ipv6_mreq v6; ++}; ++void ++sockaddr_get_mreq(const struct sockaddr_storage *, union ip_mreq_storage *); ++ ++int ++sockaddr_set_addrinfo(struct sockaddr_storage *ss, const struct addrinfo *ai); ++ + #endif +--- atftp-0.7.dfsg.orig/tftp.c ++++ atftp-0.7.dfsg/tftp.c +@@ -354,7 +354,7 @@ + void make_arg(char *string, int *argc, char ***argv) + { + static char *tmp = NULL; +- int argz_len; ++ size_t argz_len; + + /* split the string to an argz vector */ + if (argz_create_sep(string, ' ', &tmp, &argz_len) != 0) +@@ -408,8 +408,8 @@ + */ + int set_peer(int argc, char **argv) + { +- struct hostent *host; /* for host name lookup */ +- struct servent *sp; /* server entry for tftp service */ ++ struct addrinfo hints, *addrinfo; ++ int err; + + /* sanity check */ + if ((argc < 2) || (argc > 3)) +@@ -418,47 +418,40 @@ + return ERR; + } + +- /* get the server entry */ +- sp = getservbyname("tftp", "udp"); +- if (sp == 0) { +- fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); +- return ERR; +- } +- +- /* look up the host */ +- host = gethostbyname(argv[1]); ++ /* look up the service and host */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; ++ hints.ai_flags = AI_CANONNAME; ++ err = getaddrinfo(argv[1], argc == 3 ? argv[2] : "tftp", ++ &hints, &addrinfo); + /* if valid, update s_inn structure */ +- if (host) ++ if (err == 0) ++ err = sockaddr_set_addrinfo(&data.sa_peer, addrinfo); ++ if (err == 0) + { +- data.sa_peer.sin_family = host->h_addrtype; +- if (host->h_length > sizeof(data.sa_peer.sin_addr)) +- host->h_length = sizeof(data.sa_peer.sin_addr); +- memcpy(&data.sa_peer.sin_addr, host->h_addr, host->h_length); +- Strncpy(data.hostname, host->h_name, ++ Strncpy(data.hostname, addrinfo->ai_canonname, + sizeof(data.hostname)); + data.hostname[sizeof(data.hostname)-1] = 0; +- data.sa_peer.sin_port = sp->s_port; ++ freeaddrinfo(addrinfo); + } + else + { +- fprintf(stderr, "tftp: unknown host %s.\n", argv[1]); +- data.connected = 0; +- return ERR; +- } +- /* get the server port */ +- if (argc == 3) +- { +- sp->s_port = htons(atoi(argv[2])); +- if (sp->s_port < 0) ++ if (err == EAI_SERVICE) + { +- fprintf(stderr, "%s: bad port number.\n", argv[2]); +- data.connected = 0; +- return ERR; ++ if (argc == 3) ++ fprintf(stderr, "%s: bad port number.\n", argv[2]); ++ else ++ fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); ++ } ++ else ++ { ++ fprintf(stderr, "tftp: unknown host %s.\n", argv[1]); + } +- data.sa_peer.sin_port = sp->s_port; ++ data.connected = 0; ++ return ERR; + } + /* copy port number to data structure */ +- data.port = ntohs(sp->s_port); ++ data.port = sockaddr_get_port(&data.sa_peer); + + data.connected = 1; + return OK; +@@ -602,7 +595,7 @@ + } + + /* open a UDP socket */ +- data.sockfd = socket(AF_INET, SOCK_DGRAM, 0); ++ data.sockfd = socket(data.sa_peer.ss_family, SOCK_DGRAM, 0); + if (data.sockfd < 0) { + perror("tftp: "); + exit(ERR); +@@ -621,7 +614,7 @@ + fsync(data.sockfd); + close(data.sockfd); + +- return OK; ++ return tftp_result; + } + + /* +@@ -706,7 +699,7 @@ + } + + /* open a UDP socket */ +- data.sockfd = socket(AF_INET, SOCK_DGRAM, 0); ++ data.sockfd = socket(data.sa_peer.ss_family, SOCK_DGRAM, 0); + if (data.sockfd < 0) { + perror("tftp: "); + exit(ERR); +@@ -731,7 +724,7 @@ + fsync(data.sockfd); + close(data.sockfd); + +- return OK; ++ return tftp_result; + } + + #ifdef HAVE_MTFTP +--- atftp-0.7.dfsg.orig/tftp.h ++++ atftp-0.7.dfsg/tftp.h +@@ -39,8 +39,8 @@ + char hostname[MAXLEN]; /* peer's hostname */ + short port; /* tftp port for the server, 69 by default */ + +- struct sockaddr_in sa_peer; /* peer address and port */ +- struct sockaddr_in sa_local; /* local address and port */ ++ struct sockaddr_storage sa_peer; /* peer address and port */ ++ struct sockaddr_storage sa_local; /* local address and port */ + int sockfd; + + int connected; /* we are 'connected' */ +--- atftp-0.7.dfsg.orig/logger.c ++++ atftp-0.7.dfsg/logger.c +@@ -56,7 +56,15 @@ + log_ident = "unset"; + + if (filename) ++ { + log_filename = strdup(filename); ++ if (!strcmp(filename, "-")) ++ { ++ log_fd = STDOUT_FILENO; ++ log_fp = fdopen(log_fd, "a"); ++ return; ++ } ++ } + else + { + openlog(log_ident, LOG_PID, LOG_DAEMON); +--- atftp-0.7.dfsg.orig/tftp_file.c ++++ atftp-0.7.dfsg/tftp_file.c +@@ -59,7 +59,7 @@ + unsigned int next_word; + + /* initial stuff */ +- next_hole = prev_hole + 1; ++ next_hole = 0; /*prev_hole + 1;*/ + next_word_no = next_hole / 32; + next_bit_no = next_hole % 32; + next_word = bitmap[next_word_no]; +@@ -117,8 +117,9 @@ + int last_block_number = -1;/* block number of last block for multicast */ + int data_size; /* size of data received */ + int sockfd = data->sockfd; /* just to simplify calls */ +- struct sockaddr_in sa; /* a copy of data.sa_peer */ +- struct sockaddr_in from; ++ struct sockaddr_storage sa; /* a copy of data.sa_peer */ ++ struct sockaddr_storage from; ++ char from_str[SOCKADDR_PRINT_ADDR_LEN]; + int connected; /* 1 when sockfd is connected */ + struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; + FILE *fp = NULL; /* the local file pointer */ +@@ -129,11 +130,11 @@ + int multicast = 0; /* set to 1 if multicast */ + int mc_port; /* multicast port */ + char mc_addr[IPADDRLEN]; /* multicast address */ +- struct in_addr mcast_addr; + int mcast_sockfd = 0; +- struct sockaddr_in sa_mcast; +- struct ip_mreq mreq; +- struct hostent *host; ++ struct addrinfo hints, *addrinfo; ++ struct sockaddr_storage sa_mcast_group; ++ struct sockaddr_storage sa_mcast; ++ union ip_mreq_storage mreq; + int master_client = 0; + unsigned int file_bitmap[NB_BLOCK]; + int prev_bitmap_hole = -1; /* the previous hole found in the bitmap */ +@@ -141,16 +142,17 @@ + + int prev_block_number = 0; /* needed to support netascii convertion */ + int temp = 0; ++ int err; + + data->file_size = 0; + tftp_cancel = 0; +- from.sin_addr.s_addr = 0; + +- memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); ++ memset(&from, 0, sizeof(from)); ++ memset(&sa_mcast_group, 0, sizeof(sa_mcast_group)); + memset(&file_bitmap, 0, sizeof(file_bitmap)); + + /* make sure the socket is not connected */ +- sa.sin_family = AF_UNSPEC; ++ sa.ss_family = AF_UNSPEC; + connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); + connected = 0; + +@@ -190,7 +192,7 @@ + #endif + if (tftp_cancel) + { +- if (from.sin_addr.s_addr == 0) ++ if (from.ss_family == 0) + state = S_ABORT; + else + { +@@ -217,7 +219,7 @@ + string); + } + +- sa.sin_port = data->sa_peer.sin_port; ++ sockaddr_set_port(&sa, sockaddr_get_port(&data->sa_peer)); + /* send request packet */ + if (tftp_send_request(sockfd, &sa, RRQ, data->data_buffer, + data->data_buffer_size, +@@ -225,7 +227,7 @@ + state = S_ABORT; + else + state = S_WAIT_PACKET; +- sa.sin_port = 0; /* must be set to 0 before the fist call to ++ sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to + tftp_get_packet, but is was set before the + call to tftp_send_request */ + break; +@@ -256,8 +258,7 @@ + data->data_buffer); + /* RFC2090 state we should verify source address as well + as source port */ +- if ((sa.sin_addr.s_addr != from.sin_addr.s_addr) || +- (sa.sin_port != from.sin_port)) ++ if (!sockaddr_equal(&sa, &from)) + { + result = GET_DISCARD; + fprintf(stderr, "source address or port mismatch\n"); +@@ -269,7 +270,7 @@ + data->timeout, &data_size, + data->data_buffer); + /* Check that source port match */ +- if ((sa.sin_port != from.sin_port) && ++ if ((sockaddr_get_port(&sa) != sockaddr_get_port(&from)) && + ((result == GET_OACK) || (result == GET_ERROR) || + (result == GET_DATA))) + { +@@ -324,7 +325,8 @@ + lock up when doing multicast transfer and routing is broken */ + number_of_timeout++; + fprintf(stderr, "tftp: packet discard <%s:%d>.\n", +- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++ sockaddr_print_addr(&from, from_str, sizeof(from_str)), ++ sockaddr_get_port(&from)); + if (number_of_timeout > NB_OF_RETRY) + state = S_ABORT; + break; +@@ -457,19 +459,20 @@ + fprintf(stderr, "multicast: %s,%d,%d, ", mc_addr, + mc_port, master_client); + /* look up the host */ +- host = gethostbyname(mc_addr); + /* if valid, update s_inn structure */ +- if (host) ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; ++ if (!getaddrinfo(mc_addr, NULL, &hints, &addrinfo) && ++ !sockaddr_set_addrinfo(&sa_mcast_group, addrinfo)) + { +- memcpy(&mcast_addr, host->h_addr_list[0], +- host->h_length); +- if (!IN_MULTICAST(ntohl(mcast_addr.s_addr))) ++ if (!sockaddr_is_multicast(&sa_mcast_group)) + { + fprintf(stderr, + "atftp: bad multicast address %s\n", + mc_addr); + exit(1); + } ++ freeaddrinfo(addrinfo); + } + else + { +@@ -478,12 +481,13 @@ + exit(1); + } + /* we need to open a new socket for multicast */ +- if ((mcast_sockfd = socket(AF_INET, SOCK_DGRAM, 0))<0) ++ if ((mcast_sockfd = socket(sa_mcast_group.ss_family, ++ SOCK_DGRAM, 0))<0) + exit(1); + +- sa_mcast.sin_family = AF_INET; +- sa_mcast.sin_addr.s_addr = htonl(INADDR_ANY); +- sa_mcast.sin_port = htons(mc_port); ++ memset(&sa_mcast, 0, sizeof(sa_mcast)); ++ sa_mcast.ss_family = sa_mcast_group.ss_family; ++ sockaddr_set_port(&sa_mcast, mc_port); + + if (bind(mcast_sockfd, (struct sockaddr *)&sa_mcast, + sizeof(sa_mcast)) < 0) +@@ -492,12 +496,16 @@ + exit(1); + } + +- mreq.imr_multiaddr.s_addr = mcast_addr.s_addr; +- mreq.imr_interface.s_addr = htonl(INADDR_ANY); +- +- if (setsockopt(mcast_sockfd, IPPROTO_IP, +- IP_ADD_MEMBERSHIP, +- &mreq, sizeof(mreq)) < 0) ++ sockaddr_get_mreq(&sa_mcast_group, &mreq); ++ if (sa_mcast_group.ss_family == AF_INET) ++ err = setsockopt(mcast_sockfd, IPPROTO_IP, ++ IP_ADD_MEMBERSHIP, ++ &mreq.v4, sizeof(mreq.v4)); ++ else ++ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, ++ IPV6_ADD_MEMBERSHIP, ++ &mreq.v6, sizeof(mreq.v6)); ++ if (err < 0) + { + perror("setsockopt"); + exit(1); +@@ -532,7 +540,7 @@ + data->local_file); + tftp_send_error(sockfd, &sa, ENOSPACE, data->data_buffer, + data->data_buffer_size); +- state = S_END; ++ state = S_ABORT; + break; + } + data->file_size += data_size; +@@ -563,9 +571,15 @@ + /* drop multicast membership */ + if (multicast) + { +- if (setsockopt(mcast_sockfd, IPPROTO_IP, +- IP_DROP_MEMBERSHIP, +- &mreq, sizeof(mreq)) < 0) ++ if (sa_mcast_group.ss_family == AF_INET) ++ err = setsockopt(mcast_sockfd, IPPROTO_IP, ++ IP_DROP_MEMBERSHIP, ++ &mreq.v4, sizeof(mreq.v4)); ++ else ++ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, ++ IPV6_DROP_MEMBERSHIP, ++ &mreq.v6, sizeof(mreq.v6)); ++ if (err < 0) + { + perror("setsockopt"); + exit(1); +@@ -608,8 +622,9 @@ + int last_block = -1; + int data_size; /* size of data received */ + int sockfd = data->sockfd; /* just to simplify calls */ +- struct sockaddr_in sa; /* a copy of data.sa_peer */ +- struct sockaddr_in from; ++ struct sockaddr_storage sa; /* a copy of data.sa_peer */ ++ struct sockaddr_storage from; ++ char from_str[SOCKADDR_PRINT_ADDR_LEN]; + int connected; /* 1 when sockfd is connected */ + struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; + FILE *fp; /* the local file pointer */ +@@ -624,10 +639,10 @@ + + data->file_size = 0; + tftp_cancel = 0; +- from.sin_addr.s_addr = 0; ++ memset(&from, 0, sizeof(from)); + + /* make sure the socket is not connected */ +- sa.sin_family = AF_UNSPEC; ++ sa.ss_family = AF_UNSPEC; + connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); + connected = 0; + +@@ -674,7 +689,7 @@ + if (tftp_cancel) + { + /* Make sure we know the peer's address */ +- if (from.sin_addr.s_addr == 0) ++ if (from.ss_family == 0) + state = S_ABORT; + else + { +@@ -701,7 +716,7 @@ + string); + } + +- sa.sin_port = data->sa_peer.sin_port; ++ sockaddr_set_port(&sa, sockaddr_get_port(&data->sa_peer)); + /* send request packet */ + if (tftp_send_request(sockfd, &sa, WRQ, data->data_buffer, + data->data_buffer_size, +@@ -709,7 +724,7 @@ + state = S_ABORT; + else + state = S_WAIT_PACKET; +- sa.sin_port = 0; /* must be set to 0 before the fist call to ++ sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to + tftp_get_packet, but is was set before the + call to tftp_send_request */ + break; +@@ -736,7 +751,7 @@ + data->timeout, &data_size, + data->data_buffer); + /* check that source port match */ +- if (sa.sin_port != from.sin_port) ++ if (sockaddr_get_port(&sa) != sockaddr_get_port(&from)) + { + if ((data->checkport) && + ((result == GET_ACK) || (result == GET_OACK) || +@@ -796,7 +811,8 @@ + if routing is broken */ + number_of_timeout++; + fprintf(stderr, "tftp: packet discard <%s:%d>.\n", +- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++ sockaddr_print_addr(&from, from_str, sizeof(from_str)), ++ sockaddr_get_port(&from)); + if (number_of_timeout > NB_OF_RETRY) + state = S_ABORT; + break; +--- atftp-0.7.dfsg.orig/atftpd.8 ++++ atftp-0.7.dfsg/atftpd.8 +@@ -84,8 +84,9 @@ + used to run the server) must have permissions on the given + file. Assuming the file is /var/log/atftpd.log, simply run: "touch + /var/log/atftpd.log" and then "chown nobody.nogroup +-/var/log/atftpd.log". When the server is ran in daemon mode, +-/dev/stdout or /dev/stderr can be used. ++/var/log/atftpd.log". When the server is run in daemon mode, ++/dev/stdout or /dev/stderr can be used. Specifying a single dash as ++the filename will send logs to stdout (file descriptor 1). + + .TP + .B \-\-pidfile +--- atftp-0.7.dfsg.orig/test/Makefile.in ++++ atftp-0.7.dfsg/test/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.8.2 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -227,20 +227,20 @@ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix new file mode 100644 index 00000000000..db62c668238 --- /dev/null +++ b/pkgs/tools/networking/atftp/default.nix @@ -0,0 +1,50 @@ +x@{builderDefsPackage + , readline, tcp_wrappers, pcre + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="atftp"; + version="0.7"; + name="${baseName}-${version}"; + url="mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; + hash="0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + + patches = [./debian.patch]; + + meta = { + description = "Advanced tftp tools"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.gpl2Plus; + }; + passthru = { + updateInfo = { + downloadPage = "http://packages.debian.org/source/sid/atftp"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79951a80480..9b752308bd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -387,6 +387,8 @@ let at = callPackage ../tools/system/at { }; + atftp = callPackage ../tools/networking/atftp {}; + autogen = callPackage ../development/tools/misc/autogen { guile = guile_1_8; }; @@ -4436,6 +4438,8 @@ let ## inherit stdenv fetchurl cmake qt4 telepathy_qt; ## }; + tcp_wrappers = callPackage ../development/libraries/tcp-wrappers {}; + tdb = callPackage ../development/libraries/tdb { }; tecla = callPackage ../development/libraries/tecla { }; From 6759fab01bb2137bf440308cdd587b0ce95543d4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Aug 2011 13:17:44 +0000 Subject: [PATCH 060/504] Moving debian patch to fetchurl svn path=/nixpkgs/trunk/; revision=28875 --- pkgs/tools/networking/atftp/debian.patch | 14965 --------------------- pkgs/tools/networking/atftp/default.nix | 7 +- 2 files changed, 6 insertions(+), 14966 deletions(-) delete mode 100644 pkgs/tools/networking/atftp/debian.patch diff --git a/pkgs/tools/networking/atftp/debian.patch b/pkgs/tools/networking/atftp/debian.patch deleted file mode 100644 index 759675973b6..00000000000 --- a/pkgs/tools/networking/atftp/debian.patch +++ /dev/null @@ -1,14965 +0,0 @@ ---- atftp-0.7.dfsg.orig/tftpd_file.c -+++ atftp-0.7.dfsg/tftpd_file.c -@@ -110,8 +110,9 @@ - int block_number = 0; - int data_size; - int sockfd = data->sockfd; -- struct sockaddr_in *sa = &data->client_info->client; -- struct sockaddr_in from; -+ struct sockaddr_storage *sa = &data->client_info->client; -+ struct sockaddr_storage from; -+ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp; - char filename[MAXLEN]; -@@ -269,7 +270,8 @@ - if (number_of_timeout > NB_OF_RETRY) - { - logger(LOG_INFO, "client (%s) not responding", -- inet_ntoa(data->client_info->client.sin_addr)); -+ sockaddr_print_addr(&data->client_info->client, -+ addr_str, sizeof(addr_str))); - state = S_END; - } - else -@@ -290,12 +292,13 @@ - * **** test since the port number is the TID. Use this - * **** only if you know what you're doing. - */ -- if (sa->sin_port != from.sin_port) -+ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) - { - if (data->checkport) - { - logger(LOG_WARNING, "packet discarded <%s>", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, addr_str, -+ sizeof(addr_str))); - break; - } - else -@@ -311,12 +314,13 @@ - break; - case GET_DATA: - /* Check that source port match */ -- if (sa->sin_port != from.sin_port) -+ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) - { - if (data->checkport) - { - logger(LOG_WARNING, "packet discarded <%s>", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, addr_str, -+ sizeof(addr_str))); - break; - } - else -@@ -328,7 +332,8 @@ - case GET_DISCARD: - /* FIXME: should we increment number_of_timeout */ - logger(LOG_WARNING, "packet discarded <%s>", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, addr_str, -+ sizeof(addr_str))); - break; - case ERR: - logger(LOG_ERR, "%s: %d: recvfrom: %s", -@@ -405,8 +410,9 @@ - int block_number = 0; - int last_block = -1; - int data_size; -- struct sockaddr_in *sa = &data->client_info->client; -- struct sockaddr_in from; -+ struct sockaddr_storage *sa = &data->client_info->client; -+ struct sockaddr_storage from; -+ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; - int sockfd = data->sockfd; - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp; -@@ -618,6 +624,8 @@ - } - else - { -+ struct addrinfo hints, *result; -+ - /* configure socket, get an IP address */ - if (tftpd_mcast_get_tid(&data->mc_addr, &data->mc_port) != OK) - { -@@ -629,29 +637,37 @@ - data->mc_addr, data->mc_port); - - /* convert address */ -- if (inet_aton(data->mc_addr, &data->sa_mcast.sin_addr) == 0) -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; -+ hints.ai_flags = AI_NUMERICHOST; -+ if (getaddrinfo(data->mc_addr, NULL, &hints, &result) || -+ sockaddr_set_addrinfo(&data->sa_mcast, result)) - { - logger(LOG_ERR, "bad address %s\n",data->mc_addr); - fclose(fp); - return ERR; - } -- data->sa_mcast.sin_family = AF_INET; /* FIXME: IPv6 */ -- data->sa_mcast.sin_port = htons(data->mc_port); -+ freeaddrinfo(result); -+ sockaddr_set_port(&data->sa_mcast, data->mc_port); -+ - /* verify address is multicast */ -- if (!IN_MULTICAST(ntohl(data->sa_mcast.sin_addr.s_addr))) -+ if (!sockaddr_is_multicast(&data->sa_mcast)) - { - logger(LOG_ERR, "bad multicast address %s\n", -- inet_ntoa(data->sa_mcast.sin_addr)); -+ sockaddr_print_addr(&data->sa_mcast, -+ addr_str, sizeof(addr_str))); - fclose(fp); - return ERR; - } - - /* initialise multicast address structure */ -- data->mcastaddr.imr_multiaddr.s_addr = -- data->sa_mcast.sin_addr.s_addr; -- data->mcastaddr.imr_interface.s_addr = htonl(INADDR_ANY); -- setsockopt(data->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, -- &data->mcast_ttl, sizeof(data->mcast_ttl)); -+ sockaddr_get_mreq(&data->sa_mcast, &data->mcastaddr); -+ if (data->sa_mcast.ss_family == AF_INET) -+ setsockopt(data->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, -+ &data->mcast_ttl, sizeof(data->mcast_ttl)); -+ else -+ setsockopt(data->sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, -+ &data->mcast_ttl, sizeof(data->mcast_ttl)); - - /* set options data for OACK */ - opt_set_multicast(data->tftp_options, data->mc_addr, -@@ -660,8 +676,8 @@ - data->mc_port, 1); - - /* the socket must be unconnected for multicast */ -- sa->sin_family = AF_UNSPEC; -- connect(sockfd, (struct sockaddr *)sa, sizeof(sa)); -+ sa->ss_family = AF_UNSPEC; -+ connect(sockfd, (struct sockaddr *)sa, sizeof(*sa)); - - /* set multicast flag */ - multicast = 1; -@@ -689,7 +705,9 @@ - if (data->trace) - { - logger(LOG_DEBUG, "sent ERROR to %s", EUNDEF, -- tftp_errmsg[EUNDEF], inet_ntoa(client_info->client.sin_addr)); -+ tftp_errmsg[EUNDEF], -+ sockaddr_print_addr(&client_info->client, -+ addr_str, sizeof(addr_str))); - } - } while (tftpd_clientlist_next(data, &client_info) == 1); - state = S_ABORT; -@@ -751,7 +769,8 @@ - if (number_of_timeout > NB_OF_RETRY) - { - logger(LOG_INFO, "client (%s) not responding", -- inet_ntoa(client_info->client.sin_addr)); -+ sockaddr_print_addr(&client_info->client, -+ addr_str, sizeof(addr_str))); - state = S_END; - } - else -@@ -780,8 +799,11 @@ - going to OACK state */ - logger(LOG_INFO, - "Serving next client: %s:%d", -- inet_ntoa(client_info->client.sin_addr), -- ntohs(client_info->client.sin_port)); -+ sockaddr_print_addr( -+ &client_info->client, -+ addr_str, sizeof(addr_str)), -+ sockaddr_get_port( -+ &client_info->client)); - sa = &client_info->client; - state = S_SEND_OACK; - break; -@@ -804,8 +826,7 @@ - /* handle case where packet come from un unexpected client */ - if (multicast) - { -- if ((sa->sin_port != from.sin_port) || -- (sa->sin_addr.s_addr != from.sin_addr.s_addr)) -+ if (!sockaddr_equal(sa, &from)) - { - /* We got an ACK from a client that is not the master client. - * If this is an ACK for the last block, mark this client as -@@ -815,10 +836,15 @@ - { - if (tftpd_clientlist_done(data, NULL, &from) == 1) - logger(LOG_DEBUG, "client done <%s>", -- inet_ntoa(client_info->client.sin_addr)); -+ sockaddr_print_addr( -+ &from, addr_str, -+ sizeof(addr_str))); - else - logger(LOG_WARNING, "packet discarded <%s:%d>", -- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); -+ sockaddr_print_addr( -+ &from, addr_str, -+ sizeof(addr_str)), -+ sockaddr_get_port(&from)); - } - else - /* If not, send and OACK with mc=0 to shut it up. */ -@@ -837,12 +863,14 @@ - else - { - /* check that the packet is from the current client */ -- if (sa->sin_port != from.sin_port) -+ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) - { - if (data->checkport) - { - logger(LOG_WARNING, "packet discarded <%s:%d>", -- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); -+ sockaddr_print_addr(&from, addr_str, -+ sizeof(addr_str)), -+ sockaddr_get_port(&from)); - break; - } - else -@@ -868,19 +896,21 @@ - if (multicast) - { - /* if packet is not from the current master client */ -- if ((sa->sin_port != from.sin_port) || -- (sa->sin_addr.s_addr != from.sin_addr.s_addr)) -+ if (!sockaddr_equal(sa, &from)) - { - /* mark this client done */ - if (tftpd_clientlist_done(data, NULL, &from) == 1) - { - if (data->trace) - logger(LOG_DEBUG, "client sent ERROR, mark as done <%s>", -- inet_ntoa(client_info->client.sin_addr)); -+ sockaddr_print_addr( -+ &from, addr_str, -+ sizeof(addr_str))); - } - else - logger(LOG_WARNING, "packet discarded <%s>", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, addr_str, -+ sizeof(addr_str))); - /* current state is unchanged */ - break; - } -@@ -888,12 +918,13 @@ - else - { - /* check that the packet is from the current client */ -- if (sa->sin_port != from.sin_port) -+ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) - { - if (data->checkport) - { - logger(LOG_WARNING, "packet discarded <%s>", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, addr_str, -+ sizeof(addr_str))); - break; - } - else -@@ -919,7 +950,8 @@ - case GET_DISCARD: - /* FIXME: should we increment number_of_timeout */ - logger(LOG_WARNING, "packet discarded <%s>", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, addr_str, -+ sizeof(addr_str))); - break; - case ERR: - logger(LOG_ERR, "%s: %d: recvfrom: %s", -@@ -944,8 +976,9 @@ - { - logger(LOG_INFO, - "Serving next client: %s:%d", -- inet_ntoa(client_info->client.sin_addr), -- ntohs(client_info->client.sin_port)); -+ sockaddr_print_addr(&client_info->client, -+ addr_str, sizeof(addr_str)), -+ sockaddr_get_port(&client_info->client)); - /* client is a new client structure */ - sa = &client_info->client; - /* nedd to send an oack to that client */ ---- atftp-0.7.dfsg.orig/tftpd_list.c -+++ atftp-0.7.dfsg/tftpd_list.c -@@ -173,8 +173,7 @@ - - while (1) - { -- if ((tmp->client.sin_port == client->client.sin_port) && -- (tmp->client.sin_addr.s_addr == client->client.sin_addr.s_addr) && -+ if (sockaddr_equal(&tmp->client, &client->client) && - (tmp->done == 0)) - { - /* unlock mutex and exit */ -@@ -249,7 +248,7 @@ - */ - int tftpd_clientlist_done(struct thread_data *thread, - struct client_info *client, -- struct sockaddr_in *sock) -+ struct sockaddr_storage *sock) - { - struct client_info *head = thread->client_info; - -@@ -266,7 +265,7 @@ - /* walk the list to find this client */ - while (head) - { -- if (memcmp(sock, &head->client, sizeof(struct sockaddr_in)) == 0) -+ if (sockaddr_equal(sock, &head->client)) - { - head->done = 1; - pthread_mutex_unlock(&thread->client_mutex); ---- atftp-0.7.dfsg.orig/tftpd_pcre.c -+++ atftp-0.7.dfsg/tftpd_pcre.c -@@ -211,9 +211,9 @@ - chp++; /* point to value indicating substring */ - rc = pcre_get_substring(str, ovector, matches, *chp - 0x30, &tmpstr); - /* found string */ -- if (rc > 0) -+ if (rc > 0 && outchp - outstr + rc+1 < outsize) - { -- Strncpy(outchp, tmpstr, rc); -+ Strncpy(outchp, tmpstr, rc+1); - outchp += rc; - pcre_free_substring(tmpstr); - continue; ---- atftp-0.7.dfsg.orig/tftp_mtftp.c -+++ atftp-0.7.dfsg/tftp_mtftp.c -@@ -112,18 +112,20 @@ - int data_size; /* size of data received */ - int sockfd = data->sockfd; /* just to simplify calls */ - int sock; -- struct sockaddr_in sa; /* a copy of data.sa_peer */ -- struct sockaddr_in from; -+ struct sockaddr_storage sa; /* a copy of data.sa_peer */ -+ struct sockaddr_storage from; -+ char from_str[SOCKADDR_PRINT_ADDR_LEN]; - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp = NULL; /* the local file pointer */ - int number_of_timeout = 0; - int timeout = 0; - -- struct in_addr mcast_addr; -+ struct sockaddr_storage sa_mcast_group; - int mcast_sockfd = 0; -- struct sockaddr_in sa_mcast; -- struct ip_mreq mreq; -- struct hostent *host; -+ struct sockaddr_storage sa_mcast; -+ union ip_mreq_storage mreq; -+ struct addrinfo hints, *addrinfo; -+ int err; - - int mode = LISTEN; - unsigned int file_bitmap[NB_BLOCK]; -@@ -132,13 +134,13 @@ - - data->file_size = 0; - tftp_cancel = 0; -- from.sin_addr.s_addr = 0; -+ memset(&from, 0, sizeof(from)); - -- memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); -+ memset(&sa_mcast, 0, sizeof(struct sockaddr_storage)); - memset(&file_bitmap, 0, sizeof(file_bitmap)); - - /* make sure the socket is not connected */ -- sa.sin_family = AF_UNSPEC; -+ sa.ss_family = AF_UNSPEC; - connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - - /* copy sa_peer structure */ -@@ -170,13 +172,14 @@ - } - - /* Configure multicast stuff, look up the host */ -- host = gethostbyname(data->mtftp_mcast_ip); - /* if valid, update s_inn structure */ -- if (host) -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; -+ if (!getaddrinfo(data->mtftp_mcast_ip, NULL, &hints, &addrinfo) && -+ !sockaddr_set_addrinfo(&sa_mcast_group, addrinfo)) - { -- memcpy(&mcast_addr, host->h_addr_list[0], -- host->h_length); -- if (!IN_MULTICAST(ntohl(mcast_addr.s_addr))) -+ freeaddrinfo(addrinfo); -+ if (!sockaddr_is_multicast(&sa_mcast_group)) - { - fprintf(stderr, - "mtftp: bad multicast address %s\n", -@@ -196,9 +199,9 @@ - perror("atftp: socket"); - exit(1); - } -- sa_mcast.sin_family = AF_INET; -- sa_mcast.sin_addr.s_addr = htonl(INADDR_ANY); -- sa_mcast.sin_port = htons(data->mtftp_client_port); -+ memset(&sa_mcast, 0, sizeof(sa_mcast)); -+ sa_mcast.ss_family = sa_mcast_group.ss_family; -+ sockaddr_set_port(&sa, data->mtftp_client_port); - - if (bind(mcast_sockfd, (struct sockaddr *)&sa_mcast, - sizeof(sa_mcast)) < 0) -@@ -206,13 +209,15 @@ - perror("atftp: bind"); - exit(1); - } -- -- mreq.imr_multiaddr.s_addr = mcast_addr.s_addr; -- mreq.imr_interface.s_addr = htonl(INADDR_ANY); -- -- if (setsockopt(mcast_sockfd, IPPROTO_IP, -- IP_ADD_MEMBERSHIP, -- &mreq, sizeof(mreq)) < 0) -+ -+ sockaddr_get_mreq(&sa_mcast_group, &mreq); -+ if (sa_mcast_group.ss_family == AF_INET) -+ err = setsockopt(mcast_sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, -+ &mreq.v4, sizeof(mreq.v4)); -+ else -+ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, -+ &mreq.v6, sizeof(mreq.v6)); -+ if (err < 0) - { - perror("atftp: setsockopt"); - exit(1); -@@ -228,7 +233,7 @@ - #endif - if (tftp_cancel) - { -- if (from.sin_addr.s_addr == 0) -+ if (from.ss_family == 0) - state = S_ABORT; - else - { -@@ -298,7 +303,7 @@ - else - state = S_WAIT_PACKET; - -- sa.sin_port = 0; /* must be set to 0 before the fist call to -+ sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to - tftp_get_packet, but it was set before the - call to tftp_send_request with the server port */ - break; -@@ -351,10 +356,10 @@ - break; - } - /* Can only receive this error from unicast */ -- if (sa.sin_addr.s_addr != from.sin_addr.s_addr) -+ if (!sockaddr_equal_addr(&sa, &from)) - { - fprintf(stderr, "mtftp: error packet discarded from <%s>.\n", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, from_str, sizeof(from_str))); - break; - } - /* packet is for us */ -@@ -367,7 +372,7 @@ - /* Specification state that server source IP must matches, but - port is not a requierement (anyway we may not know the source - port yet) */ -- if (sa.sin_addr.s_addr == from.sin_addr.s_addr) -+ if (sockaddr_equal_addr(&sa, &from)) - { - if (mode != LISTEN) - { -@@ -380,7 +385,7 @@ - fprintf(stderr, - "mtftp: unexpected unicast packet from <%s>," - " continuing\n", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, from_str, sizeof(from_str))); - else - mode = RECEIVE; - } -@@ -404,7 +409,7 @@ - { - fprintf(stderr, - "mtftp: unexpected unicast packet from <%s>.\n", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, from_str, sizeof(from_str))); - break; - } - } -@@ -412,7 +417,7 @@ - else - { - fprintf(stderr, "mtftp: unexpected packet from <%s>\n", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, from_str, sizeof(from_str))); - break; - } - number_of_timeout = 0; -@@ -424,7 +429,7 @@ - mcast IP or port */ - number_of_timeout++; - fprintf(stderr, "mtftp: packet discard <%s>.\n", -- inet_ntoa(from.sin_addr)); -+ sockaddr_print_addr(&from, from_str, sizeof(from_str))); - if (number_of_timeout > NB_OF_RETRY) - state = S_ABORT; - break; -@@ -495,9 +500,15 @@ - if (fp) - fclose(fp); - /* drop multicast membership */ -- if (setsockopt(mcast_sockfd, IPPROTO_IP, -- IP_DROP_MEMBERSHIP, -- &mreq, sizeof(mreq)) < 0) -+ if (sa_mcast_group.ss_family == AF_INET) -+ err = setsockopt(mcast_sockfd, IPPROTO_IP, -+ IP_DROP_MEMBERSHIP, -+ &mreq.v4, sizeof(mreq.v4)); -+ else -+ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, -+ IPV6_DROP_MEMBERSHIP, -+ &mreq.v6, sizeof(mreq.v6)); -+ if (err < 0) - { - perror("setsockopt"); - exit(1); ---- atftp-0.7.dfsg.orig/configure -+++ atftp-0.7.dfsg/configure -@@ -1,81 +1,415 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.67. -+# -+# -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -+# Foundation, Inc. -+# - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ # We cannot yet assume a decent shell, so we have to provide a -+ # neutralization value for shells without unset; and this also -+ # works around shells that cannot unset nonexistent variables. -+ BASH_ENV=/dev/null -+ ENV=/dev/null -+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -- --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +417,107 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +526,25 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,51 +552,164 @@ - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - ac_unique_file="tftp.c" - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PLATFORM CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBPTHREAD LIBTERMCAP LIBREADLINE LIBWRAP LIBPCRE LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+LIBPCRE -+LIBWRAP -+LIBREADLINE -+LIBTERMCAP -+LIBPTHREAD -+EGREP -+GREP -+CPP -+am__fastdepCC_FALSE -+am__fastdepCC_TRUE -+CCDEPMODE -+AMDEPBACKSLASH -+AMDEP_FALSE -+AMDEP_TRUE -+am__quote -+am__include -+DEPDIR -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+PLATFORM -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+ISODATE -+am__leading_dot -+SET_MAKE -+AWK -+mkdir_p -+INSTALL_STRIP_PROGRAM -+STRIP -+install_sh -+AMTAR -+MAKEINFO -+AUTOHEADER -+AUTOMAKE -+AUTOCONF -+ACLOCAL -+VERSION -+PACKAGE -+CYGPATH_W -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+enable_libreadline -+enable_libwrap -+enable_libpcre -+enable_mtftp -+enable_debug -+enable_dependency_tracking -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -337,34 +732,49 @@ - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -386,33 +796,59 @@ - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -439,6 +875,12 @@ - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -463,13 +905,16 @@ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -534,6 +979,16 @@ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -584,26 +1039,36 @@ - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -623,26 +1088,25 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -651,31 +1115,36 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; - esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -689,8 +1158,8 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 -+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. -+ If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -702,74 +1171,72 @@ - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi --fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -792,20 +1259,17 @@ - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -815,18 +1279,25 @@ - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -847,6 +1318,7 @@ - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-libreadline enable readline support in client -@@ -862,162 +1334,540 @@ - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CPP C preprocessor - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd "$ac_popdir" -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.67 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. - --It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -- -- $ $0 $@ -- --_ACEOF -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () - { --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ as_fn_set_status $ac_retval - --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+} # ac_fn_c_try_compile - --_ASUNAME -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ as_fn_set_status $ac_retval - --} >&5 -+} # ac_fn_c_try_cpp - --cat >&5 <<_ACEOF -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval "test \"\${$3+set}\"" = set; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_link -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_type -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval "test \"\${$3+set}\"" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case declares $2. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_func -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by $as_me, which was -+generated by GNU Autoconf 2.67. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF - - - ## ----------- ## -@@ -1035,7 +1885,6 @@ - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1046,13 +1895,13 @@ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1068,104 +1917,115 @@ - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1173,112 +2033,137 @@ - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi --fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site -+fi -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5 ; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1287,48 +2172,35 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - am__api_version="1.8" - ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } --fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or -@@ -1343,22 +2215,23 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if test "${ac_cv_path_install+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in #(( -+ ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -1366,7 +2239,7 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -1376,30 +2249,43 @@ - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi - fi - fi - done - done - ;; - esac --done - -+ done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -1409,8 +2295,8 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -+$as_echo_n "checking whether build environment is sane... " >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -1433,11 +2319,8 @@ - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". -- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken --alias in your environment" >&5 --echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken --alias in your environment" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -+alias in your environment" "$LINENO" 5 - fi - - test "$2" = conftest.file -@@ -1446,26 +2329,20 @@ - # Ok. - : - else -- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! --Check your system clock" >&5 --echo "$as_me: error: newly created file is older than distributed files! --Check your system clock" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "newly created file is older than distributed files! -+Check your system clock" "$LINENO" 5 - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - test "$program_prefix" != NONE && -- program_transform_name="s,^,$program_prefix,;$program_transform_name" -+ program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && -- program_transform_name="s,\$,$program_suffix,;$program_transform_name" --# Double any \ or $. echo might interpret backslashes. -+ program_transform_name="s&\$&$program_suffix&;$program_transform_name" -+# Double any \ or $. - # By default was `s,x,x', remove it if useless. --cat <<\_ACEOF >conftest.sed --s/[\\$]/&&/g;s/;s,x,x,$// --_ACEOF --program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm conftest.sed -+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -1476,8 +2353,8 @@ - am_missing_run="$MISSING --run " - else - am_missing_run= -- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 --echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - - if mkdir -p -- . 2>/dev/null; then -@@ -1509,10 +2386,10 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_AWK+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_AWK+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -1522,55 +2399,59 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -+$as_echo "$AWK" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$AWK" && break - done - --echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -+set x ${MAKE-make} -+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes --else -- eval ac_cv_prog_make_${ac_make}_set=no --fi -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - SET_MAKE= - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -1586,9 +2467,7 @@ - # test to see if srcdir already configured - if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then -- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 --echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi - - # test whether we have cygpath -@@ -1644,10 +2523,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -1657,35 +2536,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -+$as_echo "$STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -1695,28 +2576,38 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -+$as_echo "$ac_ct_STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- STRIP=$ac_ct_STRIP -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi - else - STRIP="$ac_cv_prog_STRIP" - fi -@@ -1730,123 +2621,140 @@ - - - -- ac_config_headers="$ac_config_headers config.h" -+ac_config_headers="$ac_config_headers config.h" - - - ISODATE=`date +%Y-%m-%d` - - - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } -- --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if test "${ac_cv_build+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -- -- --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if test "${ac_cv_host+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - PLATFORM="${host_vendor}-${host_cpu}-${host_os}" - - --# Check whether --enable-libreadline or --disable-libreadline was given. --if test "${enable_libreadline+set}" = set; then -- enableval="$enable_libreadline" -- case "${enableval}" in -+# Check whether --enable-libreadline was given. -+if test "${enable_libreadline+set}" = set; then : -+ enableval=$enable_libreadline; case "${enableval}" in - yes) libreadline=true ;; - no) libreadline=false ;; - esac - else - libreadline=true --fi; -+fi - --# Check whether --enable-libwrap or --disable-libwrap was given. --if test "${enable_libwrap+set}" = set; then -- enableval="$enable_libwrap" -- case "${enableval}" in -+ -+# Check whether --enable-libwrap was given. -+if test "${enable_libwrap+set}" = set; then : -+ enableval=$enable_libwrap; case "${enableval}" in - yes) libwrap=true ;; - no) libwrap=flase ;; - esac - else - libwrap=true --fi; -+fi - --# Check whether --enable-libpcre or --disable-libpcre was given. --if test "${enable_libpcre+set}" = set; then -- enableval="$enable_libpcre" -- case "${enableval}" in -+ -+# Check whether --enable-libpcre was given. -+if test "${enable_libpcre+set}" = set; then : -+ enableval=$enable_libpcre; case "${enableval}" in - yes) libpcre=true ;; - no) libpcre=flase ;; - esac - else - libpcre=true --fi; -+fi - --# Check whether --enable-mtftp or --disable-mtftp was given. --if test "${enable_mtftp+set}" = set; then -- enableval="$enable_mtftp" -- case "${enableval}" in -+ -+# Check whether --enable-mtftp was given. -+if test "${enable_mtftp+set}" = set; then : -+ enableval=$enable_mtftp; case "${enableval}" in - yes) mtftp=true ;; - no) mtftp=flase ;; - esac - else - mtftp=true --fi; -+fi - --# Check whether --enable-debug or --disable-debug was given. --if test "${enable_debug+set}" = set; then -- enableval="$enable_debug" -- case "${enableval}" in -+ -+# Check whether --enable-debug was given. -+if test "${enable_debug+set}" = set; then : -+ enableval=$enable_debug; case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; - esac - else - debug=false --fi; -+fi -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1856,10 +2764,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1869,35 +2777,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1907,39 +2817,50 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1949,99 +2870,60 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ -+ fi - fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -+if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. - else -+ ac_prog_rejected=no - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi -- --fi --if test -z "$CC"; then -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$CC"; then -- ac_cv_prog_CC="$CC" # Let the user override the test. --else -- ac_prog_rejected=no --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue -- fi -- ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -2059,24 +2941,25 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2086,39 +2969,41 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2128,66 +3013,78 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5 ; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2199,112 +3096,108 @@ - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -- echo "$as_me: failed program was:" >&5 -+ ac_file='' -+fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5 ; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -2312,38 +3205,90 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5 ; } -+fi -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5 ; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if test "${ac_cv_objext+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2355,45 +3300,46 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5 ; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2407,54 +3353,34 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2465,38 +3391,49 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : - --ac_cv_prog_cc_g=no -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2512,18 +3449,14 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -2551,12 +3484,17 @@ - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2571,201 +3509,37 @@ - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -- --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if test "x$ac_cv_prog_cc_c89" != xno; then : - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2773,7 +3547,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - DEPDIR="${am__leading_dot}deps" - -- ac_config_commands="$ac_config_commands depfiles" -+ac_config_commands="$ac_config_commands depfiles" - - - am_make=${MAKE-make} -@@ -2783,8 +3557,8 @@ - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -+$as_echo_n "checking for style of include used by $am_make... " >&6; } - am__include="#" - am__quote= - _am_result=none -@@ -2811,15 +3585,15 @@ - fi - - --echo "$as_me:$LINENO: result: $_am_result" >&5 --echo "${ECHO_T}$_am_result" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -+$as_echo "$_am_result" >&6; } - rm -f confinc confmf - --# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. --if test "${enable_dependency_tracking+set}" = set; then -- enableval="$enable_dependency_tracking" -+# Check whether --enable-dependency-tracking was given. -+if test "${enable_dependency_tracking+set}" = set; then : -+ enableval=$enable_dependency_tracking; -+fi - --fi; - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -@@ -2839,10 +3613,10 @@ - - depcc="$CC" am_compiler_list= - --echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 --if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -+$as_echo_n "checking dependency style of $depcc... " >&6; } -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -2922,8 +3696,8 @@ - fi - - fi --echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -@@ -2940,21 +3714,20 @@ - - - -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if test "${ac_cv_prog_CPP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2968,11 +3741,7 @@ - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -2981,78 +3750,34 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : - break - fi - -@@ -3064,8 +3789,8 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3075,11 +3800,7 @@ - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -3088,85 +3809,40 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5 ; } - fi - - ac_ext=c -@@ -3176,49 +3852,328 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -- fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep - -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include - -+int -+main () -+{ - --echo "$as_me:$LINENO: checking for AIX" >&5 --echo $ECHO_N "checking for AIX... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stdc=yes -+else -+ ac_cv_header_stdc=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#ifdef _AIX -- yes --#endif -+#include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 --cat >>confdefs.h <<\_ACEOF --#define _ALL_SOURCE 1 -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ -+else -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ - _ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then : - - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ ac_cv_header_stdc=no - fi - rm -f conftest* - -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then : -+ : -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif -+ -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ -+else -+ ac_cv_header_stdc=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then -+ -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h -+ -+fi -+ -+# On IRIX 5.3, sys/types and inttypes.h are conflicting. -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -+if test "x$ac_cv_header_minix_config_h" = x""yes; then : -+ MINIX=yes -+else -+ MINIX= -+fi -+ -+ -+ if test "$MINIX" = yes; then -+ -+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h -+ -+ -+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h -+ -+ -+$as_echo "#define _MINIX 1" >>confdefs.h -+ -+ fi -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+# define __EXTENSIONS__ 1 -+ $ac_includes_default -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_safe_to_define___extensions__=yes -+else -+ ac_cv_safe_to_define___extensions__=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } -+ test $ac_cv_safe_to_define___extensions__ = yes && -+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h -+ -+ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h -+ -+ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h -+ -+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h -+ -+ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h -+ -+ -+ -+ - - - CFLAGS="-g -Wall -D_REENTRANT" -@@ -3244,463 +4199,248 @@ - fi - fi - --echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -+set x ${MAKE-make} -+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes --else -- eval ac_cv_prog_make_${ac_make}_set=no --fi -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - SET_MAKE= - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - --# Find a good install program. We prefer a C program (faster), --# so one script is as good as another. But avoid the broken or --# incompatible versions: --# SysV /etc/install, /usr/sbin/install --# SunOS /usr/etc/install --# IRIX /sbin/install --# AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs --# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag --# AFS /usr/afsws/bin/install, which mishandles nonexistent args --# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" --# OS/2's system install, which has a completely different semantic --# ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 --if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -- /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -- done -- done -- ;; --esac --done -- -- --fi -- if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -- else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -- # break other packages using the cache if that directory is -- # removed, or if the path is relative. -- INSTALL=$ac_install_sh -- fi --fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -- --# Use test -z because SunOS4 sh mishandles braces in ${var-val}. --# It thinks the first close brace ends the variable substitution. --test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -- --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -- --test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - - if test x$mtftp = xtrue; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE_MTFTP 1 --_ACEOF -+$as_echo "#define HAVE_MTFTP 1" >>confdefs.h - - fi - --echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 --if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 -+$as_echo_n "checking for pthread_create in -lpthread... " >&6; } -+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpthread $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_create (); - int - main () - { --pthread_create (); -+return pthread_create (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pthread_pthread_create=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_pthread_pthread_create=no -+ ac_cv_lib_pthread_pthread_create=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 --echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 --if test $ac_cv_lib_pthread_pthread_create = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 -+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : - LIBPTHREAD=-lpthread - else -- { { echo "$as_me:$LINENO: error: not found" >&5 --echo "$as_me: error: not found" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "not found" "$LINENO" 5 - fi - - - - if test x$libreadline = xtrue; then -- echo "$as_me:$LINENO: checking for tgetent in -lreadline" >&5 --echo $ECHO_N "checking for tgetent in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_tgetent+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lreadline" >&5 -+$as_echo_n "checking for tgetent in -lreadline... " >&6; } -+if test "${ac_cv_lib_readline_tgetent+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lreadline $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char tgetent (); - int - main () - { --tgetent (); -+return tgetent (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_readline_tgetent=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_readline_tgetent=no -+ ac_cv_lib_readline_tgetent=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_tgetent" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_tgetent" >&6 --if test $ac_cv_lib_readline_tgetent = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_tgetent" >&5 -+$as_echo "$ac_cv_lib_readline_tgetent" >&6; } -+if test "x$ac_cv_lib_readline_tgetent" = x""yes; then : - LIBTERMCAP="" - else -- echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 --echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 --if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 -+$as_echo_n "checking for tgetent in -lncurses... " >&6; } -+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lncurses $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char tgetent (); - int - main () - { --tgetent (); -+return tgetent (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ncurses_tgetent=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_ncurses_tgetent=no -+ ac_cv_lib_ncurses_tgetent=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 --echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 --if test $ac_cv_lib_ncurses_tgetent = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 -+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } -+if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then : - LIBTERMCAP=-lncurses - else -- echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 --echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6 --if test "${ac_cv_lib_curses_tgetent+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5 -+$as_echo_n "checking for tgetent in -lcurses... " >&6; } -+if test "${ac_cv_lib_curses_tgetent+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lcurses $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char tgetent (); - int - main () - { --tgetent (); -+return tgetent (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_curses_tgetent=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_curses_tgetent=no -+ ac_cv_lib_curses_tgetent=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5 --echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6 --if test $ac_cv_lib_curses_tgetent = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5 -+$as_echo "$ac_cv_lib_curses_tgetent" >&6; } -+if test "x$ac_cv_lib_curses_tgetent" = x""yes; then : - LIBTERMCAP=-lcurses - else -- echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 --echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 --if test "${ac_cv_lib_termcap_tgetent+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 -+$as_echo_n "checking for tgetent in -ltermcap... " >&6; } -+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ltermcap $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char tgetent (); - int - main () - { --tgetent (); -+return tgetent (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_termcap_tgetent=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_termcap_tgetent=no -+ ac_cv_lib_termcap_tgetent=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 --echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 --if test $ac_cv_lib_termcap_tgetent = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 -+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } -+if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then : - LIBTERMCAP=-ltermcap - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - fi -@@ -3711,225 +4451,138 @@ - - - -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 -+$as_echo_n "checking for readline in -lreadline... " >&6; } -+if test "${ac_cv_lib_readline_readline+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lreadline $LIBTERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char readline (); - int - main () - { --readline (); -+return readline (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_readline_readline=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_readline_readline=no -+ ac_cv_lib_readline_readline=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 -+$as_echo "$ac_cv_lib_readline_readline" >&6; } -+if test "x$ac_cv_lib_readline_readline" = x""yes; then : - LIBREADLINE=-lreadline - --cat >>confdefs.h <<\_ACEOF --#define HAVE_READLINE 1 --_ACEOF -+$as_echo "#define HAVE_READLINE 1" >>confdefs.h - - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - -- echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5 --echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5 -+$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; } -+if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lreadline $LIBTERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char rl_completion_matches (); - int - main () - { --rl_completion_matches (); -+return rl_completion_matches (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_readline_rl_completion_matches=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_readline_rl_completion_matches=no -+ ac_cv_lib_readline_rl_completion_matches=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_rl_completion_matches" >&6 --if test $ac_cv_lib_readline_rl_completion_matches = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5 -+$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; } -+if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then : - --cat >>confdefs.h <<\_ACEOF --#define HAVE_RL_COMPLETION_MATCHES 1 --_ACEOF -+$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h - - else -- echo "$as_me:$LINENO: checking for completion_matches in -lreadline" >&5 --echo $ECHO_N "checking for completion_matches in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_completion_matches+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for completion_matches in -lreadline" >&5 -+$as_echo_n "checking for completion_matches in -lreadline... " >&6; } -+if test "${ac_cv_lib_readline_completion_matches+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lreadline $LIBTERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char completion_matches (); - int - main () - { --completion_matches (); -+return completion_matches (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_readline_completion_matches=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_readline_completion_matches=no -+ ac_cv_lib_readline_completion_matches=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_completion_matches" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_completion_matches" >&6 --if test $ac_cv_lib_readline_completion_matches = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_completion_matches" >&5 -+$as_echo "$ac_cv_lib_readline_completion_matches" >&6; } -+if test "x$ac_cv_lib_readline_completion_matches" = x""yes; then : - --cat >>confdefs.h <<\_ACEOF --#define HAVE_COMPLETION_MATCHES 1 --_ACEOF -+$as_echo "#define HAVE_COMPLETION_MATCHES 1" >>confdefs.h - - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - fi -@@ -3939,13 +4592,9 @@ - if test x$libwrap = xtrue; then - orig_LIBS="$LIBS" - LIBS="-lnsl -lwrap" -- echo "$as_me:$LINENO: checking for hosts_ctl in -lwrap" >&5 --echo $ECHO_N "checking for hosts_ctl in -lwrap... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hosts_ctl in -lwrap" >&5 -+$as_echo_n "checking for hosts_ctl in -lwrap... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #include -@@ -3961,138 +4610,80 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - LIBWRAP="-lnsl -lwrap" - LIBS="$orig_LIBS" -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - --cat >>confdefs.h <<\_ACEOF --#define HAVE_WRAP 1 --_ACEOF -+$as_echo "#define HAVE_WRAP 1" >>confdefs.h - - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --LIBWRAP="" -+ LIBWRAP="" - LIBS="$orig_LIBS" -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - - fi - - if test x$libpcre = xtrue; then -- echo "$as_me:$LINENO: checking for pcre_version in -lpcre" >&5 --echo $ECHO_N "checking for pcre_version in -lpcre... $ECHO_C" >&6 --if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_version in -lpcre" >&5 -+$as_echo_n "checking for pcre_version in -lpcre... " >&6; } -+if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpcre $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pcre_version (); - int - main () - { --pcre_version (); -+return pcre_version (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pcre_pcre_version=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_pcre_pcre_version=no -+ ac_cv_lib_pcre_pcre_version=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_version" >&5 --echo "${ECHO_T}$ac_cv_lib_pcre_pcre_version" >&6 --if test $ac_cv_lib_pcre_pcre_version = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_version" >&5 -+$as_echo "$ac_cv_lib_pcre_pcre_version" >&6; } -+if test "x$ac_cv_lib_pcre_pcre_version" = x""yes; then : - LIBPCRE=-lpcre - --cat >>confdefs.h <<\_ACEOF --#define HAVE_PCRE 1 --_ACEOF -+$as_echo "#define HAVE_PCRE 1" >>confdefs.h - - fi - - - fi - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -4107,50 +4698,23 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -4160,18 +4724,14 @@ - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -4181,16 +4741,13 @@ - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -4210,1330 +4767,140 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - --# On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+for ac_header in sys/time.h sys/types.h sys/socket.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- -- -- --for ac_header in sys/time.h sys/types.h sys/socket.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+for ac_header in arpa/inet.h arpa/tftp.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 - --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+done -+ -+for ac_header in getopt.h unistd.h signal.h pthread.h argz.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no - fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+done - --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+for ac_header in netdb.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default" -+if test "x$ac_cv_header_netdb_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_NETDB_H 1 - _ACEOF - - fi - - done - -- -- --for ac_header in arpa/inet.h arpa/tftp.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+for ac_header in readline/readline.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" -+if test "x$ac_cv_header_readline_readline_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_READLINE_READLINE_H 1 - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 - --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+done -+ -+for ac_header in readline/history.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" -+if test "x$ac_cv_header_readline_history_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_READLINE_HISTORY_H 1 - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no - fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+done - --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test x$libwrap = xtrue; then -+for ac_header in tcpd.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default" -+if test "x$ac_cv_header_tcpd_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_TCPD_H 1 - _ACEOF - - fi - - done - -- -- -- -- -- --for ac_header in getopt.h unistd.h signal.h pthread.h argz.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+if test x$libpcre = xtrue; then -+for ac_header in pcre.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" -+if test "x$ac_cv_header_pcre_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_PCRE_H 1 - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 - --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+done - -- ac_header_preproc=no - fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -+$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -+if test "${ac_cv_c_const+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --for ac_header in netdb.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --for ac_header in readline/readline.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --for ac_header in readline/history.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- --if test x$libwrap = xtrue; then -- --for ac_header in tcpd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- --fi --if test x$libpcre = xtrue; then -- --for ac_header in pcre.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- --fi -- --echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 --echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 --if test "${ac_cv_c_const+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - - int - main () -@@ -5542,10 +4909,10 @@ - #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; -- const charset x; -+ const charset cs; - /* SunOS 4.1.1 cc rejects this. */ -- char const *const *ccp; -- char **p; -+ char const *const *pcpcc; -+ char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; -@@ -5554,16 +4921,17 @@ - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; -- ccp = &g + (g ? g-g : 0); -+ pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ -- ++ccp; -- p = (char**) ccp; -- ccp = (char const *const *) p; -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -+ if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; -@@ -5576,576 +4944,158 @@ - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying -- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -- struct s { int j; const int *ap[3]; }; -- struct s *b; b->j = 5; -- } -- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -- const int foo = 10; -- } --#endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_c_const=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_c_const=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 --echo "${ECHO_T}$ac_cv_c_const" >&6 --if test $ac_cv_c_const = no; then -- --cat >>confdefs.h <<\_ACEOF --#define const --_ACEOF -- --fi -- --echo "$as_me:$LINENO: checking for size_t" >&5 --echo $ECHO_N "checking for size_t... $ECHO_C" >&6 --if test "${ac_cv_type_size_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --if ((size_t *) 0) -- return 0; --if (sizeof (size_t)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_size_t=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_size_t=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 --echo "${ECHO_T}$ac_cv_type_size_t" >&6 --if test $ac_cv_type_size_t = yes; then -- : --else -- --cat >>confdefs.h <<_ACEOF --#define size_t unsigned --_ACEOF -- --fi -- --echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 --echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 --if test "${ac_cv_header_time+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include --#include -- --int --main () --{ --if ((struct tm *) 0) --return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_header_time=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_time=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 --echo "${ECHO_T}$ac_cv_header_time" >&6 --if test $ac_cv_header_time = yes; then -- --cat >>confdefs.h <<\_ACEOF --#define TIME_WITH_SYS_TIME 1 --_ACEOF -- --fi -- --echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 --if test "${ac_cv_type_signal+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include --#ifdef signal --# undef signal --#endif --#ifdef __cplusplus --extern "C" void (*signal (int, void (*)(int)))(int); --#else --void (*signal ()) (); --#endif -- --int --main () --{ --int i; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_signal=void --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_signal=int --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --echo "${ECHO_T}$ac_cv_type_signal" >&6 -- --cat >>confdefs.h <<_ACEOF --#define RETSIGTYPE $ac_cv_type_signal --_ACEOF -- -- -- -- -- -- -- -- -- -- --for ac_func in strchr memcpy strstr strcmp strncmp strncpy strlen --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} -+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -+ struct s { int j; const int *ap[3]; }; -+ struct s *b; b->j = 5; -+ } -+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+ if (!foo) return 0; -+ } -+ return !cs[0] && !zero.x; - #endif - --int --main () --{ --return f != $ac_func; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_c_const=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_var=no" -+ ac_cv_c_const=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- --fi --done -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -+$as_echo "$ac_cv_c_const" >&6; } -+if test $ac_cv_c_const = no; then - -+$as_echo "#define const /**/" >>confdefs.h - -+fi - -+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -+if test "x$ac_cv_type_size_t" = x""yes; then : - --for ac_func in strncasecmp strcasecmp strncmp --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ - --#ifdef __STDC__ --# include --#else --# include --#endif -+cat >>confdefs.h <<_ACEOF -+#define size_t unsigned int -+_ACEOF - --#undef $ac_func -+fi - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} --#endif -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -+if test "${ac_cv_header_time+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#include - - int - main () - { --return f != $ac_func; -+if ((struct tm *) 0) -+return 0; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_time=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_var=no" --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ ac_cv_header_time=no - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --done -- -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -+$as_echo "$ac_cv_header_time" >&6; } -+if test $ac_cv_header_time = yes; then - -+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -+fi - --for ac_func in socket gethostbyname gethostbyname_r gethostbyaddr --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } -+if test "${ac_cv_type_signal+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} --#endif -+#include -+#include - - int - main () - { --return f != $ac_func; -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_type_signal=int - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_type_signal=void -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } -+ -+cat >>confdefs.h <<_ACEOF -+#define RETSIGTYPE $ac_cv_type_signal -+_ACEOF -+ -+ -+ -+for ac_func in strchr memcpy strstr strcmp strncmp strncpy strlen -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - --eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+done -+ -+for ac_func in strncasecmp strcasecmp strncmp -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -+done -+ -+for ac_func in socket gethostbyname gethostbyname_r gethostbyaddr -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - - -- ac_config_commands="$ac_config_commands default-1" -+ac_config_commands="$ac_config_commands default-1" - - -- ac_config_files="$ac_config_files Makefile test/Makefile redhat/atftp.spec" -+ac_config_files="$ac_config_files Makefile test/Makefile redhat/atftp.spec" -+ - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -6164,39 +5114,59 @@ - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -6205,32 +5175,19 @@ - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -6238,26 +5195,22 @@ - - - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"AMDEP\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - - : ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -6267,81 +5220,252 @@ - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -6349,148 +5473,123 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ - -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -6499,31 +5598,20 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.67. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -6531,45 +5619,47 @@ - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -+case $ac_config_headers in *" -+"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -+esac - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -6580,84 +5670,91 @@ - Configuration commands: - $config_commands - --Report bugs to ." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.67, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+AWK='$AWK' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ as_fn_error $? "ambiguous option: \`$1' -+Try \`$0 --help' for more information.";; -+ --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -6671,43 +5768,55 @@ - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # --# INIT-COMMANDS section. -+# INIT-COMMANDS - # -- - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - PLATFORM=$PLATFORM - - _ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; -- "redhat/atftp.spec" ) CONFIG_FILES="$CONFIG_FILES redhat/atftp.spec" ;; -- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; -+ "redhat/atftp.spec") CONFIG_FILES="$CONFIG_FILES redhat/atftp.spec" ;; -+ -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -6719,728 +5828,575 @@ - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$tmp/subs1.awk" && -+_ACEOF -+ -+ -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" -+ -+} - { -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line - } - -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi - --# --# CONFIG_FILES section. --# -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@CYGPATH_W@,$CYGPATH_W,;t t --s,@PACKAGE@,$PACKAGE,;t t --s,@VERSION@,$VERSION,;t t --s,@ACLOCAL@,$ACLOCAL,;t t --s,@AUTOCONF@,$AUTOCONF,;t t --s,@AUTOMAKE@,$AUTOMAKE,;t t --s,@AUTOHEADER@,$AUTOHEADER,;t t --s,@MAKEINFO@,$MAKEINFO,;t t --s,@AMTAR@,$AMTAR,;t t --s,@install_sh@,$install_sh,;t t --s,@STRIP@,$STRIP,;t t --s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t --s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t --s,@mkdir_p@,$mkdir_p,;t t --s,@AWK@,$AWK,;t t --s,@SET_MAKE@,$SET_MAKE,;t t --s,@am__leading_dot@,$am__leading_dot,;t t --s,@ISODATE@,$ISODATE,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@PLATFORM@,$PLATFORM,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@DEPDIR@,$DEPDIR,;t t --s,@am__include@,$am__include,;t t --s,@am__quote@,$am__quote,;t t --s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t --s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t --s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t --s,@CCDEPMODE@,$CCDEPMODE,;t t --s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t --s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@LIBPTHREAD@,$LIBPTHREAD,;t t --s,@LIBTERMCAP@,$LIBTERMCAP,;t t --s,@LIBREADLINE@,$LIBREADLINE,;t t --s,@LIBWRAP@,$LIBWRAP,;t t --s,@LIBPCRE@,$LIBPCRE,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with `./config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ -+# Transform confdefs.h into an awk script `defines.awk', embedded as -+# here-document in config.status, that substitutes the proper values into -+# config.h.in to produce config.h. -+ -+# Create a delimiter string that does not exist in confdefs.h, to ease -+# handling of long lines. -+ac_delim='%!_!# ' -+for ac_last_try in false false :; do -+ ac_t=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_t"; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi --fi # test -n "$CONFIG_FILES" -+done - -+# For the awk script, D is an array of macro values keyed by name, -+# likewise P contains macro parameters if any. Preserve backslash -+# newline sequences. -+ -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+sed -n ' -+s/.\{148\}/&'"$ac_delim"'/g -+t rset -+:rset -+s/^[ ]*#[ ]*define[ ][ ]*/ / -+t def -+d -+:def -+s/\\$// -+t bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3"/p -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -+d -+:bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3\\\\\\n"\\/p -+t cont -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -+t cont -+d -+:cont -+n -+s/.\{148\}/&'"$ac_delim"'/g -+t clear -+:clear -+s/\\$// -+t bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/"/p -+d -+:bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -+b cont -+' >$CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ for (key in D) D_is_set[key] = 1 -+ FS = "" -+} -+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -+ line = \$ 0 -+ split(line, arg, " ") -+ if (arg[1] == "#") { -+ defundef = arg[2] -+ mac1 = arg[3] -+ } else { -+ defundef = substr(arg[1], 2) -+ mac1 = arg[2] -+ } -+ split(mac1, mac2, "(") #) -+ macro = mac2[1] -+ prefix = substr(line, 1, index(line, defundef) - 1) -+ if (D_is_set[macro]) { -+ # Preserve the white space surrounding the "#". -+ print prefix "define", macro P[macro] D[macro] -+ next -+ } else { -+ # Replace #undef with comments. This is necessary, for example, -+ # in the case of _POSIX_SOURCE, which is predefined and required -+ # on some systems where configure will not decide to define it. -+ if (defundef == "undef") { -+ print "/*", prefix defundef, macro, "*/" -+ next -+ } -+ } -+} -+{ print } -+_ACAWK - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -+fi # test -n "$CONFIG_HEADERS" -+ -+ -+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} -+ fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+_ACEOF - -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -- --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_HEADER section. --# -- --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&2;} - --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ rm -f "$tmp/stdin" - case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -- esac -- -- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- # Do quote $f, to prevent DOS paths from being IFS'd. -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -- --_ACEOF -- --# Transform confdefs.h into two sed scripts, `conftest.defines' and --# `conftest.undefs', that substitutes the proper values into --# config.h.in to produce config.h. The first handles `#define' --# templates, and the second `#undef' templates. --# And first: Protect against being on the right side of a sed subst in --# config.status. Protect against being in an unquoted here document --# in config.status. --rm -f conftest.defines conftest.undefs --# Using a here document instead of a string reduces the quoting nightmare. --# Putting comments in sed scripts is not portable. --# --# `end' is used to avoid that the second main sed command (meant for --# 0-ary CPP macros) applies to n-ary macro definitions. --# See the Autoconf documentation for `clear'. --cat >confdef2sed.sed <<\_ACEOF --s/[\\&,]/\\&/g --s,[\\$`],\\&,g --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp --t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp --: end --_ACEOF --# If some macros were called several times there might be several times --# the same #defines, which is useless. Nevertheless, we may not want to --# sort them, since we want the *last* AC-DEFINE to be honored. --uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines --sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs --rm -f confdef2sed.sed -- --# This sed command replaces #undef with comments. This is necessary, for --# example, in the case of _POSIX_SOURCE, which is predefined and required --# on some systems where configure will not decide to define it. --cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, --_ACEOF -- --# Break up conftest.defines because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS --echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS --echo ' :' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.defines >/dev/null --do -- # Write a limited-size here document to $tmp/defines.sed. -- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/defines.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -- rm -f conftest.defines -- mv conftest.tail conftest.defines --done --rm -f conftest.defines --echo ' fi # grep' >>$CONFIG_STATUS --echo >>$CONFIG_STATUS -- --# Break up conftest.undefs because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #undef templates' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.undefs >/dev/null --do -- # Write a limited-size here document to $tmp/undefs.sed. -- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/undefs.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -- rm -f conftest.undefs -- mv conftest.tail conftest.undefs --done --rm -f conftest.undefs -- --cat >>$CONFIG_STATUS <<\_ACEOF -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- echo "/* Generated by configure. */" >$tmp/config.h -- else -- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h -- fi -- cat $tmp/in >>$tmp/config.h -- rm -f $tmp/in -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # - if test x"$ac_file" != x-; then -- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then -- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 --echo "$as_me: $ac_file is unchanged" >&6;} -+ { -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -+ } >"$tmp/config.h" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -+$as_echo "$as_me: $ac_file is unchanged" >&6;} - else -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -- rm -f $ac_file -- mv $tmp/config.h $ac_file -+ rm -f "$ac_file" -+ mv "$tmp/config.h" "$ac_file" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else -- cat $tmp/config.h -- rm -f $tmp/config.h -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -+ || as_fn_error $? "could not create -" "$LINENO" 5 - fi --# Compute $ac_file's index in $config_headers. -+# Compute "$ac_file"'s index in $config_headers. - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $ac_file | $ac_file:* ) -+ "$ac_file" | "$ac_file":* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || --$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X$ac_file : 'X\(//\)[^/]' \| \ -- X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X$ac_file | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'`/stamp-h$_am_stamp_count --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_COMMANDS section. --# --for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_dir=`(dirname "$ac_dest") 2>/dev/null || --$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_dest" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -+echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+ ;; - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -+$as_echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac - - -- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 --echo "$as_me: executing $ac_dest commands" >&6;} -- case $ac_dest in -- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ case $ac_file$ac_mode in -+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -@@ -7450,18 +6406,29 @@ - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`(dirname "$mf") 2>/dev/null || -+ dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ -- X"$mf" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$mf" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$mf" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - else - continue - fi -@@ -7489,66 +6456,54 @@ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -- fdir=`(dirname "$file") 2>/dev/null || -+ fdir=`$as_dirname -- "$file" || - $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ -- X"$file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p $dirpart/$fdir -- else -- as_dir=$dirpart/$fdir -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 --echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} -- { (exit 1); exit 1; }; }; } -- -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done - ;; -- default-1 ) -+ "default-1":C) - outfile=PLATFORM - tmpfile=${outfile} - cat > $tmpfile << _EOF_ - $PLATFORM - _EOF_ - ;; -+ - esac --done --_ACEOF -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - --{ (exit 0); exit 0; } -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -7568,6 +6523,10 @@ - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - ---- atftp-0.7.dfsg.orig/PLATFORM -+++ atftp-0.7.dfsg/PLATFORM -@@ -0,0 +1 @@ -+pc-i686-linux-gnu ---- atftp-0.7.dfsg.orig/configure.ac -+++ atftp-0.7.dfsg/configure.ac -@@ -62,6 +62,7 @@ - - dnl Check for programs - AC_PROG_CC -+AC_GNU_SOURCE - - dnl Check for AIX - AC_AIX ---- atftp-0.7.dfsg.orig/config.guess -+++ atftp-0.7.dfsg/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2004-01-05' -+timestamp='2008-01-23' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,13 +18,15 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+ - # Originally written by Per Bothner . - # Please send patches to . Submit a context - # diff and a properly formatted ChangeLog entry. -@@ -53,8 +56,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -66,11 +69,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +107,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -123,7 +126,7 @@ - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -158,6 +161,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -196,53 +200,32 @@ - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pegasos:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU -@@ -280,45 +263,49 @@ - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -- Alpha*:OpenVMS:*:*) -- echo alpha-hp-vms -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 -- exit 0 ;; -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -326,32 +313,32 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 -- exit 0 ;; -- DRS?6000:UNIX_SV:4.2*:7*) -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in -- sparc) echo sparc-icl-nx7 && exit 0 ;; -+ sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -360,10 +347,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -375,10 +362,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -389,37 +376,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -443,32 +433,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c \ -- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -484,29 +475,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -514,7 +505,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -529,15 +520,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -550,28 +545,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -633,9 +628,19 @@ - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else -@@ -643,11 +648,11 @@ - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -675,163 +680,192 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - *:UNICOS/mp:*:*) -- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- # Determine whether the default compiler uses glibc. -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #if __GLIBC__ >= 2 -- LIBC=gnu -- #else -- LIBC= -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using -- # FreeBSD's kernel, but not the complete OS. -- case ${LIBC} in gnu) kernel_only='k' ;; esac -- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit 0 ;; -+ exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -- exit 0 ;; -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix -- exit 0 ;; -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -- exit 0 ;; -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu -- exit 0 ;; -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -848,8 +882,12 @@ - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build -@@ -867,15 +905,22 @@ - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -889,7 +934,7 @@ - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -897,25 +942,31 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -+ exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -933,15 +984,15 @@ - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -+ exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -+ exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -+ exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build -@@ -958,7 +1009,7 @@ - LIBC=gnulibc1 - # endif - #else -- #ifdef __INTEL_COMPILER -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout -@@ -968,16 +1019,23 @@ - LIBC=dietlibc - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -985,27 +1043,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -- i*86:syllable:*:*) -+ exit ;; -+ i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable -- exit 0 ;; -+ exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -1013,15 +1071,16 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -+ exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv -- exit 0 ;; -+ exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1113,68 +1172,81 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- case `uname -p` in -- *86) UNAME_PROCESSOR=i686 ;; -- powerpc) UNAME_PROCESSOR=powerpc ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1182,22 +1254,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1208,31 +1283,47 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} -- exit 0 ;; -- *:DRAGONFLY:*:*) -- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1264,7 +1355,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1353,11 +1444,12 @@ - } - EOF - --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1366,22 +1458,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1392,7 +1484,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- atftp-0.7.dfsg.orig/tftpd.c -+++ atftp-0.7.dfsg/tftpd.c -@@ -57,9 +57,12 @@ - int tftpd_max_thread = 100; /* number of concurent thread allowed */ - int tftpd_timeout = 300; /* number of second of inactivity - before exiting */ --char directory[MAXLEN] = "/tftpboot/"; -+char directory[MAXLEN] = "/srv/tftp/"; - int retry_timeout = S_TIMEOUT; - -+int on = 1; -+int listen_local = 0; -+ - int tftpd_daemon = 0; /* By default we are started by inetd */ - int tftpd_daemon_no_fork = 0; /* For who want a false daemon mode */ - short tftpd_port = 0; /* Port atftpd listen to */ -@@ -153,10 +156,10 @@ - int run = 1; /* while (run) loop */ - struct thread_data *new; /* for allocation of new thread_data */ - int sockfd; /* used in daemon mode */ -- struct sockaddr_in sa; /* used in daemon mode */ -- struct servent *serv; -+ struct sockaddr_storage sa; /* used in daemon mode */ - struct passwd *user; - struct group *group; -+ pthread_t tid; - - #ifdef HAVE_MTFTP - pthread_t mtftp_thread; -@@ -228,32 +231,48 @@ - exit(2); - } - -- /* find the port */ -- if (tftpd_port == 0) -+ /* find the port; initialise sockaddr_storage structure */ -+ if (strlen(tftpd_addr) > 0 || tftpd_port == 0) - { -- if ((serv = getservbyname("tftp", "udp")) == NULL) -+ struct addrinfo hints, *result; -+ int err; -+ -+ /* look up the service and host */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; -+ hints.ai_flags = AI_NUMERICHOST; -+ err = getaddrinfo(tftpd_addr, tftpd_port ? NULL : "tftp", -+ &hints, &result); -+ if (err == EAI_SERVICE) - { - logger(LOG_ERR, "atftpd: udp/tftp, unknown service"); - exit(1); - } -- tftpd_port = ntohs(serv->s_port); -- } -- /* initialise sockaddr_in structure */ -- memset(&sa, 0, sizeof(sa)); -- sa.sin_family = AF_INET; -- sa.sin_port = htons(tftpd_port); -- if (strlen(tftpd_addr) > 0) -- { -- if (inet_aton(tftpd_addr, &(sa.sin_addr)) == 0) -+ if (err || sockaddr_set_addrinfo(&sa, result)) - { - logger(LOG_ERR, "atftpd: invalid IP address %s", tftpd_addr); - exit(1); - } -+ -+ if (!tftpd_port) -+ tftpd_port = sockaddr_get_port(&sa); -+ else { -+ sa.ss_family = AF_INET; -+ sockaddr_set_port(&sa, tftpd_port); -+ } -+ -+ freeaddrinfo(result); - } -- else -- sa.sin_addr.s_addr = htonl(INADDR_ANY); -+ -+ if (strlen(tftpd_addr) == 0) -+ { -+ memset(&sa, 0, sizeof(sa)); -+ sa.ss_family = AF_INET; -+ sockaddr_set_port(&sa, tftpd_port); -+ } -+ - /* open the socket */ -- if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) -+ if ((sockfd = socket(sa.ss_family, SOCK_DGRAM, 0)) == 0) - { - logger(LOG_ERR, "atftpd: can't open socket"); - exit(1); -@@ -300,11 +319,13 @@ - open_logger("atftpd", log_file, logging_level); - } - -+#if defined(SOL_IP) && defined(IP_PKTINFO) - /* We need to retieve some information from incomming packets */ - if (setsockopt(0, SOL_IP, IP_PKTINFO, &one, sizeof(one)) != 0) - { - logger(LOG_WARNING, "Failed to set socket option: %s", strerror(errno)); - } -+#endif - - /* save main thread ID for proper signal handling */ - main_thread_id = pthread_self(); -@@ -387,10 +408,18 @@ - packets */ - if (!tftpd_cancel) - { -+ int rv; -+ - if ((tftpd_timeout == 0) || (tftpd_daemon)) -- select(FD_SETSIZE, &rfds, NULL, NULL, NULL); -+ rv = select(FD_SETSIZE, &rfds, NULL, NULL, NULL); - else -- select(FD_SETSIZE, &rfds, NULL, NULL, &tv); -+ rv = select(FD_SETSIZE, &rfds, NULL, NULL, &tv); -+ if (rv < 0) { -+ logger(LOG_ERR, "%s: %d: select: %s", -+ __FILE__, __LINE__, strerror(errno)); -+ /* Clear the bits, they are undefined! */ -+ FD_ZERO(&rfds); -+ } - } - - #ifdef RATE_CONTROL -@@ -466,7 +495,7 @@ - new->client_info->next = NULL; - - /* Start a new server thread. */ -- if (pthread_create(&new->tid, NULL, tftpd_receive_request, -+ if (pthread_create(&tid, NULL, tftpd_receive_request, - (void *)new) != 0) - { - logger(LOG_ERR, "Failed to start new thread"); -@@ -558,16 +587,15 @@ - int num_of_threads; - int abort = 0; /* 1 if we need to abort because the maximum - number of threads have been reached*/ -- struct sockaddr_in to; /* destination of client's packet */ -- socklen_t len = sizeof(struct sockaddr); -+ struct sockaddr_storage to; /* destination of client's packet */ -+ socklen_t len = sizeof(to); - --#ifdef HAVE_WRAP -- char client_addr[16]; --#endif -+ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; - - /* Detach ourself. That way the main thread does not have to - * wait for us with pthread_join. */ -- pthread_detach(pthread_self()); -+ data->tid = pthread_self(); -+ pthread_detach(data->tid); - - /* Read the first packet from stdin. */ - data_size = data->data_buffer_size; -@@ -591,12 +619,12 @@ - { - /* Verify the client has access. We don't look for the name but - rely only on the IP address for that. */ -- inet_ntop(AF_INET, &data->client_info->client.sin_addr, -- client_addr, sizeof(client_addr)); -- if (hosts_ctl("in.tftpd", STRING_UNKNOWN, client_addr, -+ sockaddr_print_addr(&data->client_info->client, -+ addr_str, sizeof(addr_str)); -+ if (hosts_ctl("in.tftpd", STRING_UNKNOWN, addr_str, - STRING_UNKNOWN) == 0) - { -- logger(LOG_ERR, "Connection refused from %s", client_addr); -+ logger(LOG_ERR, "Connection refused from %s", addr_str); - abort = 1; - } - } -@@ -612,9 +640,27 @@ - else - { - /* open a socket for client communication */ -- data->sockfd = socket(PF_INET, SOCK_DGRAM, 0); -- to.sin_family = AF_INET; -- to.sin_port = 0; -+ data->sockfd = socket(data->client_info->client.ss_family, -+ SOCK_DGRAM, 0); -+ memset(&to, 0, sizeof(to)); -+ to.ss_family = data->client_info->client.ss_family; -+ /* Force socket to listen on local address. Do not listen on broadcast address 255.255.255.255. -+ If the socket listens on the broadcast address, Linux tells the remote client the port -+ is unreachable. This happens even if SO_BROADCAST is set in setsockopt for this socket. -+ I was unable to find a kernel option or /proc/sys flag to make the kernel pay attention to -+ these requests, so the workaround is to force listening on the local address. */ -+ if (listen_local == 1) -+ { -+ logger(LOG_INFO, "forcing socket to listen on local address"); -+ if (setsockopt(data->sockfd, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)) != 0) { -+ logger(LOG_ERR, "setsockopt: %s", strerror(errno)); -+ } -+ } -+ else -+ { -+ logger(LOG_INFO, "socket may listen on any address, including broadcast"); -+ } -+ - if (data->sockfd > 0) - { - /* bind the socket to the interface */ -@@ -624,13 +670,16 @@ - retval = ABORT; - } - /* read back assigned port */ -- len = sizeof(struct sockaddr); -+ len = sizeof(to); - if (getsockname(data->sockfd, (struct sockaddr *)&to, &len) == -1) - { - logger(LOG_ERR, "getsockname: %s", strerror(errno)); - retval = ABORT; - } - /* connect the socket, faster for kernel operation */ -+ /* this is not a good idea on FreeBSD, because sendto() cannot -+ be used on a connected datagram socket */ -+#if !defined(__FreeBSD_kernel__) - if (connect(data->sockfd, - (struct sockaddr *)&data->client_info->client, - sizeof(data->client_info->client)) == -1) -@@ -638,8 +687,10 @@ - logger(LOG_ERR, "connect: %s", strerror(errno)); - retval = ABORT; - } -+#endif - logger(LOG_DEBUG, "Creating new socket: %s:%d", -- inet_ntoa(to.sin_addr), ntohs(to.sin_port)); -+ sockaddr_print_addr(&to, addr_str, sizeof(addr_str)), -+ sockaddr_get_port(&to)); - - /* read options from request */ - opt_parse_request(data->data_buffer, data_size, -@@ -657,8 +708,9 @@ - case GET_RRQ: - logger(LOG_NOTICE, "Serving %s to %s:%d", - data->tftp_options[OPT_FILENAME].value, -- inet_ntoa(data->client_info->client.sin_addr), -- ntohs(data->client_info->client.sin_port)); -+ sockaddr_print_addr(&data->client_info->client, -+ addr_str, sizeof(addr_str)), -+ sockaddr_get_port(&data->client_info->client)); - if (data->trace) - logger(LOG_DEBUG, "received RRQ <%s>", string); - if (tftpd_send_file(data) == OK) -@@ -668,7 +720,8 @@ - break; - case GET_WRQ: - logger(LOG_NOTICE, "Fetching from %s to %s", -- inet_ntoa(data->client_info->client.sin_addr), -+ sockaddr_print_addr(&data->client_info->client, -+ addr_str, sizeof(addr_str)), - data->tftp_options[OPT_FILENAME].value); - if (data->trace) - logger(LOG_DEBUG, "received WRQ <%s>", string); -@@ -693,7 +746,9 @@ - break; - default: - logger(LOG_NOTICE, "Invalid request <%d> from %s", -- retval, inet_ntoa(data->client_info->client.sin_addr)); -+ retval, -+ sockaddr_print_addr(&data->client_info->client, -+ addr_str, sizeof(addr_str))); - tftp_send_error(data->sockfd, &data->client_info->client, - EBADOP, data->data_buffer, data->data_buffer_size); - if (data->trace) -@@ -732,8 +787,8 @@ - tftpd_clientlist_free(data); - - /* free the thread structure */ -- free(data); -- -+ free(data); -+ - logger(LOG_INFO, "Server thread exiting"); - pthread_exit(NULL); - } -@@ -811,6 +866,7 @@ - { "no-multicast", 0, NULL, 'M' }, - { "logfile", 1, NULL, 'L' }, - { "pidfile", 1, NULL, 'I'}, -+ { "listen-local", 0, NULL, 'F'}, - { "daemon", 0, NULL, 'D' }, - { "no-fork", 0, NULL, 'N'}, - { "user", 1, NULL, 'U'}, -@@ -888,6 +944,9 @@ - case 'I': - pidfile = strdup(optarg); - break; -+ case 'F': -+ listen_local = 1; -+ break; - case 'D': - tftpd_daemon = 1; - break; -@@ -1015,6 +1074,10 @@ - logger(LOG_INFO, " log file: %s", (log_file==NULL) ? "syslog":log_file); - if (pidfile) - logger(LOG_INFO, " pid file: %s", pidfile); -+ if (listen_local == 1) -+ logger(LOG_INFO, " forcing to listen on local interfaces: on."); -+ else -+ logger(LOG_INFO, " not forcing to listen on local interfaces."); - if (tftpd_daemon == 1) - logger(LOG_INFO, " server timeout: Not used"); - else -@@ -1111,11 +1174,12 @@ - " output messages\n" - " --trace : log all sent and received packets\n" - " --no-timeout : disable 'timeout' from RFC2349\n" -- " --no-tisize : disable 'tsize' from RFC2349\n" -+ " --no-tsize : disable 'tsize' from RFC2349\n" - " --no-blksize : disable 'blksize' from RFC2348\n" - " --no-multicast : disable 'multicast' from RFC2090\n" - " --logfile : logfile to log logs to ;-)\n" - " --pidfile : write PID to this file\n" -+ " --listen-local : force listen on local network address\n" - " --daemon : run atftpd standalone (no inetd)\n" - " --no-fork : run as a daemon, don't fork\n" - " --user : default is nobody\n" ---- atftp-0.7.dfsg.orig/tftpd.h -+++ atftp-0.7.dfsg/tftpd.h -@@ -44,8 +44,8 @@ - /* multicast stuff */ - short mc_port; /* multicast port */ - char *mc_addr; /* multicast address */ -- struct sockaddr_in sa_mcast; -- struct ip_mreq mcastaddr; -+ struct sockaddr_storage sa_mcast; -+ union ip_mreq_storage mcastaddr; - u_char mcast_ttl; - - /* -@@ -69,7 +69,7 @@ - }; - - struct client_info { -- struct sockaddr_in client; -+ struct sockaddr_storage client; - int done; /* that client as receive it's file */ - struct client_info *next; - }; -@@ -99,7 +99,7 @@ - void tftpd_clientlist_free(struct thread_data *thread); - int tftpd_clientlist_done(struct thread_data *thread, - struct client_info *client, -- struct sockaddr_in *sock); -+ struct sockaddr_storage *sock); - int tftpd_clientlist_next(struct thread_data *thread, - struct client_info **client); - void tftpd_list_kill_threads(void); ---- atftp-0.7.dfsg.orig/config.sub -+++ atftp-0.7.dfsg/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2004-01-05' -+timestamp='2008-01-16' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,14 +22,15 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+ - # Please send patches to . Submit a context - # diff and a properly formatted ChangeLog entry. - # -@@ -70,8 +72,8 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -83,11 +85,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -99,7 +101,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -118,8 +120,9 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -145,7 +148,7 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; -@@ -170,6 +173,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -186,6 +193,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -230,14 +241,16 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m68000 | m68k | m88k | mcore \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -246,6 +259,7 @@ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -@@ -254,20 +268,24 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -- | strongarm \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; -@@ -278,6 +296,9 @@ - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -297,20 +318,20 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | cydra-* \ -+ | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -319,6 +340,7 @@ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -@@ -326,27 +348,35 @@ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ - | msp430-* \ -- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ -+ | nios-* | nios2-* \ -+ | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-*) - ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown -+ ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) -@@ -363,6 +393,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -414,6 +447,14 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - c90) - basic_machine=c90-cray - os=-unicos -@@ -442,12 +483,27 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -470,6 +526,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -620,6 +680,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -635,6 +703,10 @@ - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -648,10 +720,6 @@ - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -664,6 +732,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -732,10 +803,6 @@ - np1) - basic_machine=np1-gould - ;; -- nv1) -- basic_machine=nv1-cray -- os=-unicosmp -- ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -743,9 +810,8 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff - ;; - os400) - basic_machine=powerpc-ibm -@@ -767,6 +833,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -776,6 +850,12 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -832,6 +912,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -858,6 +942,10 @@ - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; - sei) - basic_machine=mips-sei - os=-seiux -@@ -869,6 +957,9 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; - sh64) - basic_machine=sh64-unknown - ;; -@@ -958,6 +1049,10 @@ - basic_machine=tic6x-unknown - os=-coff - ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -1018,6 +1113,10 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 -+ ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; -@@ -1048,6 +1147,9 @@ - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1064,13 +1166,10 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1143,19 +1242,23 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1173,7 +1276,7 @@ - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) -@@ -1282,6 +1385,9 @@ - -kaos*) - os=-kaos - ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; - -none) - ;; - *) -@@ -1304,6 +1410,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1313,9 +1425,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1341,6 +1453,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1359,9 +1474,15 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1527,7 +1648,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) ---- atftp-0.7.dfsg.orig/stats.c -+++ atftp-0.7.dfsg/stats.c -@@ -157,8 +157,8 @@ - - logger(LOG_INFO, " Load measurements:"); - logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs", -- (double)(s_stats.tms.tms_utime) / CLK_TCK, -- (double)(s_stats.tms.tms_stime) / CLK_TCK); -+ (double)(s_stats.tms.tms_utime) / CLOCKS_PER_SEC, -+ (double)(s_stats.tms.tms_stime) / CLOCKS_PER_SEC); - logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%", - (double)(tmp.tv_sec + tmp.tv_usec * 1e-6), - (double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) / ---- atftp-0.7.dfsg.orig/argz.h -+++ atftp-0.7.dfsg/argz.h -@@ -180,7 +180,7 @@ - #ifdef __USE_EXTERN_INLINES - extern inline char * - __argz_next (__const char *__argz, size_t __argz_len, -- __const char *__entry) __THROW -+ __const char *__entry) - { - if (__entry) - { -@@ -194,7 +194,7 @@ - } - extern inline char * - argz_next (__const char *__argz, size_t __argz_len, -- __const char *__entry) __THROW -+ __const char *__entry) - { - return __argz_next (__argz, __argz_len, __entry); - } ---- atftp-0.7.dfsg.orig/Makefile.am -+++ atftp-0.7.dfsg/Makefile.am -@@ -16,6 +16,7 @@ - DIST_SUBDIRS = $(SUBDIRS) - CLEANFILES = *~ - DISTCLEANFILES = libtool config.status -+AM_CPPFLAGS = -D_GNU_SOURCE - - man_MANS = atftp.1 atftpd.8 - dist_scripts = autogen.sh -@@ -32,7 +33,7 @@ - argz.c tftp_mtftp.c - - sbin_PROGRAMS = atftpd --atftpd_LDADD = $(LIBPTHREAD) $(LIBWRAP) $(LIBPCRE) -+atftpd_LDADD = $(LIBWRAP) $(LIBPTHREAD) $(LIBPCRE) - atftpd_SOURCES = tftpd.c logger.c options.c stats.c tftp_io.c tftp_def.c \ - tftpd_file.c tftpd_list.c tftpd_mcast.c argz.c tftpd_pcre.c \ - tftpd_mtftp.c ---- atftp-0.7.dfsg.orig/Makefile.in -+++ atftp-0.7.dfsg/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.8.2 from Makefile.am. -+# Makefile.in generated by automake 1.8.5 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -68,7 +68,7 @@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = redhat/atftp.spec --am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) -+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) -@@ -230,7 +230,7 @@ - atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \ - argz.c tftp_mtftp.c - --atftpd_LDADD = $(LIBPTHREAD) $(LIBWRAP) $(LIBPCRE) -+atftpd_LDADD = $(LIBWRAP) $(LIBPTHREAD) $(LIBPCRE) - atftpd_SOURCES = tftpd.c logger.c options.c stats.c tftp_io.c tftp_def.c \ - tftpd_file.c tftpd_list.c tftpd_mcast.c argz.c tftpd_pcre.c \ - tftpd_mtftp.c -@@ -294,14 +294,14 @@ - cd $(top_builddir) && $(SHELL) ./config.status $@ - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkdir_p) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -309,22 +309,22 @@ - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkdir_p) $(DESTDIR)$(sbindir) -+ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -332,8 +332,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ -- rm -f $(DESTDIR)$(sbindir)/$$f; \ -+ echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(sbindir)/$$f"; \ - done - - clean-sbinPROGRAMS: -@@ -385,7 +385,7 @@ - uninstall-info-am: - install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) -- $(mkdir_p) $(DESTDIR)$(man1dir) -+ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ -@@ -404,8 +404,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done - uninstall-man1: - @$(NORMAL_UNINSTALL) -@@ -425,12 +425,12 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ -- rm -f $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done - install-man8: $(man8_MANS) $(man_MANS) - @$(NORMAL_INSTALL) -- $(mkdir_p) $(DESTDIR)$(man8dir) -+ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ -@@ -449,8 +449,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ - done - uninstall-man8: - @$(NORMAL_UNINSTALL) -@@ -470,8 +470,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ -- rm -f $(DESTDIR)$(man8dir)/$$inst; \ -+ echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ -+ rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -547,14 +547,16 @@ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -564,9 +566,11 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -678,7 +682,7 @@ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ - *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -@@ -701,7 +705,7 @@ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ -- (cd ../.. && $(mkdir_p) "$$dc_destdir") \ -+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ -@@ -738,7 +742,9 @@ - all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h - installdirs: installdirs-recursive - installdirs-am: -- $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) -+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ -+ test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive ---- atftp-0.7.dfsg.orig/tftpd_mtftp.c -+++ atftp-0.7.dfsg/tftpd_mtftp.c -@@ -74,7 +74,7 @@ - - int line = 0; - struct stat file_stat; -- struct hostent host; -+ struct addrinfo hints, *addrinfo; - - /* open file */ - if ((fp = fopen(filename, "r")) == NULL) -@@ -208,13 +208,15 @@ - continue; - } - /* verify IP is valid */ -- if (Gethostbyname(thread->mcast_ip, &host) == OK) -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; -+ if (!getaddrinfo(thread->mcast_ip, thread->client_port, -+ &hints, &addrinfo) && -+ !sockaddr_set_addrinfo(&thread->sa_mcast, addrinfo)) - { -- thread->sa_mcast.sin_family = host.h_addrtype; -- memcpy(&thread->sa_mcast.sin_addr.s_addr, -- host.h_addr_list[0], host.h_length); -- thread->sa_mcast.sin_port = htons(thread->mcast_port); -- if (!IN_MULTICAST(ntohl(thread->sa_mcast.sin_addr.s_addr))) -+ thread->mcast_port = sockaddr_get_port(&thread->sa_mcast); -+ freeaddrinfo(addrinfo); -+ if (!sockaddr_is_multicast(&thread->sa_mcast)) - { - logger(LOG_WARNING, "mtftp: bad multicast address %s\n", - thread->mcast_ip); -@@ -345,11 +347,9 @@ - struct mtftp_thread *thread; - - int sockfd; -- struct sockaddr_in sa; -+ struct sockaddr_storage sa; - socklen_t len = sizeof(struct sockaddr); --#ifdef HAVE_WRAP -- char client_addr[16]; --#endif -+ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; - int retval; /* hold return value for testing */ - int data_size; /* returned size by recvfrom */ - char filename[MAXLEN]; -@@ -357,14 +357,13 @@ - - logger(LOG_NOTICE, "mtftp main server thread started"); - -- /* initialise sockaddr_in structure */ -+ /* initialise sockaddr_storage structure */ - memset(&sa, 0, sizeof(sa)); -- sa.sin_family = AF_INET; -- sa.sin_addr.s_addr = htonl(INADDR_ANY); -- sa.sin_port = htons(data->server_port); -+ sa.ss_family = AF_INET; /* FIXME */ -+ sockaddr_set_port(&sa, data->server_port); - - /* open the socket */ -- if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) -+ if ((sockfd = socket(sa.ss_family, SOCK_DGRAM, 0)) == 0) - { - logger(LOG_ERR, "mtftp: can't open socket"); - pthread_exit(NULL); -@@ -396,12 +395,11 @@ - #ifdef HAVE_WRAP - /* Verify the client has access. We don't look for the name but - rely only on the IP address for that. */ -- inet_ntop(AF_INET, &sa.sin_addr, -- client_addr, sizeof(client_addr)); -- if (hosts_ctl("in.tftpd", STRING_UNKNOWN, client_addr, -+ sockaddr_print_addr(&sa, addr_str, sizeof(addr_str)); -+ if (hosts_ctl("in.tftpd", STRING_UNKNOWN, addr_str, - STRING_UNKNOWN) == 0) - { -- logger(LOG_ERR, "mtftp: connection refused from %s", client_addr); -+ logger(LOG_ERR, "mtftp: connection refused from %s", addr_str); - continue; - } - #endif -@@ -415,7 +413,8 @@ - if (retval != GET_RRQ) - { - logger(LOG_WARNING, "unsupported request <%d> from %s", -- retval, inet_ntoa(sa.sin_addr)); -+ retval, -+ sockaddr_print_addr(&sa, addr_str, sizeof(addr_str))); - tftp_send_error(sockfd, &sa, EBADOP, data->data_buffer, data->data_buffer_size); - if (data->trace) - logger(LOG_DEBUG, "sent ERROR ", EBADOP, -@@ -425,7 +424,7 @@ - else - { - logger(LOG_NOTICE, "Serving %s to %s:%d", filename, -- inet_ntoa(sa.sin_addr), ntohs(sa.sin_port)); -+ sockaddr_print_addr(&sa, addr_str, sizeof(addr_str))); - if (data->trace) - logger(LOG_DEBUG, "received RRQ <%s>", string); - } -@@ -453,7 +452,7 @@ - continue; - } - /* copy client info for server */ -- memcpy(&thread->sa_in, &sa, sizeof(struct sockaddr_in)); -+ memcpy(&thread->sa_in, &sa, sizeof(struct sockaddr_storage)); - /* open a socket for client communication */ - if ((thread->sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) - { -@@ -462,7 +461,7 @@ - } - getsockname(sockfd, (struct sockaddr *)&(sa), &len); - //memset(&sa, 0, sizeof(sa)); -- sa.sin_port = 0; -+ sockaddr_set_port(&sa, 0); - /* bind the socket to the tftp port */ - if (bind(thread->sockfd, (struct sockaddr*)&sa, sizeof(sa)) < 0) - { -@@ -472,10 +471,13 @@ - getsockname(thread->sockfd, (struct sockaddr *)&(sa), &len); - - /* configure multicast socket */ -- thread->mcastaddr.imr_multiaddr.s_addr = thread->sa_mcast.sin_addr.s_addr; -- thread->mcastaddr.imr_interface.s_addr = htonl(INADDR_ANY); -- setsockopt(thread->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, -- &data->mcast_ttl, sizeof(data->mcast_ttl)); -+ sockaddr_get_mreq(&thread->sa_mcast, &thread->mcastaddr); -+ if (thread->sa_mcast.ss_family == AF_INET) -+ setsockopt(thread->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, -+ &data->mcast_ttl, sizeof(data->mcast_ttl)); -+ else -+ setsockopt(thread->sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, -+ &data->mcast_ttl, sizeof(data->mcast_ttl)); - - /* give server thread access to mtftp options */ - thread->mtftp_data = data; -@@ -511,8 +513,9 @@ - int data_size; - - struct mtftp_thread *data = (struct mtftp_thread *)arg; -- struct sockaddr_in *sa = &data->sa_in; -- struct sockaddr_in from; -+ struct sockaddr_storage *sa = &data->sa_in; -+ struct sockaddr_storage from; -+ char addr_str[SOCKADDR_PRINT_ADDR_LEN]; - int sockfd = data->sockfd; - - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; -@@ -591,7 +594,8 @@ - if (number_of_timeout > NB_OF_RETRY) - { - logger(LOG_INFO, "client (%s) not responding", -- inet_ntoa(data->sa_in.sin_addr)); -+ sockaddr_print_addr(&data->sa_in, addr_str, -+ sizeof(addr_str))); - state = S_END; - break; - } -@@ -599,14 +603,13 @@ - state = timeout_state; - break; - case GET_ACK: -- if (sa->sin_port != from.sin_port) -+ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) - { - logger(LOG_WARNING, "packet discarded"); - break; - } - /* handle case where packet come from un unexpected client */ -- if ((sa->sin_port == from.sin_port) && -- (sa->sin_addr.s_addr == from.sin_addr.s_addr)) -+ if (sockaddr_equal(sa, &from)) - { - /* The ACK is from the exected client */ - number_of_timeout = 0; -@@ -623,14 +626,13 @@ - } - break; - case GET_ERROR: -- if (sa->sin_port != from.sin_port) -+ if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) - { - logger(LOG_WARNING, "packet discarded"); - break; - } - /* handle case where packet come from un unexpected client */ -- if ((sa->sin_port == from.sin_port) && -- (sa->sin_addr.s_addr == from.sin_addr.s_addr)) -+ if (sockaddr_equal(sa, &from)) - { - /* Got an ERROR from the current master client */ - Strncpy(string, tftphdr->th_msg, ---- atftp-0.7.dfsg.orig/tftpd_mtftp.h -+++ atftp-0.7.dfsg/tftpd_mtftp.h -@@ -57,13 +57,13 @@ - FILE *fp; - - int sockfd; -- struct sockaddr_in sa_in; -- struct sockaddr_in sa_client; -+ struct sockaddr_storage sa_in; -+ struct sockaddr_storage sa_client; - - int mcast_sockfd; - int mcast_port; -- struct sockaddr_in sa_mcast; -- struct ip_mreq mcastaddr; -+ struct sockaddr_storage sa_mcast; -+ union ip_mreq_storage mcastaddr; - - char *data_buffer; - int data_buffer_size; ---- atftp-0.7.dfsg.orig/config.h.in -+++ atftp-0.7.dfsg/config.h.in -@@ -138,6 +138,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -@@ -150,18 +153,43 @@ - /* Define to 1 if you can safely include both and . */ - #undef TIME_WITH_SYS_TIME - --/* Version number of package */ --#undef VERSION -- --/* Define to 1 if on AIX 3. -- System headers sometimes define this. -- We just want to avoid a redefinition error message. */ -+/* Enable extensions on AIX 3, Interix. */ - #ifndef _ALL_SOURCE - # undef _ALL_SOURCE - #endif -+/* Enable GNU extensions on systems that have them. */ -+#ifndef _GNU_SOURCE -+# undef _GNU_SOURCE -+#endif -+/* Enable threading extensions on Solaris. */ -+#ifndef _POSIX_PTHREAD_SEMANTICS -+# undef _POSIX_PTHREAD_SEMANTICS -+#endif -+/* Enable extensions on HP NonStop. */ -+#ifndef _TANDEM_SOURCE -+# undef _TANDEM_SOURCE -+#endif -+/* Enable general extensions on Solaris. */ -+#ifndef __EXTENSIONS__ -+# undef __EXTENSIONS__ -+#endif -+ -+ -+/* Version number of package */ -+#undef VERSION -+ -+/* Define to 1 if on MINIX. */ -+#undef _MINIX -+ -+/* Define to 2 if the system does not provide POSIX.1 features except with -+ this defined. */ -+#undef _POSIX_1_SOURCE -+ -+/* Define to 1 if you need to in order for `stat' and other things to work. */ -+#undef _POSIX_SOURCE - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const - --/* Define to `unsigned' if does not define. */ -+/* Define to `unsigned int' if does not define. */ - #undef size_t ---- atftp-0.7.dfsg.orig/tftp_io.c -+++ atftp-0.7.dfsg/tftp_io.c -@@ -42,7 +42,7 @@ - * < OptN | 0 | ValueN | 0 | - * >-------------------------------- - */ --int tftp_send_request(int socket, struct sockaddr_in *sa, short type, -+int tftp_send_request(int socket, struct sockaddr_storage *sa, short type, - char *data_buffer, int data_buffer_size, - struct tftp_opt *tftp_options) - { -@@ -94,7 +94,7 @@ - *| Opcode | Block # | - * ------------------- - */ --int tftp_send_ack(int socket, struct sockaddr_in *sa, short block_number) -+int tftp_send_ack(int socket, struct sockaddr_storage *sa, short block_number) - { - struct tftphdr tftphdr; - int result; -@@ -115,7 +115,7 @@ - *| Opcode | Opt1 | 0 | Value1 | 0 | OptN | 0 | ValueN | 0 | - * --------------------------------------------------------------------------- - */ --int tftp_send_oack(int socket, struct sockaddr_in *sa, struct tftp_opt *tftp_options, -+int tftp_send_oack(int socket, struct sockaddr_storage *sa, struct tftp_opt *tftp_options, - char *buffer, int buffer_size) - { - -@@ -154,7 +154,7 @@ - *| Opcode | ErrorCode | ErrMsg | 0 | - * --------------------------------------- - */ --int tftp_send_error(int socket, struct sockaddr_in *sa, short err_code, -+int tftp_send_error(int socket, struct sockaddr_storage *sa, short err_code, - char *buffer, int buffer_size) - { - int size; -@@ -182,7 +182,7 @@ - *| Opcode | Block # | Data | - * ---------------------------- - */ --int tftp_send_data(int socket, struct sockaddr_in *sa, short block_number, -+int tftp_send_data(int socket, struct sockaddr_storage *sa, short block_number, - int size, char *data) - { - struct tftphdr *tftphdr = (struct tftphdr *)data; -@@ -202,19 +202,20 @@ - * Wait for a packet. This function can listen on 2 sockets. This is - * needed by the multicast tftp client. - */ --int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_in *sa, -- struct sockaddr_in *sa_from, struct sockaddr_in *sa_to, -+int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_storage *sa, -+ struct sockaddr_storage *sa_from, struct sockaddr_storage *sa_to, - int timeout, int *size, char *data) - { - int result; - struct timeval tv; - fd_set rfds; -- struct sockaddr_in from; -+ struct sockaddr_storage from; - struct tftphdr *tftphdr = (struct tftphdr *)data; - - struct msghdr msg; /* used to get client's packet info */ - struct cmsghdr *cmsg; -- struct in_pktinfo *pktinfo; -+ struct in_pktinfo *pktinfo4; -+ struct in6_pktinfo *pktinfo6; - struct iovec iov; - char cbuf[1024]; - -@@ -284,12 +285,26 @@ - cmsg != NULL && cmsg->cmsg_len >= sizeof(*cmsg); - cmsg = CMSG_NXTHDR(&msg, cmsg)) - { -+#if defined(SOL_IP) && defined(IP_PKTINFO) - if (cmsg->cmsg_level == SOL_IP - && cmsg->cmsg_type == IP_PKTINFO) - { -- pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg); -- sa_to->sin_addr = pktinfo->ipi_addr; -+ pktinfo4 = (struct in_pktinfo *)CMSG_DATA(cmsg); -+ sa_to->ss_family = AF_INET; -+ ((struct sockaddr_in *)sa_to)->sin_addr = -+ pktinfo4->ipi_addr; - } -+#endif -+#if defined(SOL_IPV6) && defined(IPV6_PKTINFO) -+ if (cmsg->cmsg_level == SOL_IPV6 -+ && cmsg->cmsg_type == IPV6_PKTINFO) -+ { -+ pktinfo6 = (struct in6_pktinfo *)CMSG_DATA(cmsg); -+ sa_to->ss_family = AF_INET6; -+ ((struct sockaddr_in6 *)sa_to)->sin6_addr = -+ pktinfo6->ipi6_addr; -+ } -+#endif - break; - } - } -@@ -301,8 +316,8 @@ - if (sa_from != NULL) - memcpy(sa_from, &from, sizeof(from)); - -- /* if sa as never been initialised, sa->sin_port is still 0 */ -- if (sa->sin_port == htons(0)) -+ /* if sa as never been initialised, port is still 0 */ -+ if (sockaddr_get_port(&sa) == 0) - memcpy(sa, &from, sizeof(from)); - - -@@ -428,8 +443,10 @@ - if (!convert) - { - /* Simple case, just seek and write */ -- fseek(fp, (block_number - 1) * data_buffer_size, SEEK_SET); -- data_size = fwrite(data_buffer, 1, data_size, fp); -+ if (fseek(fp, (block_number - 1) * data_buffer_size, SEEK_SET) == 0) -+ data_size = fwrite(data_buffer, 1, data_size, fp); -+ else -+ data_size = 0; - return data_size; - } - else ---- atftp-0.7.dfsg.orig/tftp_io.h -+++ atftp-0.7.dfsg/tftp_io.h -@@ -39,18 +39,18 @@ - #define GET_DATA 7 - - /* functions prototype */ --int tftp_send_request(int socket, struct sockaddr_in *s_inn, short type, -+int tftp_send_request(int socket, struct sockaddr_storage *s_inn, short type, - char *data_buffer, int data_buffer_size, - struct tftp_opt *tftp_options); --int tftp_send_ack(int socket, struct sockaddr_in *s_inn, short block_number); --int tftp_send_oack(int socket, struct sockaddr_in *s_inn, struct tftp_opt *tftp_options, -+int tftp_send_ack(int socket, struct sockaddr_storage *s_inn, short block_number); -+int tftp_send_oack(int socket, struct sockaddr_storage *s_inn, struct tftp_opt *tftp_options, - char *buffer, int buffer_size); --int tftp_send_error(int socket, struct sockaddr_in *s_inn, short err_code, -+int tftp_send_error(int socket, struct sockaddr_storage *s_inn, short err_code, - char *buffer, int buffer_size); --int tftp_send_data(int socket, struct sockaddr_in *s_inn, short block_number, -+int tftp_send_data(int socket, struct sockaddr_storage *s_inn, short block_number, - int size, char *data); --int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_in *sa, -- struct sockaddr_in *from, struct sockaddr_in *to, -+int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_storage *sa, -+ struct sockaddr_storage *from, struct sockaddr_storage *to, - int timeout, int *size, char *data); - int tftp_file_read(FILE *fp, char *buffer, int buffer_size, int block_number, int convert, - int *prev_block_number, int *prev_file_pos, int *temp); ---- atftp-0.7.dfsg.orig/tftp_def.c -+++ atftp-0.7.dfsg/tftp_def.c -@@ -16,10 +16,12 @@ - - #include "config.h" - -+#include - #include - #include - #include - #include -+#include - #include "tftp_def.h" - #include "options.h" - #include "logger.h" -@@ -140,8 +142,10 @@ - */ - inline char *Strncpy(char *to, const char *from, size_t size) - { -- to[size-1] = '\000'; -- return strncpy(to, from, size - 1); -+ strncpy(to, from, size); -+ if (size>0) -+ to[size-1] = '\000'; -+ return to; - } - - -@@ -182,3 +186,135 @@ - - return OK; - } -+ -+char * -+sockaddr_print_addr(const struct sockaddr_storage *ss, char *buf, size_t len) -+{ -+ const void *addr; -+ if (ss->ss_family == AF_INET) -+ addr = &((const struct sockaddr_in *)ss)->sin_addr; -+ else if (ss->ss_family == AF_INET6) -+ addr = &((const struct sockaddr_in6 *)ss)->sin6_addr; -+ else -+ assert(!"sockaddr_print: unsupported address family"); -+ return (char *)inet_ntop(ss->ss_family, addr, buf, len); -+} -+ -+uint16_t sockaddr_get_port(const struct sockaddr_storage *ss) -+{ -+ if (ss->ss_family == AF_INET) -+ return ntohs(((const struct sockaddr_in *)ss)->sin_port); -+ if (ss->ss_family == AF_INET6) -+ return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port); -+ return 0; -+} -+ -+void sockaddr_set_port(struct sockaddr_storage *ss, uint16_t port) -+{ -+ if (ss->ss_family == AF_INET) -+ ((struct sockaddr_in *)ss)->sin_port = htons(port); -+ else if (ss->ss_family == AF_INET6) -+ ((struct sockaddr_in6 *)ss)->sin6_port = htons(port); -+ else -+ assert(!"sockaddr_set_port: unsupported address family"); -+} -+ -+int sockaddr_equal(const struct sockaddr_storage *left, -+ const struct sockaddr_storage *right) -+{ -+ if (left->ss_family != right->ss_family) -+ return 0; -+ if (left->ss_family == AF_INET) -+ { -+ const struct sockaddr_in -+ *sa_left = (const struct sockaddr_in *)left, -+ *sa_right = (const struct sockaddr_in *)right; -+ return (sa_left->sin_port == sa_right->sin_port && -+ sa_left->sin_addr.s_addr == sa_right->sin_addr.s_addr); -+ } -+ if (left->ss_family == AF_INET6) -+ { -+ const struct sockaddr_in6 -+ *sa_left = (const struct sockaddr_in6 *)left, -+ *sa_right = (const struct sockaddr_in6 *)right; -+ return (sa_left->sin6_port == sa_right->sin6_port && -+ memcmp(&sa_left->sin6_addr, &sa_right->sin6_addr, -+ sizeof(sa_left->sin6_addr)) == 0 && -+ sa_left->sin6_scope_id == sa_right->sin6_scope_id); -+ } -+ assert(!"sockaddr_equal: unsupported address family"); -+} -+ -+int sockaddr_equal_addr(const struct sockaddr_storage *left, -+ const struct sockaddr_storage *right) -+{ -+ if (left->ss_family != right->ss_family) -+ return 0; -+ if (left->ss_family == AF_INET) -+ { -+ const struct sockaddr_in -+ *sa_left = (const struct sockaddr_in *)left, -+ *sa_right = (const struct sockaddr_in *)right; -+ return sa_left->sin_addr.s_addr == sa_right->sin_addr.s_addr; -+ } -+ if (left->ss_family == AF_INET6) -+ { -+ const struct sockaddr_in6 -+ *sa_left = (const struct sockaddr_in6 *)left, -+ *sa_right = (const struct sockaddr_in6 *)right; -+ return (memcmp(&sa_left->sin6_addr, &sa_right->sin6_addr, -+ sizeof(sa_left->sin6_addr)) == 0 && -+ sa_left->sin6_scope_id == sa_right->sin6_scope_id); -+ } -+ assert(!"sockaddr_equal_addr: unsupported address family"); -+} -+ -+int sockaddr_is_multicast(const struct sockaddr_storage *ss) -+{ -+ if (ss->ss_family == AF_INET) -+ return IN_MULTICAST(ntohl(((const struct sockaddr_in *)ss) -+ ->sin_addr.s_addr)); -+ if (ss->ss_family == AF_INET6) -+ return IN6_IS_ADDR_MULTICAST(&((const struct sockaddr_in6 *)ss) -+ ->sin6_addr); -+ return 0; -+} -+ -+void sockaddr_get_mreq(const struct sockaddr_storage *ss, -+ union ip_mreq_storage *mreq) -+{ -+ if (ss->ss_family == AF_INET) -+ { -+ const struct sockaddr_in *sa = (const struct sockaddr_in *)ss; -+ mreq->v4.imr_multiaddr = sa->sin_addr; -+ mreq->v4.imr_interface.s_addr = htonl(INADDR_ANY); -+ } -+ else if (ss->ss_family == AF_INET6) -+ { -+ const struct sockaddr_in6 *sa = (const struct sockaddr_in6 *)ss; -+ mreq->v6.ipv6mr_multiaddr = sa->sin6_addr; -+ mreq->v6.ipv6mr_interface = 0; /* ??? */ -+ } -+ else -+ { -+ assert(!"sockaddr_get_mreq: unsupported address family"); -+ } -+} -+ -+int -+sockaddr_set_addrinfo(struct sockaddr_storage *ss, const struct addrinfo *ai) -+{ -+ while (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) -+ { -+ ai = ai->ai_next; -+ if (!ai) -+ { -+ errno = EAFNOSUPPORT; -+ return -1; -+ } -+ } -+ -+ assert(sizeof(*ss) >= ai->ai_addrlen); -+ memcpy(ss, ai->ai_addr, ai->ai_addrlen); -+ return 0; -+} ---- atftp-0.7.dfsg.orig/tftp_def.h -+++ atftp-0.7.dfsg/tftp_def.h -@@ -40,7 +40,7 @@ - #define OPT_TIMEOUT 3 - #define OPT_BLKSIZE 4 - #define OPT_MULTICAST 5 --#define OPT_NUMBER 7 -+#define OPT_NUMBER 6 - - #define OPT_SIZE 12 - #define VAL_SIZE MAXLEN -@@ -52,4 +52,25 @@ - inline char *Strncpy(char *to, const char *from, size_t size); - int Gethostbyname(char *addr, struct hostent *host); - -+char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t); -+#define SOCKADDR_PRINT_ADDR_LEN INET6_ADDRSTRLEN -+uint16_t sockaddr_get_port(const struct sockaddr_storage *); -+void sockaddr_set_port(struct sockaddr_storage *, uint16_t); -+int sockaddr_equal(const struct sockaddr_storage *, -+ const struct sockaddr_storage *); -+int sockaddr_equal_addr(const struct sockaddr_storage *, -+ const struct sockaddr_storage *); -+int sockaddr_is_multicast(const struct sockaddr_storage *); -+ -+union ip_mreq_storage -+{ -+ struct ip_mreq v4; -+ struct ipv6_mreq v6; -+}; -+void -+sockaddr_get_mreq(const struct sockaddr_storage *, union ip_mreq_storage *); -+ -+int -+sockaddr_set_addrinfo(struct sockaddr_storage *ss, const struct addrinfo *ai); -+ - #endif ---- atftp-0.7.dfsg.orig/tftp.c -+++ atftp-0.7.dfsg/tftp.c -@@ -354,7 +354,7 @@ - void make_arg(char *string, int *argc, char ***argv) - { - static char *tmp = NULL; -- int argz_len; -+ size_t argz_len; - - /* split the string to an argz vector */ - if (argz_create_sep(string, ' ', &tmp, &argz_len) != 0) -@@ -408,8 +408,8 @@ - */ - int set_peer(int argc, char **argv) - { -- struct hostent *host; /* for host name lookup */ -- struct servent *sp; /* server entry for tftp service */ -+ struct addrinfo hints, *addrinfo; -+ int err; - - /* sanity check */ - if ((argc < 2) || (argc > 3)) -@@ -418,47 +418,40 @@ - return ERR; - } - -- /* get the server entry */ -- sp = getservbyname("tftp", "udp"); -- if (sp == 0) { -- fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); -- return ERR; -- } -- -- /* look up the host */ -- host = gethostbyname(argv[1]); -+ /* look up the service and host */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; -+ hints.ai_flags = AI_CANONNAME; -+ err = getaddrinfo(argv[1], argc == 3 ? argv[2] : "tftp", -+ &hints, &addrinfo); - /* if valid, update s_inn structure */ -- if (host) -+ if (err == 0) -+ err = sockaddr_set_addrinfo(&data.sa_peer, addrinfo); -+ if (err == 0) - { -- data.sa_peer.sin_family = host->h_addrtype; -- if (host->h_length > sizeof(data.sa_peer.sin_addr)) -- host->h_length = sizeof(data.sa_peer.sin_addr); -- memcpy(&data.sa_peer.sin_addr, host->h_addr, host->h_length); -- Strncpy(data.hostname, host->h_name, -+ Strncpy(data.hostname, addrinfo->ai_canonname, - sizeof(data.hostname)); - data.hostname[sizeof(data.hostname)-1] = 0; -- data.sa_peer.sin_port = sp->s_port; -+ freeaddrinfo(addrinfo); - } - else - { -- fprintf(stderr, "tftp: unknown host %s.\n", argv[1]); -- data.connected = 0; -- return ERR; -- } -- /* get the server port */ -- if (argc == 3) -- { -- sp->s_port = htons(atoi(argv[2])); -- if (sp->s_port < 0) -+ if (err == EAI_SERVICE) - { -- fprintf(stderr, "%s: bad port number.\n", argv[2]); -- data.connected = 0; -- return ERR; -+ if (argc == 3) -+ fprintf(stderr, "%s: bad port number.\n", argv[2]); -+ else -+ fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); -+ } -+ else -+ { -+ fprintf(stderr, "tftp: unknown host %s.\n", argv[1]); - } -- data.sa_peer.sin_port = sp->s_port; -+ data.connected = 0; -+ return ERR; - } - /* copy port number to data structure */ -- data.port = ntohs(sp->s_port); -+ data.port = sockaddr_get_port(&data.sa_peer); - - data.connected = 1; - return OK; -@@ -602,7 +595,7 @@ - } - - /* open a UDP socket */ -- data.sockfd = socket(AF_INET, SOCK_DGRAM, 0); -+ data.sockfd = socket(data.sa_peer.ss_family, SOCK_DGRAM, 0); - if (data.sockfd < 0) { - perror("tftp: "); - exit(ERR); -@@ -621,7 +614,7 @@ - fsync(data.sockfd); - close(data.sockfd); - -- return OK; -+ return tftp_result; - } - - /* -@@ -706,7 +699,7 @@ - } - - /* open a UDP socket */ -- data.sockfd = socket(AF_INET, SOCK_DGRAM, 0); -+ data.sockfd = socket(data.sa_peer.ss_family, SOCK_DGRAM, 0); - if (data.sockfd < 0) { - perror("tftp: "); - exit(ERR); -@@ -731,7 +724,7 @@ - fsync(data.sockfd); - close(data.sockfd); - -- return OK; -+ return tftp_result; - } - - #ifdef HAVE_MTFTP ---- atftp-0.7.dfsg.orig/tftp.h -+++ atftp-0.7.dfsg/tftp.h -@@ -39,8 +39,8 @@ - char hostname[MAXLEN]; /* peer's hostname */ - short port; /* tftp port for the server, 69 by default */ - -- struct sockaddr_in sa_peer; /* peer address and port */ -- struct sockaddr_in sa_local; /* local address and port */ -+ struct sockaddr_storage sa_peer; /* peer address and port */ -+ struct sockaddr_storage sa_local; /* local address and port */ - int sockfd; - - int connected; /* we are 'connected' */ ---- atftp-0.7.dfsg.orig/logger.c -+++ atftp-0.7.dfsg/logger.c -@@ -56,7 +56,15 @@ - log_ident = "unset"; - - if (filename) -+ { - log_filename = strdup(filename); -+ if (!strcmp(filename, "-")) -+ { -+ log_fd = STDOUT_FILENO; -+ log_fp = fdopen(log_fd, "a"); -+ return; -+ } -+ } - else - { - openlog(log_ident, LOG_PID, LOG_DAEMON); ---- atftp-0.7.dfsg.orig/tftp_file.c -+++ atftp-0.7.dfsg/tftp_file.c -@@ -59,7 +59,7 @@ - unsigned int next_word; - - /* initial stuff */ -- next_hole = prev_hole + 1; -+ next_hole = 0; /*prev_hole + 1;*/ - next_word_no = next_hole / 32; - next_bit_no = next_hole % 32; - next_word = bitmap[next_word_no]; -@@ -117,8 +117,9 @@ - int last_block_number = -1;/* block number of last block for multicast */ - int data_size; /* size of data received */ - int sockfd = data->sockfd; /* just to simplify calls */ -- struct sockaddr_in sa; /* a copy of data.sa_peer */ -- struct sockaddr_in from; -+ struct sockaddr_storage sa; /* a copy of data.sa_peer */ -+ struct sockaddr_storage from; -+ char from_str[SOCKADDR_PRINT_ADDR_LEN]; - int connected; /* 1 when sockfd is connected */ - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp = NULL; /* the local file pointer */ -@@ -129,11 +130,11 @@ - int multicast = 0; /* set to 1 if multicast */ - int mc_port; /* multicast port */ - char mc_addr[IPADDRLEN]; /* multicast address */ -- struct in_addr mcast_addr; - int mcast_sockfd = 0; -- struct sockaddr_in sa_mcast; -- struct ip_mreq mreq; -- struct hostent *host; -+ struct addrinfo hints, *addrinfo; -+ struct sockaddr_storage sa_mcast_group; -+ struct sockaddr_storage sa_mcast; -+ union ip_mreq_storage mreq; - int master_client = 0; - unsigned int file_bitmap[NB_BLOCK]; - int prev_bitmap_hole = -1; /* the previous hole found in the bitmap */ -@@ -141,16 +142,17 @@ - - int prev_block_number = 0; /* needed to support netascii convertion */ - int temp = 0; -+ int err; - - data->file_size = 0; - tftp_cancel = 0; -- from.sin_addr.s_addr = 0; - -- memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); -+ memset(&from, 0, sizeof(from)); -+ memset(&sa_mcast_group, 0, sizeof(sa_mcast_group)); - memset(&file_bitmap, 0, sizeof(file_bitmap)); - - /* make sure the socket is not connected */ -- sa.sin_family = AF_UNSPEC; -+ sa.ss_family = AF_UNSPEC; - connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 0; - -@@ -190,7 +192,7 @@ - #endif - if (tftp_cancel) - { -- if (from.sin_addr.s_addr == 0) -+ if (from.ss_family == 0) - state = S_ABORT; - else - { -@@ -217,7 +219,7 @@ - string); - } - -- sa.sin_port = data->sa_peer.sin_port; -+ sockaddr_set_port(&sa, sockaddr_get_port(&data->sa_peer)); - /* send request packet */ - if (tftp_send_request(sockfd, &sa, RRQ, data->data_buffer, - data->data_buffer_size, -@@ -225,7 +227,7 @@ - state = S_ABORT; - else - state = S_WAIT_PACKET; -- sa.sin_port = 0; /* must be set to 0 before the fist call to -+ sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to - tftp_get_packet, but is was set before the - call to tftp_send_request */ - break; -@@ -256,8 +258,7 @@ - data->data_buffer); - /* RFC2090 state we should verify source address as well - as source port */ -- if ((sa.sin_addr.s_addr != from.sin_addr.s_addr) || -- (sa.sin_port != from.sin_port)) -+ if (!sockaddr_equal(&sa, &from)) - { - result = GET_DISCARD; - fprintf(stderr, "source address or port mismatch\n"); -@@ -269,7 +270,7 @@ - data->timeout, &data_size, - data->data_buffer); - /* Check that source port match */ -- if ((sa.sin_port != from.sin_port) && -+ if ((sockaddr_get_port(&sa) != sockaddr_get_port(&from)) && - ((result == GET_OACK) || (result == GET_ERROR) || - (result == GET_DATA))) - { -@@ -324,7 +325,8 @@ - lock up when doing multicast transfer and routing is broken */ - number_of_timeout++; - fprintf(stderr, "tftp: packet discard <%s:%d>.\n", -- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); -+ sockaddr_print_addr(&from, from_str, sizeof(from_str)), -+ sockaddr_get_port(&from)); - if (number_of_timeout > NB_OF_RETRY) - state = S_ABORT; - break; -@@ -457,19 +459,20 @@ - fprintf(stderr, "multicast: %s,%d,%d, ", mc_addr, - mc_port, master_client); - /* look up the host */ -- host = gethostbyname(mc_addr); - /* if valid, update s_inn structure */ -- if (host) -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; -+ if (!getaddrinfo(mc_addr, NULL, &hints, &addrinfo) && -+ !sockaddr_set_addrinfo(&sa_mcast_group, addrinfo)) - { -- memcpy(&mcast_addr, host->h_addr_list[0], -- host->h_length); -- if (!IN_MULTICAST(ntohl(mcast_addr.s_addr))) -+ if (!sockaddr_is_multicast(&sa_mcast_group)) - { - fprintf(stderr, - "atftp: bad multicast address %s\n", - mc_addr); - exit(1); - } -+ freeaddrinfo(addrinfo); - } - else - { -@@ -478,12 +481,13 @@ - exit(1); - } - /* we need to open a new socket for multicast */ -- if ((mcast_sockfd = socket(AF_INET, SOCK_DGRAM, 0))<0) -+ if ((mcast_sockfd = socket(sa_mcast_group.ss_family, -+ SOCK_DGRAM, 0))<0) - exit(1); - -- sa_mcast.sin_family = AF_INET; -- sa_mcast.sin_addr.s_addr = htonl(INADDR_ANY); -- sa_mcast.sin_port = htons(mc_port); -+ memset(&sa_mcast, 0, sizeof(sa_mcast)); -+ sa_mcast.ss_family = sa_mcast_group.ss_family; -+ sockaddr_set_port(&sa_mcast, mc_port); - - if (bind(mcast_sockfd, (struct sockaddr *)&sa_mcast, - sizeof(sa_mcast)) < 0) -@@ -492,12 +496,16 @@ - exit(1); - } - -- mreq.imr_multiaddr.s_addr = mcast_addr.s_addr; -- mreq.imr_interface.s_addr = htonl(INADDR_ANY); -- -- if (setsockopt(mcast_sockfd, IPPROTO_IP, -- IP_ADD_MEMBERSHIP, -- &mreq, sizeof(mreq)) < 0) -+ sockaddr_get_mreq(&sa_mcast_group, &mreq); -+ if (sa_mcast_group.ss_family == AF_INET) -+ err = setsockopt(mcast_sockfd, IPPROTO_IP, -+ IP_ADD_MEMBERSHIP, -+ &mreq.v4, sizeof(mreq.v4)); -+ else -+ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, -+ IPV6_ADD_MEMBERSHIP, -+ &mreq.v6, sizeof(mreq.v6)); -+ if (err < 0) - { - perror("setsockopt"); - exit(1); -@@ -532,7 +540,7 @@ - data->local_file); - tftp_send_error(sockfd, &sa, ENOSPACE, data->data_buffer, - data->data_buffer_size); -- state = S_END; -+ state = S_ABORT; - break; - } - data->file_size += data_size; -@@ -563,9 +571,15 @@ - /* drop multicast membership */ - if (multicast) - { -- if (setsockopt(mcast_sockfd, IPPROTO_IP, -- IP_DROP_MEMBERSHIP, -- &mreq, sizeof(mreq)) < 0) -+ if (sa_mcast_group.ss_family == AF_INET) -+ err = setsockopt(mcast_sockfd, IPPROTO_IP, -+ IP_DROP_MEMBERSHIP, -+ &mreq.v4, sizeof(mreq.v4)); -+ else -+ err = setsockopt(mcast_sockfd, IPPROTO_IPV6, -+ IPV6_DROP_MEMBERSHIP, -+ &mreq.v6, sizeof(mreq.v6)); -+ if (err < 0) - { - perror("setsockopt"); - exit(1); -@@ -608,8 +622,9 @@ - int last_block = -1; - int data_size; /* size of data received */ - int sockfd = data->sockfd; /* just to simplify calls */ -- struct sockaddr_in sa; /* a copy of data.sa_peer */ -- struct sockaddr_in from; -+ struct sockaddr_storage sa; /* a copy of data.sa_peer */ -+ struct sockaddr_storage from; -+ char from_str[SOCKADDR_PRINT_ADDR_LEN]; - int connected; /* 1 when sockfd is connected */ - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp; /* the local file pointer */ -@@ -624,10 +639,10 @@ - - data->file_size = 0; - tftp_cancel = 0; -- from.sin_addr.s_addr = 0; -+ memset(&from, 0, sizeof(from)); - - /* make sure the socket is not connected */ -- sa.sin_family = AF_UNSPEC; -+ sa.ss_family = AF_UNSPEC; - connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 0; - -@@ -674,7 +689,7 @@ - if (tftp_cancel) - { - /* Make sure we know the peer's address */ -- if (from.sin_addr.s_addr == 0) -+ if (from.ss_family == 0) - state = S_ABORT; - else - { -@@ -701,7 +716,7 @@ - string); - } - -- sa.sin_port = data->sa_peer.sin_port; -+ sockaddr_set_port(&sa, sockaddr_get_port(&data->sa_peer)); - /* send request packet */ - if (tftp_send_request(sockfd, &sa, WRQ, data->data_buffer, - data->data_buffer_size, -@@ -709,7 +724,7 @@ - state = S_ABORT; - else - state = S_WAIT_PACKET; -- sa.sin_port = 0; /* must be set to 0 before the fist call to -+ sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to - tftp_get_packet, but is was set before the - call to tftp_send_request */ - break; -@@ -736,7 +751,7 @@ - data->timeout, &data_size, - data->data_buffer); - /* check that source port match */ -- if (sa.sin_port != from.sin_port) -+ if (sockaddr_get_port(&sa) != sockaddr_get_port(&from)) - { - if ((data->checkport) && - ((result == GET_ACK) || (result == GET_OACK) || -@@ -796,7 +811,8 @@ - if routing is broken */ - number_of_timeout++; - fprintf(stderr, "tftp: packet discard <%s:%d>.\n", -- inet_ntoa(from.sin_addr), ntohs(from.sin_port)); -+ sockaddr_print_addr(&from, from_str, sizeof(from_str)), -+ sockaddr_get_port(&from)); - if (number_of_timeout > NB_OF_RETRY) - state = S_ABORT; - break; ---- atftp-0.7.dfsg.orig/atftpd.8 -+++ atftp-0.7.dfsg/atftpd.8 -@@ -84,8 +84,9 @@ - used to run the server) must have permissions on the given - file. Assuming the file is /var/log/atftpd.log, simply run: "touch - /var/log/atftpd.log" and then "chown nobody.nogroup --/var/log/atftpd.log". When the server is ran in daemon mode, --/dev/stdout or /dev/stderr can be used. -+/var/log/atftpd.log". When the server is run in daemon mode, -+/dev/stdout or /dev/stderr can be used. Specifying a single dash as -+the filename will send logs to stdout (file descriptor 1). - - .TP - .B \-\-pidfile ---- atftp-0.7.dfsg.orig/test/Makefile.in -+++ atftp-0.7.dfsg/test/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.8.2 from Makefile.am. -+# Makefile.in generated by automake 1.8.5 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -227,20 +227,20 @@ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ -- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ -- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ -- test -n "$$skipped" && echo "$$skipped"; \ -- test -n "$$report" && echo "$$report"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index db62c668238..2136762e6e0 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -29,7 +29,12 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - patches = [./debian.patch]; + debianPatch = a.fetchurl { + url = http://patch-tracker.debian.org/patch/nondebian/dl/atftp/0.7.dfsg-10; + sha256 = "0vannjp0wxvk10xxlr3hirgf0g57n9dr4vhmsyfd8x4cwgxwfgsa"; + }; + + patches = [debianPatch]; meta = { description = "Advanced tftp tools"; From 41f39c4a2276fa77ffa7d8b9288d0e52ee17fadf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Aug 2011 13:39:25 +0000 Subject: [PATCH 061/504] * qemu-kvm updated to 0.15.0. svn path=/nixpkgs/trunk/; revision=28876 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index dad02a9e699..745d6900e90 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses }: +, libjpeg, libpng, ncurses, python, glib }: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "qemu-kvm-0.14.1"; + name = "qemu-kvm-0.15.0"; src = fetchurl { url = "mirror://sourceforge/kvm/${name}.tar.gz"; - sha256 = "09yshk2qzlb37hyp8iygyyf2if2d7r21b7rgkl0jyvv4p1m4z755"; + sha256 = "0y247bc2cyawliaiyk8k41kl3mcjvh52b9bgzvxv0h55zwdpg3l2"; }; patches = [ ./smb-tmpdir.patch ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng - ncurses + ncurses python glib ]; preBuild = From e309c50e7e0027ca642b2c8dadfd42f462fd8d2e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Aug 2011 18:55:37 +0000 Subject: [PATCH 062/504] Get libdrm to compile on darwin The added patch uses mach_absolute_time() to get a nanosecond-resolution monotonic clock on darwin systems (See http://developer.apple.com/library/mac/#qa/qa1398/_index.html for an understanding of the added code). In addition, the patch changes one use of clock_gettime to gettimeofday since only resolution of a second is needed at that point. This code compiles on darwin, but the resulting library is not yet tested. svn path=/nixpkgs/trunk/; revision=28879 --- pkgs/development/libraries/libdrm/default.nix | 9 +- .../libraries/libdrm/libdrm-apple.patch | 88 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/libdrm/libdrm-apple.patch diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ad6f4536604..d37b7dd0b7f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, pkgconfig, libpthreadstubs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libdrm-2.4.24"; src = fetchurl { @@ -10,16 +10,19 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpthreadstubs ]; + patches = [ ./libdrm-apple.patch ]; + preConfigure = '' # General case: non intel. if test -n "$crossConfig"; then configureFlags="$configureFlags --disable-intel"; fi - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin + "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; meta = { homepage = http://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; }; -} +} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; })) diff --git a/pkgs/development/libraries/libdrm/libdrm-apple.patch b/pkgs/development/libraries/libdrm/libdrm-apple.patch new file mode 100644 index 00000000000..e9fd63c5fae --- /dev/null +++ b/pkgs/development/libraries/libdrm/libdrm-apple.patch @@ -0,0 +1,88 @@ +diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel_bufmgr_gem.c +--- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c 2011-04-01 10:30:51.000000000 -0400 ++++ libdrm-2.4.26/intel/intel_bufmgr_gem.c 2011-08-29 02:17:20.000000000 -0400 +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + + #include "errno.h" + #include "libdrm_lists.h" +@@ -987,9 +988,9 @@ + if (atomic_dec_and_test(&bo_gem->refcount)) { + drm_intel_bufmgr_gem *bufmgr_gem = + (drm_intel_bufmgr_gem *) bo->bufmgr; +- struct timespec time; ++ struct timeval time; + +- clock_gettime(CLOCK_MONOTONIC, &time); ++ gettimeofday(&time, NULL); + + pthread_mutex_lock(&bufmgr_gem->lock); + drm_intel_gem_bo_unreference_final(bo, time.tv_sec); +diff -Naur libdrm-2.4.26-orig/xf86drm.c libdrm-2.4.26/xf86drm.c +--- libdrm-2.4.26-orig/xf86drm.c 2011-03-21 09:39:24.000000000 -0400 ++++ libdrm-2.4.26/xf86drm.c 2011-08-29 02:17:49.000000000 -0400 +@@ -51,6 +51,9 @@ + #include + #include + #include ++#if defined(__APPLE__) && defined(__MACH__) ++#include ++#endif + + /* Not all systems have MAP_FAILED defined */ + #ifndef MAP_FAILED +@@ -1941,20 +1944,43 @@ + */ + int drmWaitVBlank(int fd, drmVBlankPtr vbl) + { ++#if defined(__APPLE__) && defined(__MACH__) ++ uint64_t start, end, elapsed, elapsedNano; ++ static const uint64_t maxElapsed = 2000000000; ++ static mach_timebase_info_data_t timebaseInfo; ++ if ( timebaseInfo.denom == 0 ) { ++ (void) mach_timebase_info(&timebaseInfo); ++ } ++#else + struct timespec timeout, cur; ++#endif + int ret; + ++#if defined(__APPLE__) && defined(__MACH__) ++ start = mach_absolute_time(); ++#else + ret = clock_gettime(CLOCK_MONOTONIC, &timeout); + if (ret < 0) { + fprintf(stderr, "clock_gettime failed: %s\n", strerror(ret)); + goto out; + } + timeout.tv_sec++; ++#endif + + do { + ret = ioctl(fd, DRM_IOCTL_WAIT_VBLANK, vbl); + vbl->request.type &= ~DRM_VBLANK_RELATIVE; + if (ret && errno == EINTR) { ++#if defined(__APPLE__) && defined(__MACH__) ++ end = mach_absolute_time(); ++ elapsed = end - start; ++ elapsedNano = elapsed * timebaseInfo.numer / timebaseInfo.denom; ++ if (elapsedNano > maxElapsed) { ++ errno = EBUSY; ++ ret = -1; ++ break; ++ } ++#else + clock_gettime(CLOCK_MONOTONIC, &cur); + /* Timeout after 1s */ + if (cur.tv_sec > timeout.tv_sec + 1 || +@@ -1964,6 +1990,7 @@ + ret = -1; + break; + } ++#endif + } + } while (ret && errno == EINTR); + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b752308bd6..06c94958369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3724,10 +3724,10 @@ let libdmtx = callPackage ../development/libraries/libdmtx { }; - libdrm = if stdenv.isDarwin then null else (callPackage ../development/libraries/libdrm { + libdrm = callPackage ../development/libraries/libdrm { inherit fetchurl stdenv pkgconfig; inherit (xorg) libpthreadstubs; - }); + }; libdv = callPackage ../development/libraries/libdv { }; From 7e2dcdc5eeb431df461646c7d01a88fa4d56bcb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 18:57:35 +0000 Subject: [PATCH 063/504] pkgs/top-level/all-packages.nix: fixed Darwin build of haskellPackages_ghc704_{,no_}profiling svn path=/nixpkgs/trunk/; revision=28880 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06c94958369..dbece92618a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2141,13 +2141,15 @@ let haskellPackages_ghc704_no_profiling = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix - ghc6101Binary (x : x.ghc704Prefs) true false + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) true false (haskellDefaultVersionPrioFun false)); haskellPackages_ghc704_profiling = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix - ghc6101Binary (x : x.ghc704Prefs) true true + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) true true (haskellDefaultVersionPrioFun true)); haskellPackages_ghc704 = From 8a3f40a0886e63c7639beb074636595676cfb85f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Aug 2011 18:58:59 +0000 Subject: [PATCH 064/504] Get libpciaccess to compile on darwin The added patch uses the correct byte-conversion functions on Apple systems. The library compiles on darwin but is not yet tested. svn path=/nixpkgs/trunk/; revision=28881 --- .../servers/x11/xorg/libpciaccess-apple.patch | 26 +++++++++++++++++++ pkgs/servers/x11/xorg/overrides.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/x11/xorg/libpciaccess-apple.patch diff --git a/pkgs/servers/x11/xorg/libpciaccess-apple.patch b/pkgs/servers/x11/xorg/libpciaccess-apple.patch new file mode 100644 index 00000000000..a005c03cbbe --- /dev/null +++ b/pkgs/servers/x11/xorg/libpciaccess-apple.patch @@ -0,0 +1,26 @@ +diff -Naur libpciaccess-0.12.1-orig/src/common_interface.c libpciaccess-0.12.1/src/common_interface.c +--- libpciaccess-0.12.1-orig/src/common_interface.c 2010-07-12 00:32:05.000000000 -0400 ++++ libpciaccess-0.12.1/src/common_interface.c 2011-08-29 00:48:17.000000000 -0400 +@@ -67,6 +67,22 @@ + # define HTOLE_32(x) (x) + #endif /* Solaris */ + ++#elif defined(__APPLE__) ++ ++#include ++ ++#if __BYTE_ORDER == __BIG_ENDIAN ++# define LETOH_16(x) OSSwapInt16(x) ++# define HTOLE_16(x) OSSwapInt16(x) ++# define LETOH_32(x) OSSwapInt32(x) ++# define HTOLE_32(x) OSSwapInt32(x) ++#else ++# define LETOH_16(x) (x) ++# define HTOLE_16(x) (x) ++# define LETOH_32(x) (x) ++# define HTOLE_32(x) (x) ++#endif /* darwin */ ++ + #else + + #include diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c896062bcd7..a624d27c2af 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -47,6 +47,10 @@ in buildNativeInputs = [ args.perl ]; }; + libpciaccess = attrs : attrs // { + patches = [ ./libpciaccess-apple.patch ]; + }; + libX11 = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; postInstall = From feff68214eae709a2d34a5e786931982365f0273 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:09:57 +0000 Subject: [PATCH 065/504] pkgs/development/compilers/ghc/7.0.4.nix: hard-code list of supported platforms I assumed that Hydra would arrive at that result anyway, but apparently it doesn't: no x86_64-darwin builds have occurred despite the fact that we can bootstrap on that architecture now. svn path=/nixpkgs/trunk/; revision=28882 --- pkgs/development/compilers/ghc/7.0.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 24ed4060d7e..7230b9069e7 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ghc.meta.platforms; + platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; }; } From 482a61cf534066528945becc7b2d1aefc2f59ffa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:26:26 +0000 Subject: [PATCH 066/504] gtk-gnutella: updated to version 0.97 svn path=/nixpkgs/trunk/; revision=28883 --- .../networking/p2p/gtk-gnutella/default.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 239b76c940f..e30192598cc 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,11 +1,29 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, libxml2}: +{stdenv, fetchurl, pkgconfig, glib, gtk, libxml2, bison, gettext, zlib}: +let + name = "gtk-gnutella"; + version = "0.97"; +in stdenv.mkDerivation { - name = "gtk-gnutella-0.96.1"; - builder = ./builder.sh; + name = "${name}-${version}"; + src = fetchurl { - url = mirror://sourceforge/gtk-gnutella/gtk-gnutella-0.96.1.tar.bz2; - md5 = "6529379cc105c1e98f501a67e8e875fd"; + url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; + sha256 = "0l2gdzp517hjk31318djq0sww6kzckzl9rfqvhgspihn874lm9hb"; + }; + + buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib]; + + NIX_LDFLAGS = "-rpath ${zlib}/lib"; + configureScript = "./Configure"; + dontAddPrefix = true; + configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true"; + + meta = { + homepage = "http://gtk-gnutella.sourceforge.net/"; + description = "a server/client for Gnutella"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; - buildInputs = [pkgconfig glib gtk libxml2]; } From 1bc2601ae1eb1ed2dcfbae6b347811d42ba9f6e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:26:35 +0000 Subject: [PATCH 067/504] haskell-aeson-native: added version 0.3.3 svn path=/nixpkgs/trunk/; revision=28884 --- .../haskell/aeson-native/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/haskell/aeson-native/default.nix diff --git a/pkgs/development/libraries/haskell/aeson-native/default.nix b/pkgs/development/libraries/haskell/aeson-native/default.nix new file mode 100644 index 00000000000..3ec90bab76d --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson-native/default.nix @@ -0,0 +1,23 @@ +{ cabal, attoparsec, blazeBuilder, blazeTextualNative, deepseq +, hashable, mtl, syb, text, time, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson-native"; + version = "0.3.3"; + sha256 = "1ckf0fqx0mdw7467kjk3q48fb4q5w6336i8fxk6j0wfk17xjfs8l"; + buildDepends = [ + attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb + text time unorderedContainers vector + ]; + meta = { + homepage = "http://github.com/mailrank/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c31cf0ffb33..f62d9256fe6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -362,6 +362,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); aeson = callPackage ../development/libraries/haskell/aeson {}; + aesonNative = callPackage ../development/libraries/haskell/aeson-native {}; + ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; From 3895e45e511b2766283d59fcaea1ba6bc9e94e97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:26:40 +0000 Subject: [PATCH 068/504] haskell-blaze-textual-native: added version 0.2.1 svn path=/nixpkgs/trunk/; revision=28885 --- .../haskell/blaze-textual-native/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/blaze-textual-native/default.nix diff --git a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix new file mode 100644 index 00000000000..3f41a176905 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, text, time, vector }: + +cabal.mkDerivation (self: { + pname = "blaze-textual-native"; + version = "0.2.1"; + sha256 = "12cnl76qld19x6zlhxcsx2b27mfr9v7sc2xq6af9h77wqb98fkvn"; + buildDepends = [ blazeBuilder text time vector ]; + meta = { + homepage = "http://github.com/mailrank/blaze-textual"; + description = "Fast rendering of common datatypes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f62d9256fe6..e30f60aa82f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -414,6 +414,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {}; + blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {}; + bmp = callPackage ../development/libraries/haskell/bmp {}; Boolean = callPackage ../development/libraries/haskell/Boolean {}; From 70f424ee5e75028a114b95c4670bada955c682c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:26:45 +0000 Subject: [PATCH 069/504] haskell-xss-sanitize: added version 0.3.0.1 svn path=/nixpkgs/trunk/; revision=28886 --- .../xss-sanitize/{default.nix => 0.2.6.nix} | 0 .../haskell/xss-sanitize/0.3.0.1.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++++-- 3 files changed, 28 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/xss-sanitize/{default.nix => 0.2.6.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix similarity index 100% rename from pkgs/development/libraries/haskell/xss-sanitize/default.nix rename to pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix diff --git a/pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix b/pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix new file mode 100644 index 00000000000..e13e0e50c90 --- /dev/null +++ b/pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsecText, cssText, network, tagsoup, text +, utf8String +}: + +cabal.mkDerivation (self: { + pname = "xss-sanitize"; + version = "0.3.0.1"; + sha256 = "1rycdjl7b7bk100vgdwy6iighdqsbsyvrklp0zqbl1x45abph9pc"; + buildDepends = [ + attoparsecText cssText network tagsoup text utf8String + ]; + meta = { + homepage = "http://github.com/gregwebs/haskell-xss-sanitize"; + description = "sanitize untrusted HTML to prevent XSS attacks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e30f60aa82f..f9bad22e6ca 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -594,7 +594,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; - gitit = callPackage ../development/libraries/haskell/gitit {}; + gitit = callPackage ../development/libraries/haskell/gitit { + xssSanitize = self.xssSanitize_0_2_6; + }; glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs) pkgconfig glibc; @@ -1298,7 +1300,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; - xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; + xssSanitize_0_2_6 = callPackage ../development/libraries/haskell/xss-sanitize/0.2.6.nix {}; + xssSanitize_0_3_0_1 = callPackage ../development/libraries/haskell/xss-sanitize/0.3.0.1.nix {}; + xssSanitize = self.xssSanitize_0_3_0_1; yap = callPackage ../development/libraries/haskell/yap {}; From 5eb504674acb03622ae6b361679ce7946363a4fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:26:52 +0000 Subject: [PATCH 070/504] haskell-hamlet: added version 0.10.0 svn path=/nixpkgs/trunk/; revision=28887 --- .../libraries/haskell/hamlet/0.10.0.nix | 22 +++++++++++++++++++ .../hamlet/{default.nix => 0.8.2.1.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +++++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/hamlet/0.10.0.nix rename pkgs/development/libraries/haskell/hamlet/{default.nix => 0.8.2.1.nix} (100%) diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.0.nix b/pkgs/development/libraries/haskell/hamlet/0.10.0.nix new file mode 100644 index 00000000000..280e49ea435 --- /dev/null +++ b/pkgs/development/libraries/haskell/hamlet/0.10.0.nix @@ -0,0 +1,22 @@ +{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare +, text +}: + +cabal.mkDerivation (self: { + pname = "hamlet"; + version = "0.10.0"; + sha256 = "0xqlc03g0qnpnrw957108rpjbs88p9wwvcgmz7vc1f0k88lc0h6n"; + buildDepends = [ + blazeBuilder blazeHtml failure parsec shakespeare text + ]; + meta = { + homepage = "http://www.yesodweb.com/book/templates"; + description = "Haml-like template files that are compile-time checked"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/hamlet/default.nix rename to pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f9bad22e6ca..7970de34eed 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -649,9 +649,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); graphviz = callPackage ../development/libraries/haskell/graphviz {}; - hakyll = callPackage ../development/libraries/haskell/hakyll {}; + hakyll = callPackage ../development/libraries/haskell/hakyll { + hamlet = self.hamlet_0_8_2_1; + }; - hamlet = callPackage ../development/libraries/haskell/hamlet {}; + hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {}; + hamlet_0_10_0 = callPackage ../development/libraries/haskell/hamlet/0.10.0.nix {}; + hamlet = self.hamlet_0_10_0; happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {}; From ddb2097b3f61910bba75d4a2ed3e97f6c8e15fc9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:27:05 +0000 Subject: [PATCH 071/504] haskell-packages.nix: added shakespeare packages haskell-shakespeare-css: added version 0.10.0 haskell-shakespeare-js: added version 0.10.1 haskell-shakespeare: added version 0.10.0 svn path=/nixpkgs/trunk/; revision=28888 --- .../haskell/shakespeare-css/default.nix | 18 ++++++++++++++++++ .../haskell/shakespeare-js/default.nix | 18 ++++++++++++++++++ .../libraries/haskell/shakespeare/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++++ 4 files changed, 60 insertions(+) create mode 100644 pkgs/development/libraries/haskell/shakespeare-css/default.nix create mode 100644 pkgs/development/libraries/haskell/shakespeare-js/default.nix create mode 100644 pkgs/development/libraries/haskell/shakespeare/default.nix diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix new file mode 100644 index 00000000000..cb5f5ca39b5 --- /dev/null +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -0,0 +1,18 @@ +{ cabal, parsec, shakespeare, text }: + +cabal.mkDerivation (self: { + pname = "shakespeare-css"; + version = "0.10.0"; + sha256 = "12gdpxsh6x95m9vp0nrffri1bh8d6zhd7qqjrrkp49rvjf8fjwrk"; + buildDepends = [ parsec shakespeare text ]; + meta = { + homepage = "http://www.yesodweb.com/book/templates"; + description = "Stick your haskell variables into css at compile time"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix new file mode 100644 index 00000000000..064e1828f9d --- /dev/null +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -0,0 +1,18 @@ +{ cabal, shakespeare, text }: + +cabal.mkDerivation (self: { + pname = "shakespeare-js"; + version = "0.10.1"; + sha256 = "0j9jzrnvarwkab9zynz8k60ilgj5kyqdm56lricpii27qlkqnmf3"; + buildDepends = [ shakespeare text ]; + meta = { + homepage = "http://www.yesodweb.com/book/templates"; + description = "Stick your haskell variables into javascript/coffeescript at compile time"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix new file mode 100644 index 00000000000..e99b6c4b7cc --- /dev/null +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }: + +cabal.mkDerivation (self: { + pname = "shakespeare"; + version = "0.10.0"; + sha256 = "14q0z2q7c27pp6hnwzn50zjb4rzhy7znmahnzn8b59274jkbbzjs"; + buildDepends = [ blazeBuilder blazeHtml failure parsec text ]; + meta = { + homepage = "http://www.yesodweb.com/book/templates"; + description = "A toolkit for making compile-time interpolated templates"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7970de34eed..22223eca1ee 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1127,6 +1127,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SHA = callPackage ../development/libraries/haskell/SHA {}; + shakespeare = callPackage ../development/libraries/haskell/shakespeare {}; + + shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js {}; + + shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {}; + Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {}; ShellacHaskeline = callPackage ../development/libraries/haskell/Shellac/Shellac-haskeline.nix {}; From e6273ab9d1fd2184a69b544a2c46735ca75f370d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:27:10 +0000 Subject: [PATCH 072/504] haskell-authenticate: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=28889 --- .../libraries/haskell/authenticate/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index e4457a3cdf7..f6f2709bfba 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder +{ cabal, aesonNative, attoparsec, base64Bytestring, blazeBuilder , caseInsensitive, enumerator, failure, httpEnumerator, httpTypes , network, random, RSA, SHA, tagsoup, text, time, tls, transformers , xmlEnumerator @@ -6,12 +6,12 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.9.2.2"; - sha256 = "0rn1f458ag9mmh55hi873xg5iqypwl6vf6blyaxwbgbp6nm327iz"; + version = "0.10.1"; + sha256 = "03928v92s5j99r5v2jp9s4z87djj8dldkid8525aky0b0ghlnfhc"; buildDepends = [ - aeson attoparsec base64Bytestring blazeBuilder caseInsensitive - enumerator failure httpEnumerator httpTypes network random RSA SHA - tagsoup text time tls transformers xmlEnumerator + aesonNative attoparsec base64Bytestring blazeBuilder + caseInsensitive enumerator failure httpEnumerator httpTypes network + random RSA SHA tagsoup text time tls transformers xmlEnumerator ]; meta = { homepage = "http://github.com/snoyberg/authenticate/tree/master"; From e31db9455066a43d28891ef4bff2809d78dbba69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:27:15 +0000 Subject: [PATCH 073/504] haskell-clientsession: updated to version 0.7.0 svn path=/nixpkgs/trunk/; revision=28890 --- .../libraries/haskell/clientsession/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 44482d9161b..521f2f5e847 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,12 +1,10 @@ -{ cabal, random }: +{ cabal, base64Bytestring, cryptoApi, cryptocipher }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.6.0"; - sha256 = "0h92jjkhldn7f9b78cajfda8rprsj5scdsyl3pjpzicpvvy9g00y"; - isLibrary = true; - isExecutable = true; - buildDepends = [ random ]; + version = "0.7.0"; + sha256 = "08a6k0dqx9qp7j87iq6kmyzg1aw8ykc7vrbzdbr1lfkwh05dvglm"; + buildDepends = [ base64Bytestring cryptoApi cryptocipher ]; meta = { homepage = "http://github.com/snoyberg/clientsession/tree/master"; description = "Store session data in a cookie"; From ba9cc549fa52ea698d5c65351197926aafa2bd5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:27:20 +0000 Subject: [PATCH 074/504] haskell-data-default: updated to version 0.3.0 svn path=/nixpkgs/trunk/; revision=28891 --- .../development/libraries/haskell/data-default/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 934baf1b91b..593c7b3bd3c 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, dlist }: cabal.mkDerivation (self: { pname = "data-default"; - version = "0.2.0.1"; - sha256 = "0hhrzaykwybqpig0kss4iq1i93ygb80g8i1chpr84akmvdr07w0i"; + version = "0.3.0"; + sha256 = "0nbvknfa9kkc46fl1ffji0ghqb41wwsccmc55mya5zavfq9g05g9"; + buildDepends = [ dlist ]; meta = { description = "A class for types with a default value"; license = self.stdenv.lib.licenses.bsd3; From e5454cf33acb7193c5056f0ba15eb3c8db9c7ec4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:27:28 +0000 Subject: [PATCH 075/504] haskell-persistent-template: updated to version 0.6.1 svn path=/nixpkgs/trunk/; revision=28892 --- .../libraries/haskell/persistent-template/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index c3df4263d43..8f0e3263ed7 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,12 +1,12 @@ -{ cabal, monadControl, persistent, text, webRoutesQuasi }: +{ cabal, monadControl, persistent, text }: cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.5.1"; - sha256 = "163j36pm6fl64m4h8kgj9h19snh026ia1166p3c6rjw86qi9fk0r"; - buildDepends = [ monadControl persistent text webRoutesQuasi ]; + version = "0.6.1"; + sha256 = "1ggfdq1d32i5ny57cvdf8yw5pwhbw2sc31mrj1whb0ggkcwaqh9l"; + buildDepends = [ monadControl persistent text ]; meta = { - homepage = "http://www.yesodweb.com/"; + homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 42a21dc8d623bc2003b57cb689a33765fae40084 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:27:34 +0000 Subject: [PATCH 076/504] haskell-persistent: updated to version 0.6.1 svn path=/nixpkgs/trunk/; revision=28893 --- .../libraries/haskell/persistent/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 20c1458e333..a3ce3564a52 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,20 +1,18 @@ -{ cabal, blazeHtml, enumerator, monadControl, parsec, pool, sqlite -, text, time, transformers +{ cabal, blazeHtml, enumerator, monadControl, mtl, parsec +, pathPieces, pool, sqlite, text, time, transformers }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.5.1"; - sha256 = "1m0558vi99z15q0w62a9rkz25n8djswggbad9m0il359jb3mrzsd"; - isLibrary = true; - isExecutable = true; + version = "0.6.1"; + sha256 = "1pb34n7rwj6jvk18c802kd99rrlhrav1hkx600rs6pp5zjic3mp7"; buildDepends = [ - blazeHtml enumerator monadControl parsec pool text time - transformers + blazeHtml enumerator monadControl mtl parsec pathPieces pool text + time transformers ]; extraLibraries = [ sqlite ]; meta = { - homepage = "http://docs.yesodweb.com/book/persistent"; + homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 9c0c9b9ba4b5faca50ca53ee34c63725763dd540 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:27:47 +0000 Subject: [PATCH 077/504] haskell-wai-app-static: updated to version 0.3.3 svn path=/nixpkgs/trunk/; revision=28894 --- .../libraries/haskell/wai-app-static/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 79513b785d4..3fa0595bc13 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,17 +1,18 @@ -{ cabal, blazeBuilder, blazeHtml, fileEmbed, httpTypes, text, time -, transformers, unixCompat, wai +{ cabal, base64Bytestring, blazeBuilder, blazeHtml, cryptohash +, fileEmbed, httpDate, httpTypes, text, time, transformers +, unixCompat, wai }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "0.1.0"; - sha256 = "0k9pl1kanrb2pqp1bs5s1lxb7ayq2ddf2cxi5q2v9yq22s229xln"; + version = "0.3.3"; + sha256 = "04b4cw93agw136xjh9rssiw96vz3kxji7zh209brwfnwh13bra17"; buildDepends = [ - blazeBuilder blazeHtml fileEmbed httpTypes text time transformers - unixCompat wai + base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed + httpDate httpTypes text time transformers unixCompat wai ]; meta = { - homepage = "http://www.yesodweb.com/"; + homepage = "http://www.yesodweb.com/book/wai"; description = "WAI application for static serving"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 5836af8dc2b4f52d9922b7e03d673fb0dec166b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:02 +0000 Subject: [PATCH 078/504] haskell-wai-extra: updated to version 0.4.2 svn path=/nixpkgs/trunk/; revision=28895 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d18c6910a2e..9fce21f06db 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -5,14 +5,14 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "0.4.0.3"; - sha256 = "1mfjn9rxzcfdwvimjw57j7vpr1y64ia7905c8nxa9968sdy0dhsy"; + version = "0.4.2"; + sha256 = "1k2dsjramy14rfd1j8k7zgirdfl2zybd0z0pxkvxdrgr9s2pk51y"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator httpTypes network text time transformers wai zlibBindings ]; meta = { - homepage = "http://github.com/snoyberg/wai-extra"; + homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 682bf916a8aafd717c51d73659ca3bffca426ea8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:06 +0000 Subject: [PATCH 079/504] haskell-yesod-auth: updated to version 0.7.1 svn path=/nixpkgs/trunk/; revision=28896 --- .../libraries/haskell/yesod-auth/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index cf192efb6c5..b2502047a0c 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,18 +1,19 @@ -{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt +{ cabal, aesonNative, authenticate, blazeHtml, controlMonadAttempt , hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate -, pureMD5, random, SHA, text, transformers, wai, webRoutesQuasi -, yesodCore, yesodForm, yesodJson, yesodPersistent +, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text +, transformers, wai, yesodCore, yesodForm, yesodJson +, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.4.0.2"; - sha256 = "1vf02kgm3pcak4igvp8009lgv8i8bir272byw0ma2mg6bl0sgyvl"; + version = "0.7.1"; + sha256 = "066aq7c5gwbspbib748ky3lsb84llnb954n018fk5xs7b4gbyybk"; buildDepends = [ - aeson authenticate blazeHtml controlMonadAttempt hamlet + aesonNative authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 - random SHA text transformers wai webRoutesQuasi yesodCore yesodForm - yesodJson yesodPersistent + pwstoreFast random SHA shakespeareCss text transformers wai + yesodCore yesodForm yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From 4aa21929eabb7d87f36971d2177e00b059f866e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:10 +0000 Subject: [PATCH 080/504] haskell-yesod-core: updated to version 0.9.1 svn path=/nixpkgs/trunk/; revision=28897 --- .../libraries/haskell/yesod-core/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index ae7ffbb1bb6..947cad77d5e 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,19 +1,19 @@ { cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal , clientsession, cookie, enumerator, failure, hamlet, httpTypes -, monadControl, parsec, random, text, time, transformers, wai -, waiExtra, webRoutesQuasi +, monadControl, parsec, pathPieces, random, shakespeare +, shakespeareCss, shakespeareJs, strictConcurrency, text, time +, transformers, wai, waiExtra }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.8.3.2"; - sha256 = "0k0lgd9p8mrwwcypx1nfr1z2rq5wk4gvjc1fbvla0c9nabqnbfzs"; - isLibrary = true; - isExecutable = true; + version = "0.9.1"; + sha256 = "03dbn915g6jkwk9fp5naqv5bq613nlfpc8jd7568cc1l41b95cbf"; buildDepends = [ blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie - enumerator failure hamlet httpTypes monadControl parsec random text - time transformers wai waiExtra webRoutesQuasi + enumerator failure hamlet httpTypes monadControl parsec pathPieces + random shakespeare shakespeareCss shakespeareJs strictConcurrency + text time transformers wai waiExtra ]; meta = { homepage = "http://www.yesodweb.com/"; From 5b948f85e5c3dba869e2890936ca8fcb9ba43e98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:14 +0000 Subject: [PATCH 081/504] haskell-yesod-form: updated to version 0.3.1 svn path=/nixpkgs/trunk/; revision=28898 --- .../libraries/haskell/yesod-form/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 9014e1433d2..5d841c925cd 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,16 +1,16 @@ { cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate -, hamlet, network, persistent, text, time, transformers -, webRoutesQuasi, xssSanitize, yesodCore, yesodPersistent +, hamlet, network, persistent, shakespeareCss, shakespeareJs, text +, time, transformers, wai, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.1.0.1"; - sha256 = "108652256g82xapsn0w4cbficq4ikwlsa8yis2zq7izxk48livlm"; + version = "0.3.1"; + sha256 = "0xa9950michbwlp90xcr8ybpig7f026zwq28lg03zavnaqisqkfj"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network - persistent text time transformers webRoutesQuasi xssSanitize - yesodCore yesodPersistent + persistent shakespeareCss shakespeareJs text time transformers wai + xssSanitize yesodCore yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From 077c598c8585b4bfc7d0dadb943216ed9d8bacd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:19 +0000 Subject: [PATCH 082/504] haskell-yesod-json: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=28899 --- pkgs/development/libraries/haskell/yesod-json/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 982ebfdf1dc..2e5df42d9da 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,10 +1,10 @@ -{ cabal, aeson, blazeTextual, hamlet, text, vector, yesodCore }: +{ cabal, aesonNative, shakespeareJs, text, vector, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.1.1.2"; - sha256 = "0d6dkhzjpxp3687x914h67swm4lgsalb1xr13gz53ddb0qj18n7j"; - buildDepends = [ aeson blazeTextual hamlet text vector yesodCore ]; + version = "0.2.1"; + sha256 = "1d710pqrdafyz8s0spd19vwvx5v9kwy44wb0byz3445jhi3kwn88"; + buildDepends = [ aesonNative shakespeareJs text vector yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Generate content for Yesod using the aeson package"; From 4e715256a72ef36cb6825bee10fb16b342119716 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:23 +0000 Subject: [PATCH 083/504] haskell-yesod-persistent: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=28900 --- .../libraries/haskell/yesod-persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 866ece71ded..187780f9ebb 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "0.1.0"; - sha256 = "1h0kk3sx0c4c3pcg3s2c5kfy0kz7gci45h4gsgrkhkcgg0pg324c"; + version = "0.2.1"; + sha256 = "1ka8jsxr7i5rcjxnv82ykq34yqxqzxdvk4b3ck7pbvx2a4g7bxw9"; buildDepends = [ failure persistent persistentTemplate transformers yesodCore ]; From 6b2839c3611643f6bf62a1b520272a31e84b4c2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:27 +0000 Subject: [PATCH 084/504] haskell-yesod-static: updated to version 0.3.0.1 svn path=/nixpkgs/trunk/; revision=28901 --- .../libraries/haskell/yesod-static/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 281f14c862c..8fbc8baff49 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,16 +1,14 @@ -{ cabal, base64Bytestring, cereal, pureMD5, text, transformers -, waiAppStatic, yesodCore +{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5 +, text, transformers, unixCompat, wai, waiAppStatic, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.1.0.1"; - sha256 = "0icb1wp0ndvl54shjyv0apmias60j2gjbcv7i92dxnl3fzx74d3p"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.1"; + sha256 = "1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5"; buildDepends = [ - base64Bytestring cereal pureMD5 text transformers waiAppStatic - yesodCore + base64Bytestring cereal fileEmbed httpTypes pureMD5 text + transformers unixCompat wai waiAppStatic yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 04e2d193bd69dcb99f8fad4c7e20a16060cb98fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 20:28:32 +0000 Subject: [PATCH 085/504] haskell-yesod: updated to version 0.9.1 svn path=/nixpkgs/trunk/; revision=28902 --- .../libraries/haskell/yesod/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 72af9d343e3..e09faa1fd84 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,20 +1,20 @@ -{ cabal, attoparsecText, blazeBuilder, hamlet, hjsmin, httpTypes -, mimeMail, monadControl, parsec, text, time, transformers -, unixCompat, wai, waiExtra, warp, yesodAuth, yesodCore, yesodForm -, yesodJson, yesodPersistent, yesodStatic +{ cabal, attoparsecText, blazeBuilder, blazeHtml, hamlet, httpTypes +, monadControl, parsec, shakespeareCss, shakespeareJs, text, time +, transformers, unixCompat, wai, waiExtra, warp, yesodAuth +, yesodCore, yesodForm, yesodJson, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "0.8.2.1"; - sha256 = "0idpgzbzy31bl5khc83wgi9a9mzrymris0mg5dlc4kj4sd5a1ksi"; + version = "0.9.1"; + sha256 = "1ag3lca75lrriycbscspb5yyishacgxjx0rybc3x4z1dqnkn1r71"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsecText blazeBuilder hamlet hjsmin httpTypes mimeMail - monadControl parsec text time transformers unixCompat wai waiExtra - warp yesodAuth yesodCore yesodForm yesodJson yesodPersistent - yesodStatic + attoparsecText blazeBuilder blazeHtml hamlet httpTypes monadControl + parsec shakespeareCss shakespeareJs text time transformers + unixCompat wai waiExtra warp yesodAuth yesodCore yesodForm + yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From a96de07ceb5ec029b3c8f92fce1a59af5b662dc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 21:44:30 +0000 Subject: [PATCH 086/504] Dropped obsolete Haskell packages monads-fd, salvia, and salvia-protocol. These packages don't build with any of our compilers. svn path=/nixpkgs/trunk/; revision=28903 --- .../libraries/haskell/monads-fd/0.0.0.1.nix | 17 ------------- .../libraries/haskell/monads-fd/0.2.0.0.nix | 17 ------------- .../haskell/salvia-protocol/default.nix | 17 ------------- .../libraries/haskell/salvia/default.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 10 -------- 5 files changed, 85 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/salvia-protocol/default.nix delete mode 100644 pkgs/development/libraries/haskell/salvia/default.nix diff --git a/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix b/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix deleted file mode 100644 index d05201c939c..00000000000 --- a/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "monads-fd"; - version = "0.0.0.1"; - sha256 = "7eaac97b2c91a670171f18ebeb3f73b1a45e16576851279f73ea2e1f5ec63b25"; - buildDepends = [ transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix b/pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix deleted file mode 100644 index f12df82d844..00000000000 --- a/pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, mtl, transformers }: - -cabal.mkDerivation (self: { - pname = "monads-fd"; - version = "0.2.0.0"; - sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c"; - buildDepends = [ mtl transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/salvia-protocol/default.nix b/pkgs/development/libraries/haskell/salvia-protocol/default.nix deleted file mode 100644 index dbd33c17036..00000000000 --- a/pkgs/development/libraries/haskell/salvia-protocol/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, bimap, fclabels, parsec, safe, split, utf8String }: - -cabal.mkDerivation (self: { - pname = "salvia-protocol"; - version = "1.0.1"; - sha256 = "6b2312e52efaa81feec7461b1a3db77e1f2a8dfd829ae878b614c206a5e48928"; - buildDepends = [ bimap fclabels parsec safe split utf8String ]; - meta = { - description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/salvia/default.nix b/pkgs/development/libraries/haskell/salvia/default.nix deleted file mode 100644 index e3594e1ef4a..00000000000 --- a/pkgs/development/libraries/haskell/salvia/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, fclabels, MaybeTTransformers, monadsFd, network, pureMD5 -, random, safe, salviaProtocol, split, stm, text, threadmanager -, time, transformers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "salvia"; - version = "1.0.0"; - sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1"; - buildDepends = [ - fclabels MaybeTTransformers monadsFd network pureMD5 random safe - salviaProtocol split stm text threadmanager time transformers - utf8String - ]; - meta = { - description = "Modular web application framework"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 22223eca1ee..8afe7cda082 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -859,10 +859,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; - monadsFd_0_0_0_1 = callPackage ../development/libraries/haskell/monads-fd/0.0.0.1.nix {}; - monadsFd_0_2_0_0 = callPackage ../development/libraries/haskell/monads-fd/0.2.0.0.nix {}; - monadsFd = self.monadsFd_0_2_0_0; - mpppc = callPackage ../development/libraries/haskell/mpppc {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; @@ -1064,12 +1060,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); safe = callPackage ../development/libraries/haskell/safe {}; - salvia = callPackage ../development/libraries/haskell/salvia {}; - - salviaProtocol = callPackage ../development/libraries/haskell/salvia-protocol { - parsec = self.parsec2; - }; - sendfile = callPackage ../development/libraries/haskell/sendfile {}; semigroups = callPackage ../development/libraries/haskell/semigroups {}; From 6f23bfc52f461f6b6303c5bffc3769de2ce4049f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 21:44:36 +0000 Subject: [PATCH 087/504] Dropped obsolete haskell-MaybeT-transformers. The package doesn't build with any of our compilers. svn path=/nixpkgs/trunk/; revision=28904 --- .../haskell/MaybeT-transformers/default.nix | 17 ----------------- pkgs/top-level/haskell-packages.nix | 4 ---- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/MaybeT-transformers/default.nix diff --git a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix deleted file mode 100644 index d006076c247..00000000000 --- a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, monadsFd, transformers }: - -cabal.mkDerivation (self: { - pname = "MaybeT-transformers"; - version = "0.2"; - sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily"; - buildDepends = [ monadsFd transformers ]; - meta = { - description = "MaybeT monad transformer using transformers instead of mtl"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8afe7cda082..2e7e7082077 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -829,10 +829,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; - MaybeTTransformers = callPackage ../development/libraries/haskell/MaybeT-transformers { - monadsFd = self.monadsFd_0_0_0_1; - }; - MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; From 63ace0505121b6294b4e3559fcc901c448f4acfa Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Mon, 29 Aug 2011 21:45:42 +0000 Subject: [PATCH 088/504] added polish dictionary to the list svn path=/nixpkgs/trunk/; revision=28905 --- pkgs/development/libraries/aspell/dictionaries.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 0d1ee3d838f..3bd1d82e0b5 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -103,6 +103,15 @@ in { ''; }; + pl = buildDict { + shortName = "pl-6.0_20061121"; + fullName = "Polish"; + src = fetchurl { + url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2; + sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; + }; + }; + ru = buildDict { shortName = "ru-0.99f7-1"; fullName = "Russian"; From d84962624e9415a2f7698e054a35bb4d2e3ab556 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 21:46:22 +0000 Subject: [PATCH 089/504] Dropped obsolete haskell-emgm. The package doesn't build with any of our compilers. svn path=/nixpkgs/trunk/; revision=28906 --- .../libraries/haskell/emgm/default.nix | 19 ------------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/emgm/default.nix diff --git a/pkgs/development/libraries/haskell/emgm/default.nix b/pkgs/development/libraries/haskell/emgm/default.nix deleted file mode 100644 index 0172369d1e9..00000000000 --- a/pkgs/development/libraries/haskell/emgm/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "emgm"; - version = "0.3.1"; - sha256 = "956923ec4d51f111ca6091ebccf75a1f6b99d7a173ea673cbb4787bf08f497a8"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM"; - description = "Extensible and Modular Generics for the Masses"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e7e7082077..6ba0a746186 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -543,8 +543,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); filepath = callPackage ../development/libraries/haskell/filepath {}; - emgm = callPackage ../development/libraries/haskell/emgm {}; - extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; From ed03fadafc05dae794b2e5bca562eb8873299d08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 22:21:29 +0000 Subject: [PATCH 090/504] pkgs/tools/networking/p2p/gtk-gnutella/builder.sh: dropped obsolete file svn path=/nixpkgs/trunk/; revision=28908 --- pkgs/tools/networking/p2p/gtk-gnutella/builder.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 pkgs/tools/networking/p2p/gtk-gnutella/builder.sh diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/builder.sh b/pkgs/tools/networking/p2p/gtk-gnutella/builder.sh deleted file mode 100644 index 33dec4ff34d..00000000000 --- a/pkgs/tools/networking/p2p/gtk-gnutella/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -configureScript="./Configure" - -dontAddPrefix=1 - -configureFlags="-d -e -D prefix=$out -D gtkversion=2 -D official=true" - -genericBuild \ No newline at end of file From 50f5c159969a2fbd0f5bc68ac6e52621e1cd3940 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 29 Aug 2011 22:43:03 +0000 Subject: [PATCH 091/504] Trying to fix nepomukserver startup problem svn path=/nixpkgs/trunk/; revision=28909 --- pkgs/desktops/kde-4.7/support/soprano/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix index 8d07f352d17..baed2233152 100644 --- a/pkgs/desktops/kde-4.7/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }: +{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }: stdenv.mkDerivation rec { name = "soprano-2.7.0"; @@ -8,8 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z"; }; + patches = [ (fetchurl { + url = https://git.reviewboard.kde.org/r/102466/diff/raw/; + name = "soprano-virtuoso-restart.patch"; + sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y"; + })]; + # We disable the Java backend, since we do not need them and they make the closure size much bigger - buildInputs = [ cmake qt4 clucene_core redland libiodbc ]; + buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ]; meta = { homepage = http://soprano.sourceforge.net/; From 94c6bb3ed4eeaa3bf32f662c27ae857decde2219 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 29 Aug 2011 22:43:11 +0000 Subject: [PATCH 092/504] Add kmymoney svn path=/nixpkgs/trunk/; revision=28910 --- pkgs/applications/office/kmymoney/default.nix | 22 +++++++++++++++++++ .../applications/office/kmymoney/qgpgme.patch | 17 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/applications/office/kmymoney/default.nix create mode 100644 pkgs/applications/office/kmymoney/qgpgme.patch diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix new file mode 100644 index 00000000000..8665b873150 --- /dev/null +++ b/pkgs/applications/office/kmymoney/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, + shared_mime_info, perl, boost, gpgme }: + +stdenv.mkDerivation rec { + name = "kmymoney-4.5.3"; + + src = fetchurl { + url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2"; + sha256 = "1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9"; + }; + + buildInputs = [ kdelibs kdepimlibs perl boost gpgme ]; + buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ]; + + patches = [ ./qgpgme.patch ]; + + meta = { + homepage = http://kmymoney2.sourceforge.net/; + description = "KDE personal money manager"; + inherit (kdelibs.meta) platforms maintainers; + }; +} diff --git a/pkgs/applications/office/kmymoney/qgpgme.patch b/pkgs/applications/office/kmymoney/qgpgme.patch new file mode 100644 index 00000000000..59ed37edaf8 --- /dev/null +++ b/pkgs/applications/office/kmymoney/qgpgme.patch @@ -0,0 +1,17 @@ +KMymoney tries to find qgpgme before kdepimlibs. This is wrong because +FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs +found. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f6d7305..88bac67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,8 +59,8 @@ else (WIN32) + find_package(Boost "1.33.1" COMPONENTS graph) + endif (WIN32) + # needed by libkgpgfile +-find_package(QGpgme REQUIRED) + find_package(KdepimLibs REQUIRED) ++find_package(QGpgme REQUIRED) + find_package(SharedMimeInfo REQUIRED) + + add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbece92618a..7db30ca64f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7863,6 +7863,8 @@ let inherit (pkgs.gtkLibs) pango; }; + kmymoney = callPackage ../applications/office/kmymoney { }; + kipi_plugins = callPackage ../applications/graphics/kipi-plugins { inherit (pkgs.gtkLibs) gdk_pixbuf; }; From 0a2debdee37f0ce7131d35903076d0e956f2a946 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 29 Aug 2011 22:48:36 +0000 Subject: [PATCH 093/504] SDO-0.8.0 svn path=/nixpkgs/trunk/; revision=28911 --- pkgs/data/misc/shared-desktop-ontologies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index d86538b42d5..f5bf062b359 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "shared-desktop-ontologies-0.7.1"; + name = "shared-desktop-ontologies-0.8.0"; src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; - sha256 = "1b38amxr4b0n6cyy9l3lgzyjsky172cjphjr0iscahrlrc0h4phy"; + sha256 = "0wf4gli2akkqbl944lqjjy2hvcfagq6zzmdg7fkzr61p6vw7nk82"; }; buildInputs = [ cmake ]; From c508b4cf04636b9c86de81627f9bb77c995b3fb6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 30 Aug 2011 00:14:16 +0000 Subject: [PATCH 094/504] add get_iplayer 2.80 svn path=/nixpkgs/trunk/; revision=28912 --- .../applications/misc/get_iplayer/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/misc/get_iplayer/default.nix diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix new file mode 100644 index 00000000000..1a0453797cc --- /dev/null +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}: + +stdenv.mkDerivation { + name = "get_iplayer-2.80"; + + buildInputs = [makeWrapper perl]; + + installPhase = '' + ensureDir $out/bin + cp get_iplayer $out/bin + wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin + ''; + + src = fetchurl { + url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz; + sha256 = "1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7db30ca64f1..261cefdc64d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6529,6 +6529,8 @@ let gtksharp = gtksharp1; }; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; + gimp = callPackage ../applications/graphics/gimp { inherit (gnome) gtk libart_lgpl; }; From c5e13457580a0cd2ea6593cb069157f0385e7569 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Aug 2011 05:26:39 +0000 Subject: [PATCH 095/504] Update LiquidWar svn path=/nixpkgs/trunk/; revision=28913 --- pkgs/games/liquidwar/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/liquidwar/src-for-default.nix b/pkgs/games/liquidwar/src-for-default.nix index d676adfdb14..a67b1e816f7 100644 --- a/pkgs/games/liquidwar/src-for-default.nix +++ b/pkgs/games/liquidwar/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.0.9beta"; - name="liquidwar-0.0.9beta"; - hash="1a4yqh79y6s3f6dv5kkwjdqzi62y3qbwrx6420fqpvdn1694ycr9"; + version="0.0.10beta"; + name="liquidwar-0.0.10beta"; + hash="1fc1qfl7p3669dj6dy1wxvf85hhwgbazm3rc365ahsikdgz1c5m0"; url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz"; - advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.9beta/liquidwar6-0.0.9beta.tar.gz"; + advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.10beta/liquidwar6-0.0.10beta.tar.gz"; } From 3f845cb22df13e4f0f98c0ccdb3d21a50329e961 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Aug 2011 05:51:49 +0000 Subject: [PATCH 096/504] Adding xtreemfs svn path=/nixpkgs/trunk/; revision=28914 --- pkgs/tools/filesystems/xtreemfs/default.nix | 79 +++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/tools/filesystems/xtreemfs/default.nix diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix new file mode 100644 index 00000000000..98657891f2d --- /dev/null +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -0,0 +1,79 @@ +x@{builderDefsPackage + , boost, fuse, openssl, cmake, attr, jdk, ant, which, python, file + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="XtreemFS"; + version="1.3.0"; + name="${baseName}-${version}"; + url="http://xtreemfs.googlecode.com/files/${name}.tar.gz"; + hash="15rg3dh22kb2g94fmbb6r32a9qfl3yr4ql17rwj50l4y8wrcx0hf"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["setVars" "fixMakefile" "doMakeInstall" "fixInterpreterBin" + "fixInterpreterEtc" + "usrIsOut"]; + + setVars = a.noDepEntry '' + export JAVA_HOME="${jdk}" + export ANT_HOME="${ant}" + export CMAKE_HOME=${cmake} + ''; + + fixMakefile = a.fullDepEntry '' + sed -e 's@DESTDIR)/usr@DESTDIR)@g' -i Makefile + + sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/configure + sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/gtest/configure + sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/gtest-*/configure + '' ["doUnpack" "minInit"]; + + fixInterpreterBin = a.doPatchShebangs "$out/bin"; + fixInterpreterEtc = a.doPatchShebangs "$out/etc/xos/xtreemfs"; + + usrIsOut = a.fullDepEntry '' + sed -e "s@/usr/@$out/@g" -i \ + "$out"/{bin/xtfs_*,etc/xos/xtreemfs/*.*,etc/xos/xtreemfs/*/*,etc/init.d/*} + sed -e "s@JAVA_HOME=/usr@JAVA_HOME=${jdk}@g" -i \ + "$out"/{bin/xtfs_*,etc/init.d/*} + '' ["minInit"]; + + makeFlags = [ + ''DESTDIR="$out"'' + ''SHELL="${a.stdenv.shell}"'' + ]; + + meta = { + description = "A distributed filesystem"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.bsd3; + }; + passthru = { + updateInfo = { + downloadPage = "http://xtreemfs.org/download_sources.php"; + }; + }; +}) x + From 6a013043176d408db8f0f4fd95d3b0ae1770d798 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Aug 2011 07:02:01 +0000 Subject: [PATCH 097/504] Adding TFTP-HPA svn path=/nixpkgs/trunk/; revision=28915 --- pkgs/servers/squid/squids.nix | 27 ++++++------ pkgs/tools/networking/tftp-hpa/default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++++- 3 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 pkgs/tools/networking/tftp-hpa/default.nix diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 02da81b3a7a..1c64109d5cc 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -2,13 +2,13 @@ args: with args; let edf = composableDerivation.edf; in rec { squid30 = composableDerivation.composableDerivation {} { - name = "squid-3.0-stable5"; + name = "squid-3.0-stable26"; buildInputs = [perl]; src = args.fetchurl { - url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2; - sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w"; + url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE26.tar.bz2; + sha256 = "3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4"; }; configureFlags = ["--enable-ipv6"]; @@ -21,22 +21,25 @@ rec { }; - squid3Beta = squid30.merge { - name = "squid-3.1-beta"; + squid31 = squid30.merge { + name = "squid-3.1.15"; src = args.fetchurl { - url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.16.tar.bz2; - sha256 = "0pjz8dj04146hgdlfh0hbwdsdahsicdkafj5z9nkghbjavj1x5ny"; + url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2; + sha256 = "1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35"; }; configureFlags = ["--enable-ipv6"]; }; - squid3Head = squid3Beta.merge { - name = "squid-3.1-HEAD"; + squid32Beta = squid30.merge { + name = "squid-3.2.0.11"; src = args.fetchurl { - url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3-20081221.tar.bz2; - md5 = "345b50251dcc369e1be992d0a4a4c801"; + url = http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.0.11.tar.bz2; + sha256 = "aa5b9a85e1a90c4adb591c3e796c3fdfb166d8d2c814165d70692636321f69ae"; }; + configureFlags = ["--enable-ipv6"]; + buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 + libtool openssl]; }; - latest = squid3Beta; + latest = squid32Beta; } diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix new file mode 100644 index 00000000000..95420b48a30 --- /dev/null +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -0,0 +1,48 @@ +x@{builderDefsPackage + , tcp_wrappers + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="tftp-hpa"; + version="5.1"; + name="${baseName}-${version}"; + url="mirror://kernel/software/network/tftp/${name}.tar.bz2"; + hash="0k72s0c7wm4fyb6lqfypdkcy6rimanr49slimx8p0di69w394gzx"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "TFTP tools - a lot of fixes on top of BSD TFTP"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.bsd3; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.kernel.org/pub/software/network/tftp/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 261cefdc64d..50f16e05be7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1422,6 +1422,8 @@ let htmlTidy = callPackage ../tools/text/html-tidy { }; + tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; + tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; @@ -1566,6 +1568,8 @@ let xsel = callPackage ../tools/misc/xsel { }; + xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; + zdelta = callPackage ../tools/compression/zdelta { }; zile = callPackage ../applications/editors/zile { }; @@ -4920,9 +4924,11 @@ let sipwitch = callPackage ../servers/sip/sipwitch { }; squids = recurseIntoAttrs( import ../servers/squid/squids.nix { - inherit fetchurl stdenv perl lib composableDerivation; + inherit fetchurl stdenv perl lib composableDerivation + openldap pam db4 cyrus_sasl kerberos libcap expat libxml2 libtool + openssl; }); - squid = squids.squid3Beta; # has ipv6 support + squid = squids.squid31; # has ipv6 support tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; From fb37aed285161d0203790e5613b95418068d1cf2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 08:55:14 +0000 Subject: [PATCH 098/504] Dropped obsolete versions of haskell-HaXml. svn path=/nixpkgs/trunk/; revision=28917 --- .../libraries/haskell/HaXml/1.13.3.nix | 19 ------------------ .../libraries/haskell/HaXml/1.20.2.nix | 20 ------------------- .../libraries/haskell/HaXml/1.22.3.nix | 20 ------------------- .../haskell/HaXml/{1.22.5.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 13 +++--------- 5 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/HaXml/1.13.3.nix delete mode 100644 pkgs/development/libraries/haskell/HaXml/1.20.2.nix delete mode 100644 pkgs/development/libraries/haskell/HaXml/1.22.3.nix rename pkgs/development/libraries/haskell/HaXml/{1.22.5.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/HaXml/1.13.3.nix b/pkgs/development/libraries/haskell/HaXml/1.13.3.nix deleted file mode 100644 index 30794498a5a..00000000000 --- a/pkgs/development/libraries/haskell/HaXml/1.13.3.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HaXml"; - version = "1.13.3"; - sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://www.cs.york.ac.uk/fp/HaXml/"; - description = "Utilities for manipulating XML documents"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/HaXml/1.20.2.nix b/pkgs/development/libraries/haskell/HaXml/1.20.2.nix deleted file mode 100644 index 2adab3b7159..00000000000 --- a/pkgs/development/libraries/haskell/HaXml/1.20.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, polyparse, random }: - -cabal.mkDerivation (self: { - pname = "HaXml"; - version = "1.20.2"; - sha256 = "05kmr2ablinnrg3x1xr19g5kzzby322lblvcvhwbkv26ajwi0b63"; - isLibrary = true; - isExecutable = true; - buildDepends = [ polyparse random ]; - meta = { - homepage = "http://www.cs.york.ac.uk/fp/HaXml/"; - description = "Utilities for manipulating XML documents"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.3.nix b/pkgs/development/libraries/haskell/HaXml/1.22.3.nix deleted file mode 100644 index 99c692093f7..00000000000 --- a/pkgs/development/libraries/haskell/HaXml/1.22.3.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, polyparse, random }: - -cabal.mkDerivation (self: { - pname = "HaXml"; - version = "1.22.3"; - sha256 = "10gbax7nih45ck5fg056gnfgzr7zyndxpvdhvx3af2wnrmilkcbh"; - isLibrary = true; - isExecutable = true; - buildDepends = [ polyparse random ]; - meta = { - homepage = "http://www.cs.york.ac.uk/fp/HaXml/"; - description = "Utilities for manipulating XML documents"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.5.nix b/pkgs/development/libraries/haskell/HaXml/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/HaXml/1.22.5.nix rename to pkgs/development/libraries/haskell/HaXml/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6ba0a746186..7d4893cc3be 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -693,18 +693,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; - haxr = callPackage ../development/libraries/haskell/haxr { - HaXml = self.HaXml_1_22_5; - }; + haxr = callPackage ../development/libraries/haskell/haxr {}; + haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; - HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {}; - HaXml_1_20_2 = callPackage ../development/libraries/haskell/HaXml/1.20.2.nix {}; - HaXml_1_22_5 = callPackage ../development/libraries/haskell/HaXml/1.22.5.nix {}; - HaXml113 = self.HaXml_1_13_3; - HaXml120 = self.HaXml_1_20_2; - HaXml122 = self.HaXml_1_22_5; - HaXml = self.HaXml120; + HaXml = callPackage ../development/libraries/haskell/HaXml {}; HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; From 61dd4707c98eae63de1f3597e2c5f494f4c3c4b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:17:22 +0000 Subject: [PATCH 099/504] haskell-SHA: updated to version 1.5.0.0 svn path=/nixpkgs/trunk/; revision=28918 --- pkgs/development/libraries/haskell/SHA/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index 2dc931e3c03..659b06f72b7 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SHA"; - version = "1.4.1.3"; - sha256 = "1sx68mvzb2y3dq9hk769fzp8vw4jf4hk5v45i0a9a8b31imlicf0"; + version = "1.5.0.0"; + sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck"; isLibrary = true; isExecutable = true; buildDepends = [ binary ]; From d0803ce5c8c0a52db756daad8cc2574d20328f40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:17:26 +0000 Subject: [PATCH 100/504] haskell-largeword: updated to version 1.0.1 svn path=/nixpkgs/trunk/; revision=28919 --- pkgs/development/libraries/haskell/largeword/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index e526c757fd7..d6716abe55f 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "largeword"; - version = "1.0.0"; - sha256 = "1122isizlx807zv26j0sx71iw39nn3sja6mr2pf4sd456m1vmx8r"; + version = "1.0.1"; + sha256 = "0kkkck220wap3ad2k6461ylhshiqbizv0qh35i2325fhqx892gyr"; meta = { homepage = "http://trac.haskell.org/largeword/wiki"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; From f17a4bc77e9f894f4ff049bb5b570f1e631256f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:17:30 +0000 Subject: [PATCH 101/504] haskell-pool: updated to version 0.1.1 svn path=/nixpkgs/trunk/; revision=28920 --- pkgs/development/libraries/haskell/pool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix index eae26f81b3a..51befe00ce4 100644 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ b/pkgs/development/libraries/haskell/pool/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "pool"; - version = "0.1.0.4"; - sha256 = "11jsls81njkwhn48xdyrqydhr4yz82g7a6pji80ckplkdyycgx6p"; + version = "0.1.1"; + sha256 = "0h498pi7048m4cida10s28dp9f8c2ig3m4s9chwrfw3yiyai926l"; buildDepends = [ monadControl transformers ]; meta = { - homepage = "http://github.com/snoyberg/pool"; + homepage = "http://www.yesodweb.com/book/persistent"; description = "Thread-safe resource pools"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From d26f4612b1b26cc75b1544e7f06a360498905d99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:17:34 +0000 Subject: [PATCH 102/504] haskell-random-fu: updated to version 0.2.1.0 svn path=/nixpkgs/trunk/; revision=28921 --- pkgs/development/libraries/haskell/random-fu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index feb82912195..a094ee687e6 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "random-fu"; - version = "0.2"; - sha256 = "1w5bqhhh07xr377whgfbzn57p77j8ng5nmy2rx8qnqyw8smlkxzm"; + version = "0.2.1.0"; + sha256 = "0jm91xjrlzj25f3giiv2ka5r8bn1ircj56d5lpqixi7c7r9dc804"; buildDepends = [ erf gamma monadLoops mtl randomShuffle randomSource rvar syb transformers vector From 3775dea86f7d4d7c28156e7f5f870f9d018f0ced Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:17:38 +0000 Subject: [PATCH 103/504] haskell-warp: updated to version 0.4.4 svn path=/nixpkgs/trunk/; revision=28922 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 50c046b8975..843a931ef35 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "0.4.3.1"; - sha256 = "19cj4jhl647gyy6nl3x2vi6v4g0y9q3w5a5lxvvfnfwgmcqnq3lk"; + version = "0.4.4"; + sha256 = "1mlwny6pfgngpqb4lh6v373m98agf275mbl2p6mxxfh1581fz863"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator httpTypes network simpleSendfile transformers unixCompat wai From 1392096d69d49ea3b2b92b2a28edf6052fada14c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:49:04 +0000 Subject: [PATCH 104/504] Updated the default version of haskell-text to 0.11.1.5. A growing number of packages don't build with the old version. I was reluctant to make that change because Haskell Platform 2011.2.0.1 says that text 0.11.0.6 ought to be used, but then HP says we shouldn't be using GHC 7.0.4 either, yet we do. Anyway, upgrading the text library caused no problems: all packages just built fine, so there you go. svn path=/nixpkgs/trunk/; revision=28923 --- pkgs/top-level/haskell-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7d4893cc3be..0e0ec19554c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -193,6 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; + text = self.text_0_11_1_5; }; haskellPlatform_2011_2_0_1 = @@ -525,9 +526,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dotgen = callPackage ../development/libraries/haskell/dotgen {}; - doubleConversion = callPackage ../development/libraries/haskell/double-conversion { - text = self.text_0_11_1_5; - }; + doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; editline = callPackage ../development/libraries/haskell/editline { inherit (pkgs) libedit; @@ -1168,7 +1167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text = self.text_0_11_0_5; + text = self.text_0_11_1_5; thLift = callPackage ../development/libraries/haskell/th-lift {}; From 84ff2da8c1efea8f65fe289b9337440c9f794826 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:49:08 +0000 Subject: [PATCH 105/504] haskell-aeson: updated to version 0.3.2.11 svn path=/nixpkgs/trunk/; revision=28924 --- pkgs/development/libraries/haskell/aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 1edd45f6aa2..db31abd7bb5 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.3.2.9"; - sha256 = "1qaajk797zpickw4ik5lc03wnmxkrcmv3zik7n1bjqx6h37h0zqw"; + version = "0.3.2.11"; + sha256 = "0cvavxb3bm5kz491wrx5az5scvddndw2rh45snhj1xn0flr1c2n7"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text time unorderedContainers vector From 92e3a9c6dcb06ef877cd77f5578cf3f694d7fc5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Aug 2011 09:49:12 +0000 Subject: [PATCH 106/504] haskell-blaze-textual: updated to version 0.2.0.4 svn path=/nixpkgs/trunk/; revision=28925 --- .../libraries/haskell/blaze-textual/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index 0c405bac523..deb1e3caa78 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, text, time, vector }: +{ cabal, blazeBuilder, doubleConversion, text, time, vector }: cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.1.0.0"; - sha256 = "0ql25b0r4xbshqsjfndl7glq0hp2ncxb3h5zd541vsqrqrf8y4gk"; - buildDepends = [ blazeBuilder text time vector ]; + version = "0.2.0.4"; + sha256 = "0bifxyzm35xvlqry06iv6pqgx1d33jnrvpmn4wnydkyg1r7q3k9v"; + buildDepends = [ blazeBuilder doubleConversion text time vector ]; meta = { homepage = "http://github.com/mailrank/blaze-textual"; description = "Fast rendering of common datatypes"; From e84b9edc780b204b5f8e7513abc69d8c24a1e93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Aug 2011 13:08:33 +0000 Subject: [PATCH 107/504] Merge from the `darwin-updates' branch. svn path=/nixpkgs/trunk/; revision=28926 --- .../compilers/gcc-apple64/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc-apple64/default.nix index ec16fae7977..ffb29da2f80 100644 --- a/pkgs/development/compilers/gcc-apple64/default.nix +++ b/pkgs/development/compilers/gcc-apple64/default.nix @@ -8,23 +8,29 @@ assert langC; assert stdenv.isDarwin; assert langF77 -> gmp != null; +let + version = "4.2.1"; # Upstream GCC version, from `gcc/BASE-VER'. + revision = "5666.3"; # Apple's fork revision number. +in stdenv.mkDerivation ({ - name = "gcc-4.2.1-apple-5646"; + name = "gcc-apple-${version}.${revision}"; + builder = ./builder.sh; - src = + + src = stdenv.lib.optional /*langC*/ true (fetchurl { - url = http://www.opensource.apple.com/tarballs/gcc/gcc-5646.tar.gz; - sha256 = "13jghyb098104kfym96iwwdvbj6snnws2c92h48lbd4fmyf1iv24"; + url = "http://www.opensource.apple.com/tarballs/gcc/gcc-${revision}.tar.gz"; + sha256 = "0nq1szgqx9ryh1qsn5n6yd55gpvf56wr8f7w1jzabb8idlvz8ikc"; }) ++ stdenv.lib.optional langCC (fetchurl { url = http://www.opensource.apple.com/tarballs/libstdcxx/libstdcxx-39.tar.gz ; - sha256 = "1fy6j41rhxdsm19sib9wygjl5l54g8pm13c6y5x13f40mavw1mma"; + sha256 = "ccf4cf432c142778c766affbbf66b61001b6c4f1107bc2b2c77ce45598786b6d"; }) ; enableParallelBuilding = true; libstdcxx = "libstdcxx-39"; - sourceRoot = "gcc-5646/"; + sourceRoot = "gcc-${revision}/"; patches = [./pass-cxxcpp.patch ] ++ (if noSysDirs then [./no-sys-dirs.patch] else []); From 72c9b2f62e00a9dad3c4fb2832675fda7488fe80 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 30 Aug 2011 13:25:11 +0000 Subject: [PATCH 108/504] linux-3.0.nix: Bump to 3.0.4 svn path=/nixpkgs/trunk/; revision=28927 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 94e43a01134..3d01e83858f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -199,11 +199,11 @@ in import ./generic.nix ( rec { - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1237i7a4r7a7p24ylx7wv8k34ni17lxg849xjyv54px84kbkb85n"; + sha256 = "1vypjcdii75h5f4zsw9lm8wzxd5ix0mk5p94c96hxv828mqqkmhk"; }; config = configWithPlatform stdenv.platform; From 5058e62c564638d4836b5ff89c839a044ad02743 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 30 Aug 2011 13:25:23 +0000 Subject: [PATCH 109/504] linux-3.1: Bump to rc4 svn path=/nixpkgs/trunk/; revision=28928 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index a2b1fcfb86f..a513dc0f057 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -199,13 +199,13 @@ in import ./generic.nix ( rec { - version = "3.1-rc3"; + version = "3.1-rc4"; - modDirVersion = "3.1.0-rc3"; + modDirVersion = "3.1.0-rc4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2"; - sha256 = "0ky6pawracgc27m0d4mq71f87yiwbp90k5aqn8qh5bdfq3ml84i6"; + sha256 = "1inb4iyj9r7lk68bw1mznxk726n3cxcbylqnb62ycisi1z2gxwjw"; }; config = configWithPlatform stdenv.platform; From 9496f3767b9503f115aa93e716253d0fa2c33116 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 30 Aug 2011 13:46:05 +0000 Subject: [PATCH 110/504] gcc-apple64: Enable Objective C darwin-updates was just merged, so I'm taking the liberty of messing with darwin's stdenv svn path=/nixpkgs/trunk/; revision=28929 --- pkgs/development/compilers/gcc-apple64/builder.sh | 3 +++ pkgs/development/compilers/gcc-apple64/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-apple64/builder.sh b/pkgs/development/compilers/gcc-apple64/builder.sh index ce0baa1597a..6072aef9d59 100644 --- a/pkgs/development/compilers/gcc-apple64/builder.sh +++ b/pkgs/development/compilers/gcc-apple64/builder.sh @@ -61,6 +61,9 @@ preConfigure() { if test -n "$langF77"; then langs="$langs,f95" fi + if test -n "$langObjC"; then + langs="$langs,objc" + fi # Perform the build in a different directory. mkdir ../build diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc-apple64/default.nix index ffb29da2f80..e2f70fbc1f5 100644 --- a/pkgs/development/compilers/gcc-apple64/default.nix +++ b/pkgs/development/compilers/gcc-apple64/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false +, langC ? true, langCC ? true, langObjC ? true, langF77 ? false , profiledCompiler ? false , gmp ? null, mpfr ? null, bison ? null, flex ? null }: @@ -34,5 +34,5 @@ stdenv.mkDerivation ({ patches = [./pass-cxxcpp.patch ] ++ (if noSysDirs then [./no-sys-dirs.patch] else []); - inherit noSysDirs langC langCC langF77 profiledCompiler; + inherit noSysDirs langC langCC langF77 langObjC profiledCompiler; } // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {})) From c529cc17f09031a89f8a2e3b7421e2f9e28e52fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Aug 2011 18:25:07 +0000 Subject: [PATCH 111/504] * dosfstools updated to 3.0.11. svn path=/nixpkgs/trunk/; revision=28933 --- pkgs/tools/filesystems/dosfstools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index f5e51430af3..21e2ceea9dd 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dosfstools-3.0.9"; + name = "dosfstools-3.0.11"; src = fetchurl { url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"; - sha256 = "13s5s0hvhmn7r4ppqmw8nqgdm5v5vc6r5j44kn87wl5cmrpnfqrz"; + sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll"; }; makeFlags = "PREFIX=$(out)"; From a63bf23f322cbeddec3b5fffb8197b705c56b547 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 30 Aug 2011 19:50:36 +0000 Subject: [PATCH 112/504] add enum-0.4.4 svn path=/nixpkgs/trunk/; revision=28935 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08b0281e66c..b2fc7b7cf7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -373,6 +373,25 @@ let pythonPackages = python.modules // rec { }; + enum = buildPythonPackage rec { + name = "enum-0.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz"; + md5 = "ce75c7c3c86741175a84456cc5bd531e"; + }; + + buildInputs = [ ]; + + propagatedBuildInputs = [ ]; + + meta = { + homepage = http://pypi.python.org/pypi/enum/; + description = "Robust enumerated type support in Python."; + }; + }; + + eventlet = buildPythonPackage rec { name = "eventlet-0.9.16"; From 4c7418cb29b5b7f36e580af023d2583a56a8f313 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 30 Aug 2011 19:57:29 +0000 Subject: [PATCH 113/504] add protobuf based on the default version in nixpkgs svn path=/nixpkgs/trunk/; revision=28936 --- pkgs/top-level/python-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2fc7b7cf7a..2efb8a9fe8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1180,6 +1180,19 @@ let pythonPackages = python.modules // rec { }; + protobuf = buildPythonPackage rec { + inherit (pkgs.protobuf) name src; + + propagatedBuildInputs = [pkgs.protobuf]; + sourceRoot = "${name}/python"; + + meta = { + description = "Protocol Buffers are Google's data interchange format."; + homepage = http://code.google.com/p/protobuf/; + }; + }; + + psycopg2 = buildPythonPackage rec { name = "psycopg2-2.0.13"; From a4993d3b233cbd690270da3af9b7cd530c0967b6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Aug 2011 09:12:56 +0000 Subject: [PATCH 114/504] * Firefox 6.0.1, 3.6.21. svn path=/nixpkgs/trunk/; revision=28937 --- pkgs/applications/networking/browsers/firefox/3.6.nix | 6 +++--- pkgs/applications/networking/browsers/firefox/6.0.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 9c3c6c72cc6..47754d67f3c 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6.16"; + firefoxVersion = "3.6.21"; - xulVersion = "1.9.2.16"; # this attribute is used by other packages + xulVersion = "1.9.2.21"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "38124597440b7d60aa568adeef23659575841e92"; + sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c"; }; diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix index 15ddc4bffdd..85a467a641e 100644 --- a/pkgs/applications/networking/browsers/firefox/6.0.nix +++ b/pkgs/applications/networking/browsers/firefox/6.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "6.0"; + firefoxVersion = "6.0.1"; - xulVersion = "6.0"; # this attribute is used by other packages + xulVersion = "6.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "0ws96gc1mkmilgsikirhmqc6s7m0bcyh58820l08wd82r9abagyc"; + sha256 = "08pklavbb6miaav07a8liw17k8nnh3i97plz8l9pdclan4aczb3i"; }; From 577ddef0be7eba5ac1da20c4537a390644382305 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2011 11:55:51 +0000 Subject: [PATCH 115/504] antiword: added version 0.37 svn path=/nixpkgs/trunk/; revision=28938 --- pkgs/applications/office/antiword/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/office/antiword/default.nix diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix new file mode 100644 index 00000000000..e3f80d76c4e --- /dev/null +++ b/pkgs/applications/office/antiword/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv }: + +let + name = "antiword-0.37"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "http://www.winfield.demon.nl/linux/${name}.tar.gz"; + sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; + }; + + installFlags = "GLOBAL_INSTALL_DIR=$$out/bin GLOBAL_RESOURCES_DIR=$$out/share/antiword"; + installTargets = "global_install"; + + meta = { + homepage = "http://www.winfield.demon.nl/"; + description = "convert MS Word documents to plain text or PostScript"; + license = stdenv.lib.licenses.gpl2; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f16e05be7..9dd103db861 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6121,6 +6121,8 @@ let libstdcpp = gcc33.gcc; }; + antiword = callPackage ../applications/office/antiword {}; + ardour = callPackage ../applications/audio/ardour { inherit (gtkLibs) glib pango gtk glibmm gtkmm; inherit (gnome) libgnomecanvas; From 614551f9b4af13f5e19e8c3bf58f325b7672a87d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2011 12:06:27 +0000 Subject: [PATCH 116/504] antiword: patch source code so that the tool can find it's data files svn path=/nixpkgs/trunk/; revision=28939 --- pkgs/applications/office/antiword/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index e3f80d76c4e..c4da2b609ce 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation { sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; - installFlags = "GLOBAL_INSTALL_DIR=$$out/bin GLOBAL_RESOURCES_DIR=$$out/share/antiword"; + patchPhase = '' + sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h + ''; + installTargets = "global_install"; meta = { From fe445aa5b213860ad6c1b605f9d4c6aa1df4a021 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2011 12:40:53 +0000 Subject: [PATCH 117/504] haskell-xhtml: added version 3000.2.0.2 svn path=/nixpkgs/trunk/; revision=28940 --- .../libraries/haskell/xhtml/3000.2.0.2.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/xhtml/3000.2.0.2.nix diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.2.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.2.nix new file mode 100644 index 00000000000..c098cf80cee --- /dev/null +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.2.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "xhtml"; + version = "3000.2.0.2"; + sha256 = "14xfx4kmcl6xjn7lnpjd975wh8xakfpd8clcm5bw5n3g0b7agfli"; + meta = { + description = "An XHTML combinator library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0e0ec19554c..b65394a7dd7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1278,6 +1278,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; + xhtml_3000_2_0_2 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.2.nix {}; xhtml = self.xhtml_3000_2_0_1; xml = callPackage ../development/libraries/haskell/xml {}; From 6358071c14a8cadc1dfddb526dcf08c1aaea24c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2011 12:40:57 +0000 Subject: [PATCH 118/504] haskell-ListLike: updated to version 3.1.2 svn path=/nixpkgs/trunk/; revision=28941 --- pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 47604057529..1d89afe5968 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.1"; - sha256 = "16q1rsjr9rjlm8iwmr32s1yfcpw0xj34hvb8jfjqyfsail6nh9fh"; + version = "3.1.2"; + sha256 = "1fa2y8yc0ppmh37alc20a75gpb90i8s3pgnh3kg8n0577gvhjhzz"; isLibrary = true; isExecutable = true; meta = { From 4758e8a71a1eebc34472a97125b4c9ba038856c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2011 12:41:01 +0000 Subject: [PATCH 119/504] haskell-clientsession: updated to version 0.7.2 svn path=/nixpkgs/trunk/; revision=28942 --- .../libraries/haskell/clientsession/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 521f2f5e847..166e261836f 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,10 +1,14 @@ -{ cabal, base64Bytestring, cryptoApi, cryptocipher }: +{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher +, cryptohash +}: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.0"; - sha256 = "08a6k0dqx9qp7j87iq6kmyzg1aw8ykc7vrbzdbr1lfkwh05dvglm"; - buildDepends = [ base64Bytestring cryptoApi cryptocipher ]; + version = "0.7.2"; + sha256 = "0jfpgzfgcmc80qrzxj6dsg6cbd97pscg5yp99c9f58m4igr3fb2q"; + buildDepends = [ + base64Bytestring cereal cryptoApi cryptocipher cryptohash + ]; meta = { homepage = "http://github.com/snoyberg/clientsession/tree/master"; description = "Store session data in a cookie"; From 04b1ac31da9885e3b1893a98e5280b8f9a039652 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2011 12:41:06 +0000 Subject: [PATCH 120/504] haskell-http-enumerator: updated to version 0.6.7 svn path=/nixpkgs/trunk/; revision=28943 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 034d24afa98..b92d69ec80b 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.6.6"; - sha256 = "0bmrj0jhjvqpx2kgpy5sz6sx17cxbpv07975n1055vgyzv1lcx07"; + version = "0.6.7"; + sha256 = "13x8p0dfaq2nkqh9ym7rbslnacvmdf5v1lpny2cia2im09hd1xbi"; isLibrary = true; isExecutable = true; buildDepends = [ From 7a0fe943aaa008c4363a85bb2733a0ca0c9f4a8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2011 19:05:10 +0000 Subject: [PATCH 121/504] haskell-fclabels: updated to version 1.0.4 svn path=/nixpkgs/trunk/; revision=28945 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 01b3c71b4e2..b2a6142bbaf 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.0.3"; - sha256 = "0sl45pv18qfyphixl9qyng5m6i19c9n18izkm278z6fvih2x5wd0"; + version = "1.0.4"; + sha256 = "051ryqjzc74lnlbdd1ngxgqj56p43ls5xhafmldnyhkv75x59svw"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From cd68b91a4f91c98a7edd3473f5846defd5456420 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 1 Sep 2011 06:15:12 +0000 Subject: [PATCH 122/504] Update Vacuum svn path=/nixpkgs/trunk/; revision=28948 --- .../networking/instant-messengers/vacuum/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 41658be08a9..6b8b7a9419d 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,6 +1,7 @@ x@{builderDefsPackage , qt4, openssl , xproto, libX11, libXScrnSaver, scrnsaverproto + , xz , ...}: builderDefsPackage (a : @@ -11,11 +12,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="1.1.0"; - baseName="vacuum"; + version="1.1.1"; + baseName="vacuum-im"; name="${baseName}-${version}"; - url="http://vacuum-im.googlecode.com/files/${name}.tar.gz"; - hash="c956b0cf5cc0a1acee47a96f0b0e7ab5d716e48cac4a7fcbca496f901a219dcc"; + url="http://vacuum-im.googlecode.com/files/${name}.tar.xz"; + hash="b4b3472bf83173f6be1bbe69520bf6cab97e24cf9fd8a7b60e4ffdc1cb43b1dc"; }; in rec { @@ -28,7 +29,7 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["preBuild" "doQMake" "doMakeInstall"]; + phaseNames = ["addInputs" "preBuild" "doQMake" "doMakeInstall"]; preBuild = a.fullDepEntry ('' echo "Fixing a name collision with a function added in Qt 4.7" From e7418b271cacb1add80c4f05308361991a661dc3 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 1 Sep 2011 10:02:56 +0000 Subject: [PATCH 123/504] bluez 4.95 -> 4.96 svn path=/nixpkgs/trunk/; revision=28952 --- pkgs/os-specific/linux/bluez/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index c0aec5a7b56..598ee26124f 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { - name = "bluez-4.95"; + name = "bluez-4.96"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "1xi087x2ggdywq63qp55wvi1iclk50hc42fp40kcsazw23j9vsnn"; + sha256 = "16gshw7xgl0k3j3qgkdqmgvzqz6fdcna909ibvawl2brsw7xavy0"; }; buildInputs = From 754fb9cc29e766c5c5e99695975fcebe3f1c55fa Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 1 Sep 2011 10:03:01 +0000 Subject: [PATCH 124/504] make blueman create the audio sink/source via pulse svn path=/nixpkgs/trunk/; revision=28953 --- pkgs/tools/bluetooth/blueman/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index bbc2f0b4878..095337d1251 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk , notify, pythonDBus, bluez, glib, gtk, libstartup_notification , makeWrapper, xdg_utils, obex_data_server +, pulseaudio }: stdenv.mkDerivation rec { @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { for i in $out/bin/* $out/libexec/*; do wrapProgram $i \ --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \ + --set LD_LIBRARY_PATH "${pulseaudio}/lib:" \ --prefix PATH : ${xdg_utils}/bin done From 80db090ed7c98d5ec0b2e3fe9b40105264316bb1 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 1 Sep 2011 10:03:06 +0000 Subject: [PATCH 125/504] add bluetooth audio support for linux 3.0 and 3.1. svn path=/nixpkgs/trunk/; revision=28954 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.1.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 3d01e83858f..1b685cd2d94 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -149,6 +149,7 @@ let BT_HCIUART_H4 y # UART (H4) protocol support BT_HCIUART_LL y BT_L2CAP y + BT_SCO y # audio support BT_RFCOMM m BT_RFCOMM_TTY y # RFCOMM TTY support CRASH_DUMP n diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index a513dc0f057..4f0f6380ae3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -149,6 +149,7 @@ let BT_HCIUART_H4 y # UART (H4) protocol support BT_HCIUART_LL y BT_L2CAP y + BT_SCO y # audio support BT_RFCOMM m BT_RFCOMM_TTY y # RFCOMM TTY support CRASH_DUMP n From a02960ae4e6bfd01b7a66b69d43fbfafa31165ad Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 1 Sep 2011 13:38:59 +0000 Subject: [PATCH 126/504] Add clojure. (Install with command nix-env -i clojure-wrapper start REPL with command clojure) svn path=/nixpkgs/trunk/; revision=28956 --- .../interpreters/clojure/binary.nix | 45 +++++++++++++++++++ .../interpreters/clojure/default.nix | 44 ++++++++++++++++++ .../interpreters/clojure/wrapper.nix | 11 +++++ pkgs/top-level/all-packages.nix | 9 ++++ 4 files changed, 109 insertions(+) create mode 100644 pkgs/development/interpreters/clojure/binary.nix create mode 100644 pkgs/development/interpreters/clojure/default.nix create mode 100644 pkgs/development/interpreters/clojure/wrapper.nix diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix new file mode 100644 index 00000000000..39b98b0843c --- /dev/null +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "clojure-binary-1.2.1"; + + src = fetchurl { + url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; + sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; + }; + + buildInputs = [ unzip ]; + + phases = "unpackPhase installPhase"; + + installPhase = " + ensureDir $out/lib/java + install -t $out/lib/java clojure.jar + "; + + + meta = { + description = "a Lisp dialect for the JVM"; + homepage = http://clojure.org/; + license = stdenv.lib.licenses.bsd3; + longDescription = '' + Clojure is a dynamic programming language that targets the Java + Virtual Machine. It is designed to be a general-purpose language, + combining the approachability and interactive development of a + scripting language with an efficient and robust infrastructure for + multithreaded programming. Clojure is a compiled language - it + compiles directly to JVM bytecode, yet remains completely + dynamic. Every feature supported by Clojure is supported at + runtime. Clojure provides easy access to the Java frameworks, with + optional type hints and type inference, to ensure that calls to Java + can avoid reflection. + + Clojure is a dialect of Lisp, and shares with Lisp the code-as-data + philosophy and a powerful macro system. Clojure is predominantly a + functional programming language, and features a rich set of immutable, + persistent data structures. When mutable state is needed, Clojure + offers a software transactional memory system and reactive Agent + system that ensure clean, correct, multithreaded designs. + ''; + }; +} diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix new file mode 100644 index 00000000000..f829beda7ba --- /dev/null +++ b/pkgs/development/interpreters/clojure/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, unzip, ant}: + +stdenv.mkDerivation { + name = "clojure-1.2.1"; + + src = fetchurl { + url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; + sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; + }; + + buildInputs = [ unzip ant ]; + + buildPhase = "ant"; + + installPhase = " + ensureDir $out/lib/java + install -t $out/lib/java clojure.jar + "; + + meta = { + description = "a Lisp dialect for the JVM"; + homepage = http://clojure.org/; + license = stdenv.lib.licenses.bsd3; + longDescription = '' + Clojure is a dynamic programming language that targets the Java + Virtual Machine. It is designed to be a general-purpose language, + combining the approachability and interactive development of a + scripting language with an efficient and robust infrastructure for + multithreaded programming. Clojure is a compiled language - it + compiles directly to JVM bytecode, yet remains completely + dynamic. Every feature supported by Clojure is supported at + runtime. Clojure provides easy access to the Java frameworks, with + optional type hints and type inference, to ensure that calls to Java + can avoid reflection. + + Clojure is a dialect of Lisp, and shares with Lisp the code-as-data + philosophy and a powerful macro system. Clojure is predominantly a + functional programming language, and features a rich set of immutable, + persistent data structures. When mutable state is needed, Clojure + offers a software transactional memory system and reactive Agent + system that ensure clean, correct, multithreaded designs. + ''; + }; +} diff --git a/pkgs/development/interpreters/clojure/wrapper.nix b/pkgs/development/interpreters/clojure/wrapper.nix new file mode 100644 index 00000000000..a2a9a404462 --- /dev/null +++ b/pkgs/development/interpreters/clojure/wrapper.nix @@ -0,0 +1,11 @@ +{writeTextFile, jre, clojure}: + +writeTextFile { + name = "clojure-wrapper"; + executable = true; + destination = "/bin/clojure"; + text = '' + #!/bin/sh + exec ${jre}/bin/java -cp ${clojure}/lib/java/clojure.jar clojure.main + ''; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dd103db861..66cc1b4dfd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2447,6 +2447,15 @@ let clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix { libsigsegv = libsigsegv_25; }; + clojure = callPackage ../development/interpreters/clojure { }; + + clojure_binary = callPackage ../development/interpreters/clojure/binary.nix { }; + + clojure_wrapper = callPackage ../development/interpreters/clojure/wrapper.nix { + #clojure = clojure_binary; + }; + + erlang = callPackage ../development/interpreters/erlang { }; erlangR13B = callPackage ../development/interpreters/erlang/R13B.nix { }; From 8fa5d91e51e531bb28034d1cce73bc00f847509f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 1 Sep 2011 13:41:42 +0000 Subject: [PATCH 127/504] adding VUE mindmapper svn path=/nixpkgs/trunk/; revision=28957 --- pkgs/applications/misc/vue/default.nix | 52 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/misc/vue/default.nix diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix new file mode 100644 index 00000000000..3f536ec21c1 --- /dev/null +++ b/pkgs/applications/misc/vue/default.nix @@ -0,0 +1,52 @@ +x@{builderDefsPackage + , jre, unzip + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="vue"; + version="3.1.1"; + name="${baseName}-${version}"; + url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_1.zip"; + hash="1wq2mdvfm7c4vhs9ivl7n3w9ncwyrjgdgycbapzd6l1nym5iz76y"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doDeploy"]; + + doDeploy = a.fullDepEntry '' + unzip ${src} + ensureDir "$out"/{share/vue,bin} + cp VUE.jar "$out/share/vue/vue.jar" + echo '#!${a.stdenv.shell}' >> "$out/bin/vue" + echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" + chmod a+x "$out/bin/vue" + '' ["addInputs" "defEnsureDir"]; + + meta = { + description = "Visual Understanding Environment - mind mapping software"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "free-noncopyleft"; # Apache License fork, actually + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66cc1b4dfd7..9c9ff22d392 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7343,6 +7343,8 @@ let vorbisTools = callPackage ../applications/audio/vorbis-tools { }; + vue = callPackage ../applications/misc/vue {}; + vwm = callPackage ../applications/window-managers/vwm { }; w3m = callPackage ../applications/networking/browsers/w3m { From 70c47021a78fa7c6ef964973b08f13c1cb0d5231 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Sep 2011 17:59:22 +0000 Subject: [PATCH 128/504] haskell-xhtml: updated to version 3000.2.0.4 svn path=/nixpkgs/trunk/; revision=28962 --- .../haskell/xhtml/{3000.2.0.2.nix => 3000.2.0.4.nix} | 5 +++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/xhtml/{3000.2.0.2.nix => 3000.2.0.4.nix} (69%) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.2.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix similarity index 69% rename from pkgs/development/libraries/haskell/xhtml/3000.2.0.2.nix rename to pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix index c098cf80cee..33527b9affd 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.2.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "xhtml"; - version = "3000.2.0.2"; - sha256 = "14xfx4kmcl6xjn7lnpjd975wh8xakfpd8clcm5bw5n3g0b7agfli"; + version = "3000.2.0.4"; + sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw"; meta = { + homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b65394a7dd7..d346f60fd61 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1278,7 +1278,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; - xhtml_3000_2_0_2 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.2.nix {}; + xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; xhtml = self.xhtml_3000_2_0_1; xml = callPackage ../development/libraries/haskell/xml {}; From 7e165bb55911986097e25588138fa1d8b1ea5c39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Sep 2011 17:59:26 +0000 Subject: [PATCH 129/504] haskell-ranges: updated to version 0.2.4 svn path=/nixpkgs/trunk/; revision=28963 --- pkgs/development/libraries/haskell/ranges/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix index d7c20f57123..0ba35027050 100644 --- a/pkgs/development/libraries/haskell/ranges/default.nix +++ b/pkgs/development/libraries/haskell/ranges/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ranges"; - version = "0.2.3"; - sha256 = "1jmybrwwvg8zkbxjrlrahfavlf2g2584ld15hzhch317683nvr1p"; + version = "0.2.4"; + sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv"; meta = { description = "Ranges and various functions on them"; license = self.stdenv.lib.licenses.bsd3; From 9221fafcb17ee5ab2807f1dfe67d04188d8e6a6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Sep 2011 17:59:30 +0000 Subject: [PATCH 130/504] haskell-regular: updated to version 0.3.3 svn path=/nixpkgs/trunk/; revision=28964 --- pkgs/development/libraries/haskell/regular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 8dd7e04ec79..4b4e5458df2 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "regular"; - version = "0.3.2"; - sha256 = "104rz28a22p5pn3rdzvmh13s1hpr46n463cfaz3w3bj9cimi2rcj"; + version = "0.3.3"; + sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7"; meta = { description = "Generic programming library for regular datatypes"; license = self.stdenv.lib.licenses.bsd3; From dfc019ad4980950acc852539e9e75a66e8d7f9e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Sep 2011 17:59:34 +0000 Subject: [PATCH 131/504] haskell-yesod-core: updated to version 0.9.1.1 svn path=/nixpkgs/trunk/; revision=28965 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 947cad77d5e..10ea9aa2052 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.1"; - sha256 = "03dbn915g6jkwk9fp5naqv5bq613nlfpc8jd7568cc1l41b95cbf"; + version = "0.9.1.1"; + sha256 = "1cwywjks37i7411m6ab827q5vx1yjgnqn04am0bxzw001vciadm5"; buildDepends = [ blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie enumerator failure hamlet httpTypes monadControl parsec pathPieces From 236ba05e06e15b499a76844e32ebc92f46a184cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Sep 2011 17:59:38 +0000 Subject: [PATCH 132/504] haskell-yesod: updated to version 0.9.1.1 svn path=/nixpkgs/trunk/; revision=28966 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index e09faa1fd84..b649c9cfa1e 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.1"; - sha256 = "1ag3lca75lrriycbscspb5yyishacgxjx0rybc3x4z1dqnkn1r71"; + version = "0.9.1.1"; + sha256 = "1f1l9davhqdf6fnkcrclf2dvszqsw2jby7y865y4sgcb73jb32fp"; isLibrary = true; isExecutable = true; buildDepends = [ From 833eea615753f401bc246066af2cbe8e9c9d37b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Sep 2011 21:03:18 +0000 Subject: [PATCH 133/504] Updating fossil to 1.19. I can't still add readline as build input, because its new configuration code fails to cope with nix gcc detecting readline. svn path=/nixpkgs/trunk/; revision=28968 --- pkgs/applications/version-management/fossil/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 002226292b0..6bf401b895a 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl, zlib, openssl, tcl}: let - version = "1.18"; - filedate = "20110713230341"; + version = "1.19"; + filedate = "20110901182519"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz"; - sha256 = "065hp5hppzjzvvk9g8zaqbfms011rkiimydnfsgkp4s8jlc2h6dc"; + sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960"; }; buildInputs = [ zlib openssl ]; @@ -18,8 +18,6 @@ stdenv.mkDerivation { doCheck = true; - configurePhase = ":"; - checkTarget = "test"; installPhase = '' From 32754d3c19239c522bd080425bfc50ce20f1c7ed Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Sep 2011 08:05:51 +0000 Subject: [PATCH 134/504] Adding Regina-REXX interpreter svn path=/nixpkgs/trunk/; revision=28969 --- .../interpreters/regina/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/interpreters/regina/default.nix diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix new file mode 100644 index 00000000000..d8b3558be4f --- /dev/null +++ b/pkgs/development/interpreters/regina/default.nix @@ -0,0 +1,53 @@ +x@{builderDefsPackage + , ncurses + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="Regina-REXX"; + pname="regina-rexx"; + version="3.5"; + name="${baseName}-${version}"; + url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; + hash="0gh0k6lbhfixs44adha7lxirl3a08jabdylzr6m7mh5q5fhzv5f8"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + configureFlags = [ + "--libdir=$out/lib" + ]; + + meta = { + description = "REXX interpreter"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.lgpl2; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c9ff22d392..e180a1d86b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2576,6 +2576,8 @@ let inherit (gtkLibs) pango glib gtk; }; + regina = callPackage ../development/interpreters/regina {}; + ruby18 = callPackage ../development/interpreters/ruby { }; #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; }; ruby = ruby18; From 295089faae9aadef5fd6868a7d8ea30ec95e3c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 2 Sep 2011 08:57:12 +0000 Subject: [PATCH 135/504] Updating task spooler. svn path=/nixpkgs/trunk/; revision=28970 --- pkgs/tools/system/ts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 032b37a3868..be41b88c9e3 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { - name = "ts-0.6.6"; + name = "ts-0.7.0"; installPhase=''make install "PREFIX=$out"''; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.6.tar.gz; - sha256 = "0mdg123ppq8ibf4315l4qi0w3n7wlj4x8dq5gx8f680v4bjvc30g"; + url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.0.tar.gz; + sha256 = "1m9nf0299idkh355afk2c9v9qqpxm4ram3gyf8a9qv4f9gg6hprp"; }; meta = { From c084ef2f61c4ed2675129fa1fceb7259895c145a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 2 Sep 2011 11:11:48 +0000 Subject: [PATCH 136/504] * The latest and greatest Tribler. svn path=/nixpkgs/trunk/; revision=28971 --- pkgs/applications/networking/p2p/tribler/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 89c28ae3512..98da7cc2b95 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: +let rev = "22245"; in + stdenv.mkDerivation { - name = "tribler-5.3.9-pre21071"; + name = "tribler-5.4.2-pre${rev}"; src = fetchsvn { - url = http://svn.tribler.org/abc/branches/release-5.3.x; - rev = 21071; - sha256 = "0plzw5m9rligz66rbq8qr9sj0fiqx8gwmchdw3p4mwlwfx72gixm"; + url = http://svn.tribler.org/abc/branches/release-5.4.x; + inherit rev; + sha256 = "09b3iz3yy1dpl30cd2iningzhm1grz6qjgv0qb3wk0v1vxkacddz"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; From e8c849f8e342f677dbc1e748b515909d3a850baa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 2 Sep 2011 13:41:38 +0000 Subject: [PATCH 137/504] * Re-enable the fbcondecor patch for Linux 2.6.35, seems to work fine. svn path=/nixpkgs/trunk/; revision=28974 --- pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index d94c5f382a5..b08c4b9bb23 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -1,8 +1,7 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, ... }: +{ stdenv, fetchurl, extraConfig ? "", ... } @ args: let - configWithPlatform = kernelPlatform : + configWithPlatform = kernelPlatform: '' # Don't include any debug features. DEBUG_KERNEL n diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e180a1d86b2..8723ba72ff8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5392,7 +5392,7 @@ let linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ #kernelPatches.fbcondecor_2_6_35 + [ kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_35 kernelPatches.cifs_timeout_2_6_35 @@ -5659,7 +5659,7 @@ let linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); # The current default kernel / kernel modules. - linux = linux_2_6_32; + linux = linuxPackages.kernel; linuxPackages = linuxPackages_2_6_32; keyutils = callPackage ../os-specific/linux/keyutils { }; From 33afa205751d09060d40c291f237bbce79d2f761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 2 Sep 2011 15:11:52 +0000 Subject: [PATCH 138/504] Added HDBC-odbc. svn path=/nixpkgs/trunk/; revision=28975 --- .../libraries/haskell/HDBC/HDBC-odbc.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix new file mode 100644 index 00000000000..0b918dc4c85 --- /dev/null +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -0,0 +1,22 @@ +{ cabal, HDBC, mtl, odbc, time, utf8String }: + +cabal.mkDerivation (self: { + pname = "HDBC-odbc"; + version = "2.3.1.0"; + sha256 = "0vza38ggs863wjh25xnwslwlin68166ywws72bs766rl0rq7fkf4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ HDBC mtl time utf8String ]; + extraLibraries = [ odbc ]; + noHaddock = true; + meta = { + homepage = "http://software.complete.org/hdbc-odbc"; + description = "ODBC driver for HDBC"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d346f60fd61..fa3059b93d7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -700,6 +700,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; + HDBCOdbc = callPackage ../development/libraries/haskell/HDBC/HDBC-odbc.nix { + odbc = pkgs.unixODBC; + }; + HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix { inherit (pkgs) postgresql; }; From 573e554e2c4ba7e8984aee568e8475c5e7e87811 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 2 Sep 2011 15:59:12 +0000 Subject: [PATCH 139/504] * Apache httpd updated to 2.2.20, with a fix for CVE-2011-3192. svn path=/nixpkgs/trunk/; revision=28976 --- pkgs/servers/http/apache-httpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index 1e48381deec..22f733e40c6 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -8,12 +8,12 @@ assert sslSupport -> openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.2.19"; + version = "2.2.20"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "5676da63f3203129287d7c09a16cf523c00ec6cf"; + sha1 = "c8f00a505af6ed3f89f45b640217c388f5cd32b0"; }; buildInputs = [perl apr aprutil pcre] ++ From 159adba352b1c48052eef7ddca4c17697f6d63aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:02:10 +0000 Subject: [PATCH 140/504] haskell-hledger-chart: updated to version 0.15 svn path=/nixpkgs/trunk/; revision=28977 --- .../libraries/haskell/hledger-chart/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix index f20c2daf541..5ab658b2ea5 100644 --- a/pkgs/development/libraries/haskell/hledger-chart/default.nix +++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix @@ -1,15 +1,19 @@ -{ cabal, Chart, colour, hledger, hledgerLib, safe }: +{ cabal, Chart, cmdargs, colour, hledger, hledgerLib, HUnit, safe +, time +}: cabal.mkDerivation (self: { pname = "hledger-chart"; - version = "0.14"; - sha256 = "fe321e4e31c72aef22945080323992a0033ae8fb48213ad7b708f86f9e2f6462"; + version = "0.15"; + sha256 = "03i09fsf1h7w62as6d3q4f7fadjykbhbi95jbv0scb67rb0g9cw1"; isLibrary = false; isExecutable = true; - buildDepends = [ Chart colour hledger hledgerLib safe ]; + buildDepends = [ + Chart cmdargs colour hledger hledgerLib HUnit safe time + ]; meta = { homepage = "http://hledger.org"; - description = "A pie chart generator for the hledger accounting tool"; + description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; platforms = self.stdenv.lib.platforms.linux; maintainers = [ From 232483a379315bd38f8cc7b564d3193465b325e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:02:16 +0000 Subject: [PATCH 141/504] haskell-hledger-lib: updated to version 0.15 svn path=/nixpkgs/trunk/; revision=28978 --- .../libraries/haskell/hledger-lib/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 569bd7c5291..664bba1af41 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,16 +1,17 @@ -{ cabal, HUnit, mtl, parsec, regexpr, safe, split, time, utf8String +{ cabal, cmdargs, HUnit, mtl, parsec, regexpr, safe, split, time +, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.14"; - sha256 = "9a6d6ab4383800279e135e9bbcd886e95cea45232d093202c5d43e6edd1f927c"; + version = "0.15"; + sha256 = "1bsn02pgz38ivk6z24niwab2ibmysngc1hghw5d5n2xa862ffrgb"; buildDepends = [ - HUnit mtl parsec regexpr safe split time utf8String + cmdargs HUnit mtl parsec regexpr safe split time utf8String ]; meta = { homepage = "http://hledger.org"; - description = "Reusable types and utilities for the hledger accounting tool and financial apps in general"; + description = "Core data types, parsers and utilities for the hledger accounting tool"; license = "GPL"; platforms = self.ghc.meta.platforms; maintainers = [ From 79c008e8630c4fe4b2852be4b073663cebe3f35e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:02:20 +0000 Subject: [PATCH 142/504] haskell-hledger-vty: updated to version 0.15 svn path=/nixpkgs/trunk/; revision=28979 --- .../libraries/haskell/hledger-vty/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix index fa9d5ddab34..e85689164b0 100644 --- a/pkgs/development/libraries/haskell/hledger-vty/default.nix +++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix @@ -1,15 +1,15 @@ -{ cabal, hledger, hledgerLib, safe, vty }: +{ cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time, vty }: cabal.mkDerivation (self: { pname = "hledger-vty"; - version = "0.14"; - sha256 = "3d9972430053548a65bfe5fb39ba374d1c930c6e0cfc704be5c59de742a4287e"; + version = "0.15"; + sha256 = "185j09chw34jjb0zayv526cs4rzgaygclzifmpwjk5bnrbx9b925"; isLibrary = false; isExecutable = true; - buildDepends = [ hledger hledgerLib safe vty ]; + buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ]; meta = { homepage = "http://hledger.org"; - description = "A curses-style interface for the hledger accounting tool"; + description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; platforms = self.ghc.meta.platforms; maintainers = [ From 2442cf69f7968b84cfea60924c968f42e3618cfd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:02:24 +0000 Subject: [PATCH 143/504] haskell-hledger: updated to version 0.15 svn path=/nixpkgs/trunk/; revision=28980 --- .../libraries/haskell/hledger/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 046ca56b339..52f6b53eb84 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,20 +1,20 @@ -{ cabal, csv, haskeline, hledgerLib, HUnit, mtl, parsec, regexpr -, safe, split, time, utf8String +{ cabal, cmdargs, csv, haskeline, hledgerLib, HUnit, mtl, parsec +, regexpr, safe, split, time, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.14"; - sha256 = "1bfcb1dcc88d8cec924afbf7aefd1ccf88b7be785b522c1595b75b91f8c82d35"; + version = "0.15"; + sha256 = "0pb5qm22x8wbw43199jn67qc6q5sbbwc3vrpxl1k9blxdnj4min0"; isLibrary = true; isExecutable = true; buildDepends = [ - csv haskeline hledgerLib HUnit mtl parsec regexpr safe split time - utf8String + cmdargs csv haskeline hledgerLib HUnit mtl parsec regexpr safe + split time utf8String ]; meta = { homepage = "http://hledger.org"; - description = "A robust command-line accounting tool with a simple human-editable data format, similar to ledger"; + description = "The main command-line interface for the hledger accounting tool"; license = "GPL"; platforms = self.ghc.meta.platforms; maintainers = [ From 89afa3dd58f37382059a3e52a37ccd6efc13bc55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:02:28 +0000 Subject: [PATCH 144/504] haskell-hmatrix: updated to version 0.12.0.0 svn path=/nixpkgs/trunk/; revision=28981 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index bd149b5aa92..e82aff91854 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.11.1.0"; - sha256 = "19915xmf6m2092s1rzwirxy0rwjcr6482y5wg4bil0afm0xjnb9n"; + version = "0.12.0.0"; + sha256 = "1j4c3my6i3xz6b4pyy98722zmgky27ls7a7w13ilwmnhb7pvq9al"; buildDepends = [ binary HUnit QuickCheck random storableComplex vector ]; From 69424912965980efb7474ac7af9b74741865af10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:12:31 +0000 Subject: [PATCH 145/504] haskell-hledger-interest: updated to version 1.3 svn path=/nixpkgs/trunk/; revision=28982 --- pkgs/applications/office/hledger-interest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index aea3a1f6aa1..5f61138f6ec 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-interest"; - version = "1.2"; - sha256 = "1r5x6z0k33fpvqba6zlkhpm7b0rwwnli4q100psms89x0rrj7y2d"; + version = "1.3"; + sha256 = "1sgnl3vv38cmgxv3xag3c78j1955xxwdmr5xr3f8rc78np6d0wnz"; isLibrary = false; isExecutable = true; buildDepends = [ hledgerLib mtl time ]; From fb05c340514ebf2808cafad88de1dd6333655eed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:20:35 +0000 Subject: [PATCH 146/504] haskell-HaskellForMaths: added version 0.3.4 svn path=/nixpkgs/trunk/; revision=28983 --- .../haskell/HaskellForMaths/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/HaskellForMaths/default.nix diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix new file mode 100644 index 00000000000..19a9793d3f3 --- /dev/null +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -0,0 +1,18 @@ +{ cabal, QuickCheck, random }: + +cabal.mkDerivation (self: { + pname = "HaskellForMaths"; + version = "0.3.4"; + sha256 = "1cmhzcybv3kwvs058sjihdkqr72rygv2nmbcy8i485pk35yq31sm"; + buildDepends = [ QuickCheck random ]; + meta = { + homepage = "http://haskellformaths.blogspot.com/"; + description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fa3059b93d7..2cf554d5e9c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -692,6 +692,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; + haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {}; + haxr = callPackage ../development/libraries/haskell/haxr {}; haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; From 6295090cc6557494b0e200b3866110472c2610cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:24:27 +0000 Subject: [PATCH 147/504] haskell-unix-compat: added version 0.3 svn path=/nixpkgs/trunk/; revision=28984 --- .../unix-compat/{default.nix => 0.2.2.1.nix} | 0 .../libraries/haskell/unix-compat/0.3.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 20 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/unix-compat/{default.nix => 0.2.2.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/unix-compat/0.3.nix diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/unix-compat/default.nix rename to pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix diff --git a/pkgs/development/libraries/haskell/unix-compat/0.3.nix b/pkgs/development/libraries/haskell/unix-compat/0.3.nix new file mode 100644 index 00000000000..da13c9313ac --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-compat/0.3.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "unix-compat"; + version = "0.3"; + sha256 = "0zgz9s5z2kca37sgnf4dyfdw90435h20bznx485y1ggvh377jan7"; + meta = { + homepage = "http://github.com/jystic/unix-compat"; + description = "Portable POSIX-compatibility layer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2cf554d5e9c..6f5fabe534c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1201,7 +1201,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; - unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unixCompat_0_2_2_1 = callPackage ../development/libraries/haskell/unix-compat/0.2.2.1.nix {}; + unixCompat_0_3 = callPackage ../development/libraries/haskell/unix-compat/0.3.nix {}; + unixCompat = self.unixCompat_0_2_2_1; unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; From 35e1b7ddeebe18fdbb0b94c554be39c0d4ed3395 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:31:44 +0000 Subject: [PATCH 148/504] haskell-vector-algorithms: updated to version 0.5.3 svn path=/nixpkgs/trunk/; revision=28985 --- .../haskell/vector-algorithms/0.5.3.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix diff --git a/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix b/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix new file mode 100644 index 00000000000..3688bb12c28 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix @@ -0,0 +1,18 @@ +{ cabal, primitive, vector }: + +cabal.mkDerivation (self: { + pname = "vector-algorithms"; + version = "0.5.3"; + sha256 = "14h2x3yrb4fji8bf84xbfp84pax6lzr8njc0c4061xpwcmair36j"; + buildDepends = [ primitive vector ]; + meta = { + homepage = "http://code.haskell.org/~dolio/"; + description = "Efficient algorithms for vector arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6f5fabe534c..7d541537693 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1230,8 +1230,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = callPackage ../development/libraries/haskell/vector {}; vectorAlgorithms_0_4 = callPackage ../development/libraries/haskell/vector-algorithms/0.4.nix {}; - vectorAlgorithms_0_5_2 = callPackage ../development/libraries/haskell/vector-algorithms/0.5.2.nix {}; - vectorAlgorithms = self.vectorAlgorithms_0_5_2; + vectorAlgorithms_0_5_3 = callPackage ../development/libraries/haskell/vector-algorithms/0.5.3.nix {}; + vectorAlgorithms = self.vectorAlgorithms_0_5_3; vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; From afdabc50ff2a6e8e8e02359a2ab6111d0e4aeb45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 18:33:04 +0000 Subject: [PATCH 149/504] Oops, forgot to delete the old file. svn path=/nixpkgs/trunk/; revision=28986 --- .../haskell/vector-algorithms/0.5.2.nix | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix diff --git a/pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix b/pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix deleted file mode 100644 index d58da61decc..00000000000 --- a/pkgs/development/libraries/haskell/vector-algorithms/0.5.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, primitive, vector }: - -cabal.mkDerivation (self: { - pname = "vector-algorithms"; - version = "0.5.2"; - sha256 = "0ijn4hfaxqjvm91d7mihv62bdd7ph15h880w9lmbr93czbsp8mw1"; - buildDepends = [ primitive vector ]; - meta = { - homepage = "http://code.haskell.org/~dolio/"; - description = "Efficient algorithms for vector arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) From c128803d11c3e243a38baec01fc73357cfbda5f5 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Fri, 2 Sep 2011 19:25:46 +0000 Subject: [PATCH 150/504] upgrading 32-bit flashplayer to version 10.3.183.7 svn path=/nixpkgs/trunk/; revision=28987 --- .../browsers/mozilla-plugins/flashplayer-10/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 462099ea8f2..6cdd175573d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -53,9 +53,9 @@ let url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz; sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc"; } else { - version = "10.3.183.5"; + version = "10.3.183.7"; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "1kv7szpadgv0wwmi46vc05723qzsgclz68rij6x49l61sngzmw0x"; + sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6"; } else throw "Flash Player is not supported on this platform"; From 2bc0a91739be4ae61b93ac5a710aa3e4ff5c031b Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Fri, 2 Sep 2011 20:19:42 +0000 Subject: [PATCH 151/504] bitcoin cannot use the recent versions of boost. setting boost dependency to 1.44 svn path=/nixpkgs/trunk/; revision=28988 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8723ba72ff8..4ae1ef19756 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6186,6 +6186,7 @@ let bibletime = callPackage ../applications/misc/bibletime { }; bitcoin = callPackage ../applications/misc/bitcoin { + boost = boost144; wxGTK = wxGTK290; db4 = db47; inherit (xlibs) libSM; From afb859003f382b61bfca430103706a0c0e1f5da7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 21:48:57 +0000 Subject: [PATCH 152/504] haskell-hledger-chart: updated to version 0.15.1 svn path=/nixpkgs/trunk/; revision=28989 --- pkgs/development/libraries/haskell/hledger-chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix index 5ab658b2ea5..deee2be4ced 100644 --- a/pkgs/development/libraries/haskell/hledger-chart/default.nix +++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-chart"; - version = "0.15"; - sha256 = "03i09fsf1h7w62as6d3q4f7fadjykbhbi95jbv0scb67rb0g9cw1"; + version = "0.15.1"; + sha256 = "1sb48ajc4fg2xin7nd35kwd3rqg4zg2318mgwqld8l0xv77jv5fh"; isLibrary = false; isExecutable = true; buildDepends = [ From df672edd8906eb939d1862ab25cc34539c422766 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 21:49:02 +0000 Subject: [PATCH 153/504] haskell-hledger-vty: updated to version 0.15.1 svn path=/nixpkgs/trunk/; revision=28990 --- pkgs/development/libraries/haskell/hledger-vty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix index e85689164b0..46480fd095f 100644 --- a/pkgs/development/libraries/haskell/hledger-vty/default.nix +++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-vty"; - version = "0.15"; - sha256 = "185j09chw34jjb0zayv526cs4rzgaygclzifmpwjk5bnrbx9b925"; + version = "0.15.1"; + sha256 = "069wzk4azc4rnf292809g0lsi07p1m9gjmrvwn0cy2bij2vrhi6n"; isLibrary = false; isExecutable = true; buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ]; From b07e5794980bb6931fb72ca0d4fd97c2404188d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 21:49:08 +0000 Subject: [PATCH 154/504] haskell-hledger: updated to version 0.15.1 svn path=/nixpkgs/trunk/; revision=28991 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 52f6b53eb84..23ea0d6dc53 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.15"; - sha256 = "0pb5qm22x8wbw43199jn67qc6q5sbbwc3vrpxl1k9blxdnj4min0"; + version = "0.15.1"; + sha256 = "0lm7w0r1pcv6jqpl2h1jcn77bqc6ld1z35zh30vbwgyj7mv02bdb"; isLibrary = true; isExecutable = true; buildDepends = [ From 30c71f18b86cfb22910366f224ef539ea0b0550b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Sep 2011 21:49:13 +0000 Subject: [PATCH 155/504] haskell-vector-space: updated to version 0.7.6 svn path=/nixpkgs/trunk/; revision=28992 --- pkgs/development/libraries/haskell/vector-space/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 0052b9b4815..1cdb91761f4 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.7.3"; - sha256 = "00lzhml1pc328iw9cip9yh54n0yqkwz1mxkv4gq2wlb7bzpfq1fx"; + version = "0.7.6"; + sha256 = "166493dnlgrm9bsyp8dvdnkz1s5503casamihs4d3rij4fqvw7vf"; buildDepends = [ Boolean MemoTrie ]; meta = { homepage = "http://haskell.org/haskellwiki/vector-space"; From 238625aa769b47cb76bab1f20638f79728fea0e7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 3 Sep 2011 10:21:55 +0000 Subject: [PATCH 156/504] Attempting to fix tests a bit.. svn path=/nixpkgs/trunk/; revision=28993 --- .../version-management/veracity/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index 82a588f6a1e..8eb72f934f1 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -2,6 +2,7 @@ x@{builderDefsPackage , cmake, curl, patch, zlib, icu, sqlite, libuuid , readline, openssl, spidermonkey_1_8_0rc1 , nspr, nss + , unzip, glibcLocales , runTests ? false , ...}: builderDefsPackage @@ -20,16 +21,17 @@ rec { inherit (s) name; inherit buildInputs; - phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest" "doDeploy"]; + phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "fixPaths" "doMake" "doTest" "doDeploy"]; dump0 = (a.doDump "0"); runTests = a.stdenv.lib.attrByPath ["runTests"] false a; doTest = a.fullDepEntry (if runTests then '' - sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f) mkdir pseudo-home export HOME=$PWD/pseudo-home + export LC_ALL=en_US.UTF-8 + ${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale-archive;" else ""} make test || true '' else "") ["doMake" "minInit"]; @@ -73,6 +75,13 @@ rec { cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity* '' ["minInit" "addInputs" "doUnpack"]; + fixPaths = a.fullDepEntry '' + sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f) + sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js + sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i ../veracity/testsuite/c_test.sh + sed -e 's@"/bin/@"@g' -i ../veracity/testsuite/u*.c + '' ["minInit"]; + doDeploy = a.fullDepEntry '' ensureDir "$out/bin" "$out/share/veracity/" cp -r .. "$out/share/veracity/build-dir" From 9bc7fee30d489fc755b7b4510a87502985910a75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Sep 2011 13:17:23 +0000 Subject: [PATCH 157/504] haskell-hS3: added version 0.5.6 svn path=/nixpkgs/trunk/; revision=28994 --- .../libraries/haskell/hS3/default.nix | 25 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hS3/default.nix diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix new file mode 100644 index 00000000000..1f0f75ffeb8 --- /dev/null +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -0,0 +1,25 @@ +{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random +, regexCompat, utf8String +}: + +cabal.mkDerivation (self: { + pname = "hS3"; + version = "0.5.6"; + sha256 = "1cd6dzvhfkfp0lzw8lwfcr0wn8wqi2hm8pgb5idp4vg4z00yf2zc"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + Crypto dataenc HTTP hxt MissingH network random regexCompat + utf8String + ]; + meta = { + homepage = "http://gregheartsfield.com/hS3/"; + description = "Interface to Amazon's Simple Storage Service (S3)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7d541537693..ca3a2c723f4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -754,6 +754,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); glut = pkgs.freeglut; }; + hS3 = callPackage ../development/libraries/haskell/hS3 {}; + hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; hscolour = callPackage ../development/libraries/haskell/hscolour {}; From c79027e3ab132045bca57dc8164c9474d2716f55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Sep 2011 13:17:29 +0000 Subject: [PATCH 158/504] haskell-hxt: added version 9.1.4 haskell-hxt-charproperties: added version 9.1.0 haskell-hxt-regex-xmlschema: added version 9.0.1 haskell-hxt-unicode: added version 9.0.1 svn path=/nixpkgs/trunk/; revision=28995 --- .../haskell/hxt-charproperties/default.nix | 17 ++++++++++++++ .../haskell/hxt-regex-xmlschema/default.nix | 18 +++++++++++++++ .../libraries/haskell/hxt-unicode/default.nix | 18 +++++++++++++++ .../libraries/haskell/hxt/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++++++ 5 files changed, 84 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hxt-charproperties/default.nix create mode 100644 pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix create mode 100644 pkgs/development/libraries/haskell/hxt-unicode/default.nix create mode 100644 pkgs/development/libraries/haskell/hxt/default.nix diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix new file mode 100644 index 00000000000..c466d877488 --- /dev/null +++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "hxt-charproperties"; + version = "9.1.0"; + sha256 = "1a227czzbbw8pigc2dk5fyyc4x1rpx82mb5c4hpjjz97l0sdlc23"; + meta = { + homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; + description = "Character properties and classes for XML and Unicode"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix new file mode 100644 index 00000000000..94e14429966 --- /dev/null +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -0,0 +1,18 @@ +{ cabal, hxtCharproperties, parsec }: + +cabal.mkDerivation (self: { + pname = "hxt-regex-xmlschema"; + version = "9.0.1"; + sha256 = "1mg22fa0f0cbj9gkl5zaq0xh94ljkmzrc019h3cxv728chpgby0c"; + buildDepends = [ hxtCharproperties parsec ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; + description = "A regular expression library for W3C XML Schema regular expressions"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix new file mode 100644 index 00000000000..452a38c79c8 --- /dev/null +++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix @@ -0,0 +1,18 @@ +{ cabal, hxtCharproperties }: + +cabal.mkDerivation (self: { + pname = "hxt-unicode"; + version = "9.0.1"; + sha256 = "0g8qz7waip7zsdi35idj9db6qd7lqbv88l0c4rz8q7nh85jsp6ym"; + buildDepends = [ hxtCharproperties ]; + meta = { + homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; + description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix new file mode 100644 index 00000000000..88112a1f089 --- /dev/null +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, deepseq, HUnit, hxtCharproperties +, hxtRegexXmlschema, hxtUnicode, network, parsec +}: + +cabal.mkDerivation (self: { + pname = "hxt"; + version = "9.1.4"; + sha256 = "1dqnxb1dikw74l02sb6q193ipk9qfwqlgvcd362705mdqzai124c"; + buildDepends = [ + binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode + network parsec + ]; + meta = { + homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; + description = "A collection of tools for processing XML with Haskell"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ca3a2c723f4..0b5ca717ca8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -793,6 +793,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; HUnit = self.HUnit_1_2_0_3; + hxt = callPackage ../development/libraries/haskell/hxt {}; + + hxtCharproperties = callPackage ../development/libraries/haskell/hxt-charproperties {}; + + hxtRegexXmlschema = callPackage ../development/libraries/haskell/hxt-regex-xmlschema {}; + + hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {}; + irc = callPackage ../development/libraries/haskell/irc { parsec = self.parsec2; }; From 2c0eddaeaa45d445542dcbcf9cc214ae754aadfd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Sep 2011 13:17:36 +0000 Subject: [PATCH 159/504] git-annex: updated to version 3.20110902 svn path=/nixpkgs/trunk/; revision=28996 --- .../git-and-tools/default.nix | 2 +- .../git-and-tools/git-annex/default.nix | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2fb2ad431ce..e0c5400d2a9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,7 +48,7 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl; + HTTP testpack monadControl hS3 mtl network hslogger hxt json; QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index d72b1868b03..5ef5cd98cb1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String -, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which -, monadControl }: +{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt +, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl +, QuickCheck2, rsync, SHA, testpack, utf8String, which +}: let - version = "3.20110819"; + version = "3.20110902"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943"; + sha256 = "1flw3472g19v6ins1nv66m51w15131013077yvfh2blywm0pqrl0"; }; - buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight - SHA dataenc HTTP testpack git ikiwiki which monadControl]; + buildInputs = [ + curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json + libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2 + rsync SHA testpack utf8String which + ]; checkTarget = "test"; doCheck = true; From db867607cb3e0838a00ded4d52bb97dfc3e855a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Sep 2011 17:31:10 +0000 Subject: [PATCH 160/504] Add GimpLensfun. svn path=/nixpkgs/trunk/; revision=28997 --- .../graphics/gimp/plugins/default.nix | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index f988ddf8209..3c900ca1eba 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -195,6 +195,35 @@ rec { "; }; + gimplensfun = pluginDerivation rec { + name = "gimplensfun-0.1.1"; + + src = fetchurl { + url = "http://lensfun.sebastiankraft.net/${name}.tar.gz"; + sha256 = "0kr296n4k7gsjqg1abmvpysxi88iq5wrzdpcg7vm7l1ifvbs972q"; + }; + + patchPhase = '' sed -i Makefile -e's|/usr/bin/g++|g++|' ''; + + buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ]; + + installPhase = " + installPlugins gimplensfun + ensureDir $out/bin + cp gimplensfun $out/bin + "; + + meta = { + description = "GIMP plugin to correct lens distortion using the lensfun library and database"; + + homepage = http://lensfun.sebastiankraft.net/; + + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; + }; + }; + /* =============== simple script files ==================== */ # also have a look at enblendenfuse in all-packages.nix From 04e4bf68c8c249bbe413c0ff83bce611a5be22c4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Sep 2011 20:00:58 +0000 Subject: [PATCH 161/504] sphinxbase: The source tarball hash changed for some reason. That's disconcerting... svn path=/nixpkgs/trunk/; revision=28998 --- pkgs/development/libraries/sphinxbase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 0631389ac0e..25b24817793 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/cmusphinx/${name}.tar.gz"; - sha256 = "0xab4ph9215rw5865gihmahbbnbi58klll5xg0il9ifld4wdjacq"; + sha256 = "1v3kfzw42ahxmr002i6wqigs832958vgghrv5dd62zazajdbk71q"; }; buildInputs = [ pkgconfig bison ]; From 1fe20228b9f3b8d5d041ce4c31d73cf276c48b88 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Sep 2011 20:01:06 +0000 Subject: [PATCH 162/504] sphinxbase: Add flag to play with multiple outputs svn path=/nixpkgs/trunk/; revision=28999 --- .../libraries/sphinxbase/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 25b24817793..b025e9a68a9 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchurl, bison, pkgconfig }: +{ stdenv +, fetchurl +, bison +, pkgconfig +, multipleOutputs ? false #Uses incomplete features of nix! +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "sphinxbase-0.7"; src = fetchurl { @@ -16,4 +21,15 @@ stdenv.mkDerivation rec { license = "free-non-copyleft"; maintainers = [ stdenv.lib.maintainers.shlevy ]; }; -} +} // (stdenv.lib.optionalAttrs multipleOutputs { + outputs = [ "out" "lib" "headers" ]; + + postInstall = '' + ensureDir $lib + cp -av $out/lib* $lib + + ensureDir $headers + cp -av $out/include $headers + ''; +})) + From 0803c5d069fe829549d2afb0af66dfc1a8646ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 08:54:19 +0000 Subject: [PATCH 163/504] Pius 2.0.9. svn path=/nixpkgs/trunk/; revision=29000 --- pkgs/tools/security/pius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 5939037abfe..d5462a1120a 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, python, gnupg }: -let version = "2.0.7"; in +let version = "2.0.9"; in stdenv.mkDerivation { name = "pius-${version}"; namePrefix = ""; src = fetchurl { url = "mirror://sourceforge/pgpius/pius/${version}/pius-${version}.tar.bz2"; - sha256 = "1iyd3z96vp2g7r6s1v34x3vpxikkcy60f15d84r0qla373zl4xd8"; + sha256 = "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"; }; buildInputs = [ python ]; From 09114ea85882c5abffb3c385d59bea08494be992 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 4 Sep 2011 09:12:00 +0000 Subject: [PATCH 164/504] Adding ZBar svn path=/nixpkgs/trunk/; revision=29001 --- pkgs/tools/graphics/zbar/default.nix | 50 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/graphics/zbar/default.nix diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix new file mode 100644 index 00000000000..4bced99820b --- /dev/null +++ b/pkgs/tools/graphics/zbar/default.nix @@ -0,0 +1,50 @@ +x@{builderDefsPackage + , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l + , qt4, lzma + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="zbar"; + version="0.10"; + name="${baseName}-${version}"; + pName="${baseName}"; + url="mirror://sourceforge/project/${pName}/${baseName}/${version}/${name}.tar.bz2"; + hash="1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "Bar code toolset"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.lgpl21; + }; + passthru = { + updateInfo = { + downloadPage = "http://zbar.sourceforge.net/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ae1ef19756..6704c85b19b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1570,6 +1570,8 @@ let xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; + zbar = callPackage ../tools/graphics/zbar {}; + zdelta = callPackage ../tools/compression/zdelta { }; zile = callPackage ../applications/editors/zile { }; From 27b2d8f8a90f9d32395e52222491d9f87e584a15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 Sep 2011 13:44:22 +0000 Subject: [PATCH 165/504] haskell-gitit: updated to version 0.8.1 svn path=/nixpkgs/trunk/; revision=29002 --- pkgs/development/libraries/haskell/gitit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index a2db60b8d0f..87a60a75ca9 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,24 +1,24 @@ { cabal, cgi, ConfigFile, feed, filestore, ghcPaths , happstackServer, happstackUtil, highlightingKate, hslogger , HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes -, parsec, random, recaptcha, safe, SHA, syb, time, url, utf8String -, xhtml, xml, xssSanitize, zlib +, parsec, random, recaptcha, safe, SHA, syb, text, time, url +, utf8String, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.8.0.1"; - sha256 = "0y2gcxlbb44vflj0jl3zkbsn47n7nccikxwdw6ccf9kxgcmrz0zy"; + version = "0.8.1"; + sha256 = "1b5i6fm68vwhlvgz0m7xxzklkxc2c6lrqyqfqyjs93p5j0aqgvfn"; isLibrary = true; isExecutable = true; buildDepends = [ cgi ConfigFile feed filestore ghcPaths happstackServer happstackUtil highlightingKate hslogger HStringTemplate HTTP json mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb - time url utf8String xhtml xml xssSanitize zlib + text time url utf8String xhtml xml xssSanitize zlib ]; meta = { - homepage = "http://github.com/jgm/gitit/tree/master"; + homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; platforms = self.ghc.meta.platforms; From 5fb2b7c8eba0f015b4bcafe028655fe05e6dae5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 Sep 2011 13:44:31 +0000 Subject: [PATCH 166/504] haskell-happstack-server: updated to version 6.2.2 svn path=/nixpkgs/trunk/; revision=29003 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 4d8e874a8bf..3b3d37bb0b8 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "6.1.6"; - sha256 = "1z4c2bymyyvhs47ynrlp4d2cwqws2d2isiwj82c33qcmk4znargg"; + version = "6.2.2"; + sha256 = "1nrvi3hf689bxvlzc9crav70dmnv3lagafsrc4gmnizqliw6p62g"; isLibrary = true; isExecutable = true; buildDepends = [ From 92153bc2d51cffff7f4ad03893a4682b8206649f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 Sep 2011 13:44:39 +0000 Subject: [PATCH 167/504] haskell-xss-sanitize: dropped obsolete version 0.2.6 svn path=/nixpkgs/trunk/; revision=29004 --- .../libraries/haskell/xss-sanitize/0.2.6.nix | 18 ------------------ .../xss-sanitize/{0.3.0.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++------ 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix rename pkgs/development/libraries/haskell/xss-sanitize/{0.3.0.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix b/pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix deleted file mode 100644 index c1027ad269e..00000000000 --- a/pkgs/development/libraries/haskell/xss-sanitize/0.2.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, network, tagsoup, utf8String }: - -cabal.mkDerivation (self: { - pname = "xss-sanitize"; - version = "0.2.6"; - sha256 = "18bkvrrkc0ga0610f8g3vghq0ib1yczn2n2zbzv7kg7m6bqgx2y5"; - buildDepends = [ network tagsoup utf8String ]; - meta = { - homepage = "http://github.com/gregwebs/haskell-xss-sanitize"; - description = "sanitize untrusted HTML to prevent XSS attacks"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/xss-sanitize/0.3.0.1.nix rename to pkgs/development/libraries/haskell/xss-sanitize/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0b5ca717ca8..7c217b97fae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -591,9 +591,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; - gitit = callPackage ../development/libraries/haskell/gitit { - xssSanitize = self.xssSanitize_0_2_6; - }; + gitit = callPackage ../development/libraries/haskell/gitit {}; glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs) pkgconfig glibc; @@ -1305,9 +1303,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; - xssSanitize_0_2_6 = callPackage ../development/libraries/haskell/xss-sanitize/0.2.6.nix {}; - xssSanitize_0_3_0_1 = callPackage ../development/libraries/haskell/xss-sanitize/0.3.0.1.nix {}; - xssSanitize = self.xssSanitize_0_3_0_1; + xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; yap = callPackage ../development/libraries/haskell/yap {}; From 1ecf17711d415bb8b1ea2b1e6010417117cf7dc1 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 4 Sep 2011 16:47:54 +0000 Subject: [PATCH 168/504] Updated hashcode svn path=/nixpkgs/trunk/; revision=29005 --- pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix index 7f856b8165d..d2cc7c527ec 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip; - sha256 = "e4dea0fb23b7e17bfe794b80f83bef47f290e2c9296105a80a7aecf7d33ecaf2"; + sha256 = "1e0f183c1e6d90338dbf427697908167a61c66dc7761ae5a73bb849f39f701fe"; }; buildInputs = [ unzip makeWrapper ]; From 77f80e63104f43d261c2988e8f5bb79c89133e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:05:35 +0000 Subject: [PATCH 169/504] GNU Nettle 2.4. svn path=/nixpkgs/trunk/; revision=29008 --- pkgs/development/libraries/nettle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 80b9a858712..22c2fb14aca 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, gmp, gnum4 }: stdenv.mkDerivation rec { - name = "nettle-2.2"; + name = "nettle-2.4"; src = fetchurl { # Eventually use `mirror://gnu/'. url = "ftp://ftp.lysator.liu.se/pub/security/lsh/${name}.tar.gz"; - sha256 = "1kdl842x1x4wk80bi0k1d2ci8hqsmgjdb5zvrlmyakb8pfhw3gl2"; + sha256 = "0gwwcipmjxkv7p2p01m19n4c3jiczg682w58l5dgg0b8vw494056"; }; buildInputs = [ gnum4 ]; From bad0bd10a8da210d5e8b7054814b81f055107e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:05:42 +0000 Subject: [PATCH 170/504] GnuTLS 3.0.2. svn path=/nixpkgs/trunk/; revision=29009 --- pkgs/development/libraries/gnutls/default.nix | 6 +- .../gnutls/fix-guile-priorities-test.patch | 80 ------------------- 2 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 2a0fe3715b9..39532c075d1 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,15 +5,13 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.1"; + name = "gnutls-3.0.2"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "1z3dqjv8zvma2adbwbcw704zf91hazz8ilmxy91gkrdpi5z2kpz2"; + sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii"; }; - patches = [ ./fix-guile-priorities-test.patch ]; - configurePhase = '' ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ diff --git a/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch b/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch deleted file mode 100644 index 538cb6f8e41..00000000000 --- a/pkgs/development/libraries/gnutls/fix-guile-priorities-test.patch +++ /dev/null @@ -1,80 +0,0 @@ -commit 10115e3fb9c36abcce95bd8f74d212d068cbddce (HEAD, refs/heads/gnutls_3_0_x) -Author: Ludovic Courtès -Date: Mon Aug 22 18:17:10 2011 +0200 - - guile: Fix `priorities' test to use `run-test'. - - This is a followup to commit cd7b8102316cd4151356c4b2b7909c7435593890 - ("guile: Fix tests to match the `exit' behavior introduced in Guile - 2.0.1."). - - Modified guile/tests/priorities.scm -diff --git a/guile/tests/priorities.scm b/guile/tests/priorities.scm -index 1ee072b..2af837e 100644 ---- a/guile/tests/priorities.scm -+++ b/guile/tests/priorities.scm -@@ -24,6 +24,8 @@ - ;;; - - (use-modules (gnutls) -+ (gnutls build tests) -+ (srfi srfi-1) - (srfi srfi-26)) - - (define %valid-priority-strings -@@ -41,10 +43,7 @@ - ("NONE:+VERS-TLS-ALL:+AES-128-CBC:" - . "+FAIL-HERE:+SHA1:+COMP-NULL:+SIGN-RSA-SHA1"))) - --(dynamic-wind -- -- (lambda () -- #t) -+(run-test - - (lambda () - (let ((s (make-session connection-end/client))) -@@ -52,25 +51,20 @@ - (for-each (cut set-session-priorities! s <>) - %valid-priority-strings) - -- (for-each (lambda (prefix+suffix) -- (let* ((prefix (car prefix+suffix)) -- (suffix (cdr prefix+suffix)) -- (pos (string-length prefix)) -- (string (string-append prefix suffix))) -- (catch 'gnutls-error -- (lambda () -- (let ((s (make-session connection-end/client))) -- (set-session-priorities! s string))) -- (lambda (key err function error-location . unused) -- (or (and (eq? key 'gnutls-error) -- (eq? err error/invalid-request) -- (eq? function 'set-session-priorities!) -- (= error-location pos)) -- (exit 1)))))) -- %invalid-priority-strings) -- -- (exit 0))) -- -- (lambda () -- ;; failure -- (exit 1))) -+ (every (lambda (prefix+suffix) -+ (let* ((prefix (car prefix+suffix)) -+ (suffix (cdr prefix+suffix)) -+ (pos (string-length prefix)) -+ (string (string-append prefix suffix))) -+ (catch 'gnutls-error -+ (lambda () -+ (let ((s (make-session connection-end/client))) -+ ;; The following call should raise an exception. -+ (set-session-priorities! s string) -+ #f)) -+ (lambda (key err function error-location . unused) -+ (and (eq? key 'gnutls-error) -+ (eq? err error/invalid-request) -+ (eq? function 'set-session-priorities!) -+ (= error-location pos)))))) -+ %invalid-priority-strings)))) - From b9b268eb012f8782c432d331db3ec71c305ed1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:05:48 +0000 Subject: [PATCH 171/504] GNU Wget 1.13.3. svn path=/nixpkgs/trunk/; revision=29010 --- pkgs/tools/networking/wget/default.nix | 8 +++----- pkgs/tools/networking/wget/gnutls-support.patch | 16 ---------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/networking/wget/gnutls-support.patch diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index af15d85af4b..b10d25ffc94 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.12"; + name = "wget-1.13.3"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.bz2"; - sha256 = "16msgly5xn0qj6ngsw34q9j7ag8jkci6020w21d30jgqw8wdj8y8"; + url = "mirror://gnu/wget/${name}.tar.gz"; + sha256 = "07wxl38qiy95k3hv2fd1sglgrlp6z920pr9mcfsj8dg7iaxbhppi"; }; - patches = [ ./gnutls-support.patch ]; - preConfigure = '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do diff --git a/pkgs/tools/networking/wget/gnutls-support.patch b/pkgs/tools/networking/wget/gnutls-support.patch deleted file mode 100644 index fa0c5cc06c0..00000000000 --- a/pkgs/tools/networking/wget/gnutls-support.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch fixes GnuTLS support: - - http.o: In function `gethttp': - http.c:(.text+0x26c6): undefined reference to `ssl_connect_wget' - ---- wget-1.12/src/http.c 2009-09-22 05:02:18.000000000 +0200 -+++ wget-1.12/src/http.c 2009-10-03 17:24:46.000000000 +0200 -@@ -1762,7 +1762,7 @@ gethttp (struct url *u, struct http_stat - - if (conn->scheme == SCHEME_HTTPS) - { -- if (!ssl_connect_wget (sock)) -+ if (!ssl_connect (sock)) - { - fd_close (sock); - return CONSSLERR; From 71325e1eba5e6e9dd985175d97d4a2c6220a511a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:05:53 +0000 Subject: [PATCH 172/504] GNU FreeIPMI 1.0.6. svn path=/nixpkgs/trunk/; revision=29011 --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index a53e5134206..87d6a4b073f 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.0.5"; + name = "freeipmi-1.0.6"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0wxq6h530wjiyaz8s12zqzp4rj4a8bg3cnsqf0aaq70d20gmxf1x"; + sha256 = "1990y1qkx1g5pb5flgzk0n7ms6ipcams576bna9hpkgg1h0rcbb6"; }; buildInputs = [ libgcrypt readline ]; From 2af4615ea898c47a3b18005c245e341a8875bf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:05:57 +0000 Subject: [PATCH 173/504] GNU TeXmacs 1.0.7.11. svn path=/nixpkgs/trunk/; revision=29012 --- pkgs/applications/editors/texmacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index d765449851a..a1f39792225 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -9,7 +9,7 @@ let pname = "TeXmacs"; - version = "1.0.7.10"; + version = "1.0.7.11"; extraFontsSrc = fetchurl { url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz"; - sha256 = "02gqalr775r4xyfy4bq3qq1h3pkarsxjb6ami7lgxfgmyg6ca5kn"; + sha256 = "0x1r9417dzbrxf785faq1vjszqdj94ig2lzwm8sd92bxcxr6knfa"; }; buildInputs = [ guile libX11 libXext makeWrapper ghostscriptX freetype ]; From 02f91a458d5fe06830a96f0af39a09209ac90ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:06:03 +0000 Subject: [PATCH 174/504] GNU Source-Highlight 3.1.5. svn path=/nixpkgs/trunk/; revision=29013 --- pkgs/tools/text/source-highlight/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index ae46d212f01..7eda7bc7c69 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -2,22 +2,17 @@ let name = "source-highlight"; - version = "3.1.4"; + version = "3.1.5"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; - sha256 = "1jd30ansx2pld196lik6r85aifdhd0cav701vasf4ws8kc8zkcxc"; + sha256 = "16a2ybd0i7gk926ipp7c63mxcfwklbb20fw65npyrjzr94z1agwx"; }; - # Help it find Boost::Regex. - preConfigure = - '' export ax_cv_boost_regex=yes - export link_regex=yes - export BOOST_REGEX_LIB=-lboost_regex - ''; + configureFlags = [ "--with-boost=${boost}" ]; buildInputs = [boost]; doCheck = true; From 8e29f04bd418911cc9f767d3dcbd22e8269da197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:06:07 +0000 Subject: [PATCH 175/504] gnupdate: Automatically download missing OpenPGP keys. * maintainers/scripts/gnu/gnupdate (%gpg-command, %openpgp-key-server): New variables. (gnupg-verify, gnupg-status-good-signature?, gnupg-status-missing-key?, gnupg-receive-keys, gnupg-verify*): New procedures. (fetch-gnu): Use `gnupg-verify*'. svn path=/nixpkgs/trunk/; revision=29014 --- maintainers/scripts/gnu/gnupdate | 118 ++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 6e89542ec57..9a1edda5093 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -400,6 +400,120 @@ replaced by the result of their application to DERIVATIONS, a vhash." ;; Return the output path of the "src" derivation of PACKAGE. (derivation-source-output-path (attribute-value package))) + +;;; +;;; GnuPG interface. +;;; + +(define %gpg-command "gpg2") +(define %openpgp-key-server "keys.gnupg.net") + +(define (gnupg-verify sig file) + "Verify signature SIG for FILE. Return a status s-exp or #f if GnuPG +failed." + + (define (status-line->sexp line) + ;; See file `doc/DETAILS' in GnuPG. + (define sigid-rx + (make-regexp + "^\\[GNUPG:\\] SIG_ID ([A-Za-z0-9/]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+)")) + (define goodsig-rx + (make-regexp "^\\[GNUPG:\\] GOODSIG ([[:xdigit:]]+) (.+)$")) + (define validsig-rx + (make-regexp + "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$")) + (define errsig-rx + (make-regexp + "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)")) + + (cond ((regexp-exec sigid-rx line) + => + (lambda (match) + `(signature-id ,(match:substring match 1) ; sig id + ,(match:substring match 2) ; date + ,(string->number ; timestamp + (match:substring match 3))))) + ((regexp-exec goodsig-rx line) + => + (lambda (match) + `(good-signature ,(match:substring match 1) ; key id + ,(match:substring match 2)))) ; user name + ((regexp-exec validsig-rx line) + => + (lambda (match) + `(valid-signature ,(match:substring match 1) ; fingerprint + ,(match:substring match 2) ; sig creation date + ,(string->number ; timestamp + (match:substring match 3))))) + ((regexp-exec errsig-rx line) + => + (lambda (match) + `(signature-error ,(match:substring match 1) ; key id or fingerprint + ,(match:substring match 2) ; pubkey algo + ,(match:substring match 3) ; hash algo + ,(match:substring match 4) ; sig class + ,(string->number ; timestamp + (match:substring match 5)) + ,(let ((rc + (string->number ; return code + (match:substring match 6)))) + (case rc + ((9) 'missing-key) + ((4) 'unknown-algorithm) + (else rc)))))) + (else + `(unparsed-line ,line)))) + + (define (parse-status input) + (let loop ((line (read-line input)) + (result '())) + (if (eof-object? line) + (reverse result) + (loop (read-line input) + (cons (status-line->sexp line) result))))) + + (let* ((pipe (open-pipe* OPEN_READ %gpg-command "--status-fd=1" + "--verify" sig file)) + (status (parse-status pipe))) + (if (pipe-failed? pipe) + #f + status))) + +(define (gnupg-status-good-signature? status) + "If STATUS, as returned by `gnupg-verify', denotes a good signature, return +a key-id/user pair; return #f otherwise." + (any (lambda (sexp) + (match sexp + (('good-signature key-id user) + (cons key-id user)) + (_ #f))) + status)) + +(define (gnupg-status-missing-key? status) + "If STATUS denotes a missing-key error, then return the key-id of the +missing key." + (any (lambda (sexp) + (match sexp + (('signature-error key-id _ ...) + key-id) + (_ #f))) + status)) + +(define (gnupg-receive-keys key-id) + (system* %gpg-command "--keyserver" %openpgp-key-server "--recv-keys" key-id)) + +(define (gnupg-verify* sig file) + "Like `gnupg-verify', but try downloading the public key if it's missing. +Return #t if the signature was good, #f otherwise." + (let ((status (gnupg-verify sig file))) + (or (gnupg-status-good-signature? status) + (let ((missing (gnupg-status-missing-key? status))) + (and missing + (begin + ;; Download the missing key and try again. + (gnupg-receive-keys missing) + (gnupg-status-good-signature? (gnupg-verify sig file)))))))) + ;;; ;;; FTP client. @@ -815,9 +929,9 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). (false-if-exception (delete-file sig)) (system* "wget" sig-url) (if (file-exists? sig) - (let ((ret (system* "gpg" "--verify" sig path))) + (let ((ret (gnupg-verify* sig path))) (false-if-exception (delete-file sig)) - (if (and ret (= 0 (status:exit-val ret))) + (if ret hash (begin (format (current-error-port) From 7f6a997831f5fefd6269e76326c162f993446172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Sep 2011 23:06:11 +0000 Subject: [PATCH 176/504] gnupdate: Exclude IceCat 3.x variants. * maintainers/scripts/gnu/gnupdate (%ignored-package-attributes): Augment. svn path=/nixpkgs/trunk/; revision=29015 --- maintainers/scripts/gnu/gnupdate | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 9a1edda5093..ef42fa02bed 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -694,8 +694,10 @@ Return #t if the signature was good, #f otherwise." "glibc27" "glibc29" "guile_1_8" + "icecat3" "icecat3Xul" ;; redundant with `icecat' "icecatWrapper" + "icecat3Wrapper" "icecatXulrunner3" "libzrtpcpp_1_6" "parted_2_3" From 05f95c69c5d31949f14aa2af612f208069c4dea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 5 Sep 2011 08:31:49 +0000 Subject: [PATCH 177/504] Updating meld svn path=/nixpkgs/trunk/; revision=29016 --- pkgs/applications/version-management/meld/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index d131841618e..4775a419fd1 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: +{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }: let minor = "1.5"; - version = "${minor}.1"; + version = "${minor}.2"; in stdenv.mkDerivation { name = "meld-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.bz2"; - sha256 = "0ykj3rb5hvcr4dmc52mz8q3iknrsh042v1x7yvffgs6yibakcac2"; + url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz"; + sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx"; }; - buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; + buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ]; patchPhase = '' sed -e s,/usr/local,$out, -i INSTALL From 174153238afbbd3e0fbe2619587a8c6520215361 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Mon, 5 Sep 2011 08:32:55 +0000 Subject: [PATCH 178/504] rdiff-backup: Fix nix expression. svn path=/nixpkgs/trunk/; revision=29017 --- pkgs/tools/backup/rdiff-backup/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 0c4f4b494fb..2460573310c 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,4 +1,5 @@ -args: with args; +{stdenv, fetchurl, python, librsync, gnused }: + stdenv.mkDerivation { name = "rdiff-backup-1.1.14"; @@ -7,9 +8,9 @@ stdenv.mkDerivation { sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h"; }; - phases = "installPhase"; + phases = "unpackPhase installPhase"; installPhase = '' - python setup.py install --prefix=$out + python ./setup.py install --prefix=$out sed -i $out/bin/rdiff-backup -e \ "/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6704c85b19b..26c650d0a7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1227,10 +1227,7 @@ let replace = callPackage ../tools/text/replace { }; - /* - rdiff_backup = callPackage ../tools/backup/rdiff-backup { - python=python; }; - */ + rdiff_backup = callPackage ../tools/backup/rdiff-backup { }; ripmime = callPackage ../tools/networking/ripmime {}; From ad416e1cffa8c8ea5f2b0ca3c9b86fbdda8b9ecd Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Mon, 5 Sep 2011 08:33:03 +0000 Subject: [PATCH 179/504] Add additional Intel firmwares (naming iwlwifig2{a,b}-ucode). svn path=/nixpkgs/trunk/; revision=29018 --- .../iwlwifi-6000g2a-ucode/default.nix | 29 +++++++++++++++++++ .../iwlwifi-6000g2b-ucode/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 62 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix create mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix new file mode 100644 index 00000000000..80aa6d367be --- /dev/null +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "iwlwifi-6000g2a-ucode-17.168.5.3"; + + src = fetchurl { + url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + sha256 = "febbbc0851db17296d35e5ca1d9266c1a14e9a9ae6ce41a36578c44971ae79f9"; + }; + + buildPhase = "true"; + + installPhase = '' + ensureDir "$out" + chmod -x * + cp * "$out" + ''; + + meta = { + description = "Firmware for the Intel 6000 Series Gen2 wireless card"; + + longDescription = '' + This package provides the Intel 6000 Series wireless card + firmware. It contains the `iwlwifi-6000g2a-5.ucode' file. + ''; + + homepage = http://intellinuxwireless.org/; + }; +} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix new file mode 100644 index 00000000000..580af83ea9d --- /dev/null +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "iwlwifi-6000g2b-ucode-17.168.5.2"; + + src = fetchurl { + url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052"; + }; + + buildPhase = "true"; + + installPhase = '' + ensureDir "$out" + chmod -x * + cp * "$out" + ''; + + meta = { + description = "Firmware for the Intel 6000 Series Gen2 wireless card"; + + longDescription = '' + This package provides the Intel 6000 Series wireless card + firmware. It contains the `iwlwifi-6000g2b-4.ucode' file. + ''; + + homepage = http://intellinuxwireless.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26c650d0a7f..4531c54a4be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5175,6 +5175,10 @@ let iwlwifi6000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000-ucode { }; + iwlwifi6000g2aucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { }; + + iwlwifi6000g2bucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { }; + kbd = callPackage ../os-specific/linux/kbd { }; libaio = callPackage ../os-specific/linux/libaio { }; From 51ccaadce376db6f8eed5edfde4d5f7d2acc790f Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Mon, 5 Sep 2011 08:33:07 +0000 Subject: [PATCH 180/504] Thunderbird 5.x: Add Linux as a build platform. svn path=/nixpkgs/trunk/; revision=29019 --- pkgs/applications/networking/mailreaders/thunderbird/5.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix index a8ee384d81d..a409cae0d28 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix @@ -79,5 +79,6 @@ stdenv.mkDerivation { # see http://www.mozilla.org/foundation/licensing.html if enableOfficialBranding then licenses.proprietary else licenses.mpl11; maintainers = with maintainers; [ pierron ]; + platforms = with platforms; linux; }; } From 1e6eeb9ad7750336dfcd1bdc47ef02c5ebd148c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 5 Sep 2011 09:52:34 +0000 Subject: [PATCH 181/504] Updated ghc-events and threadscope. svn path=/nixpkgs/trunk/; revision=29023 --- .../libraries/haskell/ghc-events/default.nix | 15 +++++++-------- .../tools/haskell/threadscope/default.nix | 10 +++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 23af9bfa7fe..9ebe3e94041 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -1,13 +1,12 @@ -{cabal, binary, mtl}: +{ cabal, binary, mtl }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "ghc-events"; - version = "0.2.0.1"; - sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6"; - propagatedBuildInputs = [binary mtl]; - preConfigure = '' - sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal - ''; + version = "0.3.0.1"; + sha256 = "08jnri6cwybg8b2f53rn8y1xzcpz32r0svahcw01g837p07mcpla"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary mtl ]; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 7787ea203ee..35b3dec9c86 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,15 +1,15 @@ -{ cabal, binary, cairo, ghcEvents, glade, gtk, mtl }: +{ cabal, binary, cairo, ghcEvents, glib, gtk, mtl, pango }: cabal.mkDerivation (self: { pname = "threadscope"; - version = "0.1.3"; - sha256 = "1vak3624vrnkfvwxzfw5hkc0552v213jb874f6q536g5vhjjxpih"; + version = "0.2.0"; + sha256 = "0b8lc8han4d90wgzliy80l1gbkm09gg6qxsn37blj41wzl6yzr9k"; isLibrary = false; isExecutable = true; - buildDepends = [ binary cairo ghcEvents glade gtk mtl ]; + buildDepends = [ binary cairo ghcEvents glib gtk mtl pango ]; configureFlags = "--ghc-options=-rtsopts"; meta = { - description = "A graphical thread profiler"; + description = "A graphical tool for profiling parallel Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From d7b4b63f4df8a03e19dae6e6754faa9ea082a18c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 10:14:24 +0000 Subject: [PATCH 182/504] * Allow literal examples to be included in the manual. svn path=/nixpkgs/trunk/; revision=29024 --- pkgs/lib/options.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index d742544bef2..cd60b8f3b88 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -287,5 +287,12 @@ rec { else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"]) else x; - + + /* For use in the ‘example’ option attribute. It causes the given + text to be included verbatim in documentation. This is necessary + for example values that are not simple values, e.g., + functions. */ + literalExample = text: { _type = "literalExample"; inherit text; }; + + } From 51124b08b582d141ec7b7ee6231eff04dbe1b568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 5 Sep 2011 13:29:33 +0000 Subject: [PATCH 183/504] Bumping the GHC HEAD snapshot. svn path=/nixpkgs/trunk/; revision=29026 --- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 98a01491237..3e30cd9b72b 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: stdenv.mkDerivation rec { - version = "7.3.20110804"; + version = "7.3.20110825"; name = "ghc-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${homepage}/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1n0prny5aaq09jp83skixla8frz5hcn8jbrc61m428q12jq1xsm7"; + sha256 = "06ngp3blg1nb1akiyxx2iypiwmybw4jg67lk9nmsn1jmj41v7dsm"; }; buildInputs = [ghc perl gmp ncurses]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4531c54a4be..19adc62dff7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2166,7 +2166,7 @@ let (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) (x : x.ghc721Prefs) false false lowPrio); - # Still a release candidate. + # Reasonably current HEAD snapshot. Should *always* be lowPrio. haskellPackages_ghcHEAD = haskellPackagesFun ../development/compilers/ghc/head.nix ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio; From a2f91fa8b0d540c23d5a3ff6235137e32f991477 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 17:29:28 +0000 Subject: [PATCH 184/504] haskell-authenticate: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=29028 --- pkgs/development/libraries/haskell/authenticate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index f6f2709bfba..dd6ea47fb50 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.1"; - sha256 = "03928v92s5j99r5v2jp9s4z87djj8dldkid8525aky0b0ghlnfhc"; + version = "0.10.2"; + sha256 = "02zgl7r2jpiw2srd6bzxkhxmbzvggbqs4qd4fhv7jn5y4jbwaw75"; buildDepends = [ aesonNative attoparsec base64Bytestring blazeBuilder caseInsensitive enumerator failure httpEnumerator httpTypes network From 116aa6a9e52e1220a345cbb7a50dd33e1ea8acba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 17:29:34 +0000 Subject: [PATCH 185/504] haskell-digest: updated to version 0.0.1.0 svn path=/nixpkgs/trunk/; revision=29029 --- pkgs/development/libraries/haskell/digest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index b13f156a3e8..b313da931f9 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digest"; - version = "0.0.0.9"; - sha256 = "15gj3iq3jm4lnkc6hnj9v8p8ia3yzbsajwf9by3b1kpl449k2h29"; + version = "0.0.1.0"; + sha256 = "1p2fk950ivdj7pvc624y0fx48rdh0ax3rw9606926n60mxi9fca0"; extraLibraries = [ zlib ]; meta = { description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; From c1183c17d7849f4b8246064b0c647cdfed75fbe6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 17:29:37 +0000 Subject: [PATCH 186/504] haskell-http-enumerator: updated to version 0.7.0 svn path=/nixpkgs/trunk/; revision=29030 --- .../libraries/haskell/http-enumerator/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index b92d69ec80b..2166e72e09c 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -1,21 +1,21 @@ { cabal, asn1Data, attoparsec, attoparsecEnumerator , base64Bytestring, blazeBuilder, blazeBuilderEnumerator -, caseInsensitive, certificate, cprngAes, enumerator, failure -, httpTypes, monadControl, network, tls, tlsExtra, transformers -, utf8String, zlibEnum +, caseInsensitive, certificate, cprngAes, dataDefault, enumerator +, failure, httpTypes, monadControl, network, tls, tlsExtra +, transformers, utf8String, zlibEnum }: cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.6.7"; - sha256 = "13x8p0dfaq2nkqh9ym7rbslnacvmdf5v1lpny2cia2im09hd1xbi"; + version = "0.7.0"; + sha256 = "0hbr03zv8y9maf9dh35d08pgbgj5dlqbaq158m576d4fnirmcapz"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data attoparsec attoparsecEnumerator base64Bytestring blazeBuilder blazeBuilderEnumerator caseInsensitive certificate - cprngAes enumerator failure httpTypes monadControl network tls - tlsExtra transformers utf8String zlibEnum + cprngAes dataDefault enumerator failure httpTypes monadControl + network tls tlsExtra transformers utf8String zlibEnum ]; meta = { homepage = "http://github.com/snoyberg/http-enumerator"; From 440e4482115a200f96fc3d016c2a4e7f05010429 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 17:29:41 +0000 Subject: [PATCH 187/504] haskell-xml-enumerator: updated to version 0.4.0 svn path=/nixpkgs/trunk/; revision=29031 --- .../libraries/haskell/xml-enumerator/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index cf77f04379c..f06a64d6654 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -1,21 +1,19 @@ { cabal, attoparsecText, attoparsecTextEnumerator, blazeBuilder -, blazeBuilderEnumerator, enumerator, failure, text, transformers -, xmlTypes +, blazeBuilderEnumerator, dataDefault, enumerator, failure, text +, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.3.4"; - sha256 = "0sfscsfcfmx56sdxc0wn2j1pyqjd9w92igz1n9xaph7zfz61g9k2"; - isLibrary = true; - isExecutable = true; + version = "0.4.0"; + sha256 = "1lgsm0xbz1f5941d8l3a9ipmwmffj1b8gp5a8if7r9davjf029xn"; buildDepends = [ attoparsecText attoparsecTextEnumerator blazeBuilder - blazeBuilderEnumerator enumerator failure text transformers - xmlTypes + blazeBuilderEnumerator dataDefault enumerator failure text + transformers xmlTypes ]; meta = { - homepage = "http://github.com/snoyberg/xml-enumerator"; + homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the enumerator package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From fba79e58c5013a675e85e7fca1f064aa3bd18385 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 17:29:45 +0000 Subject: [PATCH 188/504] haskell-yesod-auth: updated to version 0.7.1.1 svn path=/nixpkgs/trunk/; revision=29032 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index b2502047a0c..c7b32f2a431 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.1"; - sha256 = "066aq7c5gwbspbib748ky3lsb84llnb954n018fk5xs7b4gbyybk"; + version = "0.7.1.1"; + sha256 = "1jh9m8knrgjrm553s3y239ryvk8cv84v5yq8zng20b7marrhfy0p"; buildDepends = [ aesonNative authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From 9d1bee3245e605bf53a293068e3733d7980786e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 18:25:59 +0000 Subject: [PATCH 189/504] haskell-xmonad-extras: updated build expression svn path=/nixpkgs/trunk/; revision=29034 --- .../window-managers/xmonad/xmonad-extras.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 6d9b2a420fb..0461933a7bc 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -1,12 +1,15 @@ -{cabal, xmonad, xmonadContrib, X11, utf8String, X11Xft, - parsec, split}: +{ cabal, hint, mtl, network, parsec, random, split, X11, xmonad +, xmonadContrib +}: cabal.mkDerivation (self: { pname = "xmonad-extras"; version = "0.9.2"; sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701"; - propagatedBuildInputs = - [X11 xmonad xmonadContrib utf8String X11Xft parsec split]; + buildDepends = [ + hint mtl network parsec random split X11 xmonad xmonadContrib + ]; + configureFlags = "-f-with_hlist -f-with_mpd"; noHaddock = true; meta = { homepage = "http://projects.haskell.org/xmonad-extras"; From 378009ff4a9b014c5a8f9381549575161acb55cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 19:23:06 +0000 Subject: [PATCH 190/504] * Turn parallel building support on again (got lost somewhere...). svn path=/nixpkgs/trunk/; revision=29035 --- pkgs/desktops/kde-4.7/kde-package/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix index d06f8a8fd8b..f725c2f7bb1 100644 --- a/pkgs/desktops/kde-4.7/kde-package/default.nix +++ b/pkgs/desktops/kde-4.7/kde-package/default.nix @@ -27,10 +27,11 @@ rec { # released as individual tarballs kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}: stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc name; - meta = defMeta // meta; - } // (removeAttrs a [ "meta" "name" ])); + name = "${name}-${release}"; + src = kdesrc name; + meta = defMeta // meta; + enableParallelBuilding = true; + } // (removeAttrs a [ "meta" "name" ])); # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; @@ -43,9 +44,13 @@ rec { stdenv.mkDerivation ({ name = "${name}-${release}"; src = kdesrc module; - cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags; + cmakeFlags = + [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" + "-DBUILD_doc=TRUE" + "-DBUILD_${subdir}=TRUE" + ] ++ cmakeFlags; meta = defMeta // meta; + enableParallelBuilding = true; } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); # A KDE monolithic module From e373f558da33a06e140f435999b0219532221b26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:24:01 +0000 Subject: [PATCH 191/504] haskell-X11: updated build expression svn path=/nixpkgs/trunk/; revision=29036 --- pkgs/development/libraries/haskell/X11/default.nix | 9 ++++----- pkgs/top-level/haskell-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index f8eef4dcb36..9d01b2fdd86 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,12 +1,11 @@ -{cabal, syb, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}: +{ cabal, libX11, libXext, libXinerama, syb }: -assert xineramaSupport -> (libXinerama != null && libXext != null); - -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "X11"; version = "1.5.0.0"; sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f"; - propagatedBuildInputs = [libX11 syb] ++ (if xineramaSupport then [libXinerama libXext] else []); + buildDepends = [ syb ]; + extraLibraries = [ libX11 libXext libXinerama ]; meta = { homepage = "http://code.haskell.org/X11"; description = "A binding to the X11 graphics library"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c217b97fae..b3cb53f34df 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1283,10 +1283,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; - X11 = callPackage ../development/libraries/haskell/X11 { - inherit (pkgs.xlibs) libX11 libXinerama libXext; - xineramaSupport = true; - }; + X11 = callPackage ../development/libraries/haskell/X11 {}; X11Xft = callPackage ../development/libraries/haskell/X11-xft { inherit (pkgs) pkgconfig freetype fontconfig; From f67cf46ddcc132ddccf7699dce537a4db876da80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:24:07 +0000 Subject: [PATCH 192/504] haskell-ehc: updated to revision 2293 svn path=/nixpkgs/trunk/; revision=29037 --- pkgs/development/compilers/ehc/default.nix | 36 ++++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/ehc/default.nix b/pkgs/development/compilers/ehc/default.nix index cc2a6f9685c..27a0c431f67 100644 --- a/pkgs/development/compilers/ehc/default.nix +++ b/pkgs/development/compilers/ehc/default.nix @@ -1,25 +1,23 @@ -{stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib, uuagc, mtl, network, binary, llvm, fgl}: +{ stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib +, uuagc, mtl, network, binary, llvm, fgl, syb +}: -stdenv.mkDerivation (rec { - revision = "1996"; +let + revision = "2293"; +in +stdenv.mkDerivation { name = "ehc-svn-${revision}"; - homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome/"; src = fetchsvn { - url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC; - rev = revision; - sha256 = "92c658cd15dd513ccaeb81341f2680056276a46d053330f66c0214d10a6729e2"; + url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC; + rev = revision; + sha256 = "f4c3d83734cffd64b11e31637598330271a2bb8d2573235d063b27b2ef5f76b6"; }; - propagatedBuildInputs = [mtl network binary fgl]; + propagatedBuildInputs = [mtl network binary fgl syb]; buildInputs = [coreutils m4 ghc libtool uulib uuagc]; - # --force is required because the dependencies are not properly - # detected by Nix, being located in several package config files - configureFlags = [ - "--with-cabal-config-options=--ghc-pkg-options=--force" - "--with-cpp-ehc-options=-I${glibc}/include" - ]; + configureFlags = "--with-cpp-ehc-options=-I${glibc}/include"; # EHC builds packages during compilation; these are by default # installed in the user-specific package config file. We do not @@ -34,8 +32,12 @@ stdenv.mkDerivation (rec { ''; meta = { + homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome"; description = "Essential Haskell Compiler"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; }; - - inherit coreutils; -}) +} From 65c90e5d012e2d3c113151f958899c264acd3dbb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:24:12 +0000 Subject: [PATCH 193/504] haskell-packages.nix: removed lots of explicit argument assignments that have become obsolete svn path=/nixpkgs/trunk/; revision=29038 --- .../libraries/haskell/GLUT/2.1.1.2.nix | 4 +- .../libraries/haskell/GLUT/2.1.2.1.nix | 4 +- .../libraries/haskell/GLUT/2.2.2.0.nix | 6 +- .../libraries/haskell/OpenGLRaw/default.nix | 4 +- .../haskell/hp2any-graph/default.nix | 4 +- pkgs/top-level/haskell-packages.nix | 122 ++++-------------- 6 files changed, 38 insertions(+), 106 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix index c07e5c37174..302b1fb8fb9 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -1,11 +1,11 @@ -{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.1.1.2"; sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; buildDepends = [ OpenGL ]; - extraLibraries = [ glut libICE libSM libXi libXmu mesa ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index 553ec3ab8c0..d6551c6c6d9 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -1,11 +1,11 @@ -{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.1.2.1"; sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; buildDepends = [ OpenGL ]; - extraLibraries = [ glut libICE libSM libXi libXmu mesa ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix index 50440932727..2f25c5bd1ce 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix @@ -1,5 +1,5 @@ -{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL, StateVar -, Tensor +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL +, StateVar, Tensor }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "2.2.2.0"; sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx"; buildDepends = [ OpenGL StateVar Tensor ]; - extraLibraries = [ glut libICE libSM libXi libXmu mesa ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index e4f9daf066c..16863a4be15 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix @@ -1,10 +1,10 @@ -{ cabal, GL }: +{ cabal, mesa }: cabal.mkDerivation (self: { pname = "OpenGLRaw"; version = "1.1.0.1"; sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf"; - extraLibraries = [ GL ]; + extraLibraries = [ mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A raw binding for the OpenGL graphics system"; diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index 4dd915db7d3..a1cd26cbaf5 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -1,4 +1,4 @@ -{ cabal, GLUT, glut, hp2anyCore, network, OpenGL, parseargs }: +{ cabal, freeglut, GLUT, hp2anyCore, network, OpenGL, parseargs }: cabal.mkDerivation (self: { pname = "hp2any-graph"; @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ]; - extraLibraries = [ glut ]; + extraLibraries = [ freeglut ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b3cb53f34df..1e8c60b8220 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -528,9 +528,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; - editline = callPackage ../development/libraries/haskell/editline { - inherit (pkgs) libedit; - }; + editline = callPackage ../development/libraries/haskell/editline {}; emailValidate = callPackage ../development/libraries/haskell/email-validate {}; @@ -594,13 +592,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gitit = callPackage ../development/libraries/haskell/gitit {}; glade = callPackage ../development/libraries/haskell/glade { - inherit (pkgs) pkgconfig glibc; inherit (pkgs.gnome) libglade; gtkC = pkgs.gnome.gtk; }; glib = callPackage ../development/libraries/haskell/glib { - inherit (pkgs) pkgconfig glib glibc; + glib = pkgs.glib; }; GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; @@ -609,26 +606,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLU = pkgs.freeglut; }; - GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix { - glut = pkgs.freeglut; - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libSM libICE libXmu libXi; - }; - GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix { - glut = pkgs.freeglut; - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libSM libICE libXmu libXi; - }; + GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; + GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix { - glut = pkgs.freeglut; OpenGL = self.OpenGL_2_4_0_1; - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; GLUT = self.GLUT_2_1_1_2; gtk = callPackage ../development/libraries/haskell/gtk { - inherit (pkgs) pkgconfig glibc; inherit (pkgs.gtkLibs) gtk; }; @@ -636,7 +621,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gtk2hsC2hs = self.gtk2hsBuildtools; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { - inherit (pkgs) pkgconfig glibc; inherit (pkgs.gnome) gtksourceview; }; @@ -704,25 +688,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); odbc = pkgs.unixODBC; }; - HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix { - inherit (pkgs) postgresql; - }; + HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {}; - HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix { - inherit (pkgs) sqlite; - }; + HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; - HFuse = callPackage ../development/libraries/haskell/hfuse { - inherit (pkgs) fuse; - }; + HFuse = callPackage ../development/libraries/haskell/hfuse {}; HGL = callPackage ../development/libraries/haskell/HGL {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; - hint = callPackage ../development/libraries/haskell/hint { - ghcPaths = self.ghcPaths_0_1_0_6; - }; + hint = callPackage ../development/libraries/haskell/hint {}; Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {}; @@ -730,17 +706,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hledger = callPackage ../development/libraries/haskell/hledger {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; - hledgerVty = callPackage ../development/libraries/haskell/hledger-vty { - vty = self.vty_4_6_0_4; - }; + hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; HList = callPackage ../development/libraries/haskell/HList {}; - hmatrix = callPackage ../development/libraries/haskell/hmatrix { - inherit (pkgs) gsl liblapack/* lapack library */ blas; - }; + hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -748,9 +720,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hp2anyCore = callPackage ../development/libraries/haskell/hp2any-core {}; - hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph { - glut = pkgs.freeglut; - }; + hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph {}; hS3 = callPackage ../development/libraries/haskell/hS3 {}; @@ -758,9 +728,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hscolour = callPackage ../development/libraries/haskell/hscolour {}; - hsdns = callPackage ../development/libraries/haskell/hsdns { - inherit (pkgs) adns; - }; + hsdns = callPackage ../development/libraries/haskell/hsdns {}; hsemail = callPackage ../development/libraries/haskell/hsemail {}; @@ -902,27 +870,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL { - inherit (pkgs) openal; - }; + OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; - OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix { - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libX11; - }; - OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix { - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libX11; - }; - OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix { - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libX11; - }; + OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; + OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; + OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix {}; OpenGL = self.OpenGL_2_2_1_1; - OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw { - GL = pkgs.mesa; - }; + OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; @@ -931,7 +886,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; pango = callPackage ../development/libraries/haskell/pango { - inherit (pkgs) pkgconfig glibc; inherit (pkgs.gtkLibs) pango; }; @@ -952,9 +906,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathtype = callPackage ../development/libraries/haskell/pathtype {}; - pcreLight = callPackage ../development/libraries/haskell/pcre-light { - inherit (pkgs) pcre; - }; + pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; persistent = callPackage ../development/libraries/haskell/persistent {}; @@ -1009,7 +961,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); rvar = callPackage ../development/libraries/haskell/rvar {}; readline = callPackage ../development/libraries/haskell/readline { - inherit (pkgs) readline ncurses; + inherit (pkgs) readline; }; recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; @@ -1099,17 +1051,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {}; - SDLImage = callPackage ../development/libraries/haskell/SDL-image { - inherit (pkgs) SDL_image; - }; + SDLImage = callPackage ../development/libraries/haskell/SDL-image {}; - SDLMixer = callPackage ../development/libraries/haskell/SDL-mixer { - inherit (pkgs) SDL_mixer; - }; + SDLMixer = callPackage ../development/libraries/haskell/SDL-mixer {}; - SDLTtf = callPackage ../development/libraries/haskell/SDL-ttf { - inherit (pkgs) SDL_ttf; - }; + SDLTtf = callPackage ../development/libraries/haskell/SDL-ttf {}; SDL = callPackage ../development/libraries/haskell/SDL { inherit (pkgs) SDL; @@ -1156,9 +1102,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Tensor = callPackage ../development/libraries/haskell/Tensor {}; - terminfo = callPackage ../development/libraries/haskell/terminfo { - inherit (pkgs) ncurses; - }; + terminfo = callPackage ../development/libraries/haskell/terminfo {}; testFramework = callPackage ../development/libraries/haskell/test-framework {}; @@ -1277,18 +1221,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix { wxGTK = pkgs.wxGTK28; - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libX11; }; wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; X11 = callPackage ../development/libraries/haskell/X11 {}; - X11Xft = callPackage ../development/libraries/haskell/X11-xft { - inherit (pkgs) pkgconfig freetype fontconfig; - inherit (pkgs.xlibs) libXft; - }; + X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; @@ -1348,9 +1287,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); AgdaExecutable = callPackage ../development/compilers/Agda-executable {}; - ehc = callPackage ../development/compilers/ehc { - inherit (pkgs) fetchsvn stdenv coreutils glibc m4 libtool llvm; - }; + ehc = callPackage ../development/compilers/ehc {}; epic = callPackage ../development/compilers/epic {}; @@ -1417,18 +1354,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. - darcs = callPackage ../applications/version-management/darcs { - inherit (pkgs) curl; - parsec = self.parsec2; - }; + darcs = callPackage ../applications/version-management/darcs {}; leksah = callPackage ../applications/editors/leksah {}; xmobar = callPackage ../applications/misc/xmobar {}; - xmonad = callPackage ../applications/window-managers/xmonad { - inherit (pkgs.xlibs) xmessage; - }; + xmonad = callPackage ../applications/window-managers/xmonad {}; xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {}; From ed864ff8c38d1e594176931b19b73ff5dbf02516 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:31:42 +0000 Subject: [PATCH 194/504] haskell-happy: fixed build of version 1.18.4 svn path=/nixpkgs/trunk/; revision=29039 --- pkgs/development/tools/parsing/happy/1.18.4.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix index 5b52d222f37..cc5c60a3d43 100644 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ b/pkgs/development/tools/parsing/happy/1.18.4.nix @@ -1,4 +1,4 @@ -{ cabal, mtl }: +{ cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; + buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; description = "Happy is a parser generator for Haskell"; From b1277cea392b23bd4daa95e7fbfc0d4a85fb9c34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:31:49 +0000 Subject: [PATCH 195/504] haskell-ghc-paths: updated default version to 0.1.0.8 (and dropped obsolete older versions) svn path=/nixpkgs/trunk/; revision=29040 --- .../libraries/haskell/ghc-paths/0.1.0.5.nix | 16 ---------------- .../libraries/haskell/ghc-paths/0.1.0.6.nix | 16 ---------------- .../ghc-paths/{0.1.0.8.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 17 ++++------------- 4 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix delete mode 100644 pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix rename pkgs/development/libraries/haskell/ghc-paths/{0.1.0.8.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix deleted file mode 100644 index cd295e3476f..00000000000 --- a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "ghc-paths"; - version = "0.1.0.5"; - sha256 = "ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10"; - meta = { - description = "Knowledge of GHC's installation directories"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix deleted file mode 100644 index ae280fa54ea..00000000000 --- a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "ghc-paths"; - version = "0.1.0.6"; - sha256 = "95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243"; - meta = { - description = "Knowledge of GHC's installation directories"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix rename to pkgs/development/libraries/haskell/ghc-paths/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1e8c60b8220..4d1cef4d506 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -580,10 +580,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; - ghcPaths_0_1_0_5 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.5.nix {}; - ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {}; - ghcPaths_0_1_0_8 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.8.nix {}; - ghcPaths = self.ghcPaths_0_1_0_6; # version 0.1.0.5 doesn't build with an up-to-date GHC + ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {}; ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {}; @@ -1171,9 +1168,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {}; - vacuum = callPackage ../development/libraries/haskell/vacuum { - ghcPaths = self.ghcPaths_0_1_0_6; - }; + vacuum = callPackage ../development/libraries/haskell/vacuum {}; vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {}; @@ -1323,12 +1318,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); frown = callPackage ../development/tools/parsing/frown {}; haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; - haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { - ghcPaths = self.ghcPaths_0_1_0_6; - }; - haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix { - ghcPaths = self.ghcPaths_0_1_0_6; - }; + haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; + haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock = self.haddock_2_7_2; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; From 72ae88b019007abfc1f2cc41ad99c217a76b5a8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:45:45 +0000 Subject: [PATCH 196/504] haskell-WebBits: renamed nix file for consistency svn path=/nixpkgs/trunk/; revision=29041 --- .../libraries/haskell/WebBits/{default.nix => 2.0.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/WebBits/{default.nix => 2.0.nix} (100%) diff --git a/pkgs/development/libraries/haskell/WebBits/default.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/WebBits/default.nix rename to pkgs/development/libraries/haskell/WebBits/2.0.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4d1cef4d506..ddfe8da9fec 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1194,13 +1194,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); warp = callPackage ../development/libraries/haskell/warp {}; - WebBits = callPackage ../development/libraries/haskell/WebBits { - parsec = self.parsec2; - }; - WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { parsec = self.parsec2; }; + WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix { + parsec = self.parsec2; + }; + WebBits = self.WebBits_2_0; WebBitsHtml = callPackage ../development/libraries/haskell/WebBits-Html {}; From bbc00bd0e7072efee16c00999c55ebb5662a131f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:45:49 +0000 Subject: [PATCH 197/504] haskell-packages.nix: removed more obsolete manual overrides svn path=/nixpkgs/trunk/; revision=29042 --- .../libraries/haskell/GLURaw/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 19 ++++--------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index d6415126062..7837c4b818c 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -1,11 +1,11 @@ -{ cabal, GLU, OpenGLRaw }: +{ cabal, freeglut, OpenGLRaw }: cabal.mkDerivation (self: { pname = "GLURaw"; version = "1.1.0.0"; sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac"; buildDepends = [ OpenGLRaw ]; - extraLibraries = [ GLU ]; + extraLibraries = [ freeglut ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A raw binding for the OpenGL graphics system"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ddfe8da9fec..d9e6b81ca87 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -478,9 +478,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; - criterion = callPackage ../development/libraries/haskell/criterion { - parsec = self.parsec3; - }; + criterion = callPackage ../development/libraries/haskell/criterion {}; Crypto = callPackage ../development/libraries/haskell/Crypto {}; @@ -574,9 +572,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; - ghcEvents = callPackage ../development/libraries/haskell/ghc-events { - mtl = self.mtl1; - }; + ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; @@ -599,9 +595,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; - GLURaw = callPackage ../development/libraries/haskell/GLURaw { - GLU = pkgs.freeglut; - }; + GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; @@ -645,9 +639,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskeline = callPackage ../development/libraries/haskell/haskeline {}; - haskelineClass = callPackage ../development/libraries/haskell/haskeline-class { - mtl = self.mtl1; - }; + haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {}; @@ -1263,15 +1255,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib = self.zlib_0_5_0_0; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; From 0dfd245a17d2d0ccf5a5b274db88c7ae873812b9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 20:36:37 +0000 Subject: [PATCH 198/504] * Add thunar-volman and gvfs. svn path=/nixpkgs/trunk/; revision=29043 --- pkgs/desktops/xfce-4.8/core/thunar-volman.nix | 24 +++++++++++++++++++ pkgs/desktops/xfce-4.8/default.nix | 14 +++++++++++ pkgs/desktops/xfce-4.8/support/gvfs.nix | 12 ++++++++++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/core/thunar-volman.nix create mode 100644 pkgs/desktops/xfce-4.8/support/gvfs.nix diff --git a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix new file mode 100644 index 00000000000..ac47b49f0be --- /dev/null +++ b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui +, xfconf, udev, libnotify }: + +stdenv.mkDerivation rec { + name = "thunar-volman-0.6.0"; + + src = fetchurl { + url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2"; + sha1 = "dcda936948623b342b290a78c294f71c038e832e"; + }; + + buildInputs = + [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util + xfconf libnotify + ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://thunar.xfce.org/; + description = "Thunar extension for automatic management of removable drives and media"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 57098b12e3e..821a8e92fab 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -3,6 +3,16 @@ rec { inherit (pkgs.gtkLibs) gtk glib; + #### SUPPORT + + #gnome_disk_utility = callPackage ./support/gnome-disk-utility.nix { }; + + # Gvfs is required by Thunar for the trash feature and for volume + # mounting. Should use the one from Gnome, but I don't want to mess + # with the Gnome packages (or pull in a zillion Gnome dependencies). + gvfs = callPackage ./support/gvfs.nix { }; + + #### CORE libxfce4util = callPackage ./core/libxfce4util.nix { }; @@ -43,10 +53,13 @@ rec { thunar = callPackage ./core/thunar.nix { }; + thunar_volman = callPackage ./core/thunar-volman.nix { }; + gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; # !!! Add xfce4-appfinder + #### APPLICATIONS terminal = callPackage ./applications/terminal.nix { @@ -61,6 +74,7 @@ rec { xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; + #### ART xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix new file mode 100644 index 00000000000..880ca745b7a --- /dev/null +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev }: + +stdenv.mkDerivation rec { + name = "gvfs-1.8.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2"; + sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"; + }; + + buildInputs = [ pkgconfig glib dbus.libs intltool udev ]; +} From 88892075428f09e664453b9ee6f735aadc414730 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 20:49:41 +0000 Subject: [PATCH 199/504] haskell-cabal2nix: updated to version 1.14 svn path=/nixpkgs/trunk/; revision=29045 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 7c86f79485a..5ec64e2e059 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.13"; - sha256 = "1wjxaz3yyc41y4plwixd6p2g7higvjzpi8znbgvnzcpfj3hlh616"; + version = "1.14"; + sha256 = "0sdim1yqxx2wplfz6skz78y5lmh6dknc1k7jszmjnq0n9yc0b4bf"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From 41c9a5ebd327d0b31750f9ac6501e0e787ea6a26 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 20:54:53 +0000 Subject: [PATCH 200/504] * Fix the binutils URL. svn path=/nixpkgs/trunk/; revision=29047 --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 679a10a517d..c3d25c72323 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; src = fetchurl { - url = "mirror://gnu/binutils/${basename}.tar.bz2"; + url = "http://nixos.org/tarballs/${basename}.tar.bz2"; sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0"; }; From ad51692715f63e908fd4c4f47036ff7eb782d471 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 21:02:21 +0000 Subject: [PATCH 201/504] * Style fixes. svn path=/nixpkgs/trunk/; revision=29048 --- pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix | 10 ++-------- pkgs/desktops/kde-4.7/kdepim.nix | 6 ++++-- pkgs/desktops/kde-4.7/kdepimlibs.nix | 6 ++++-- pkgs/desktops/kde-4.7/support/soprano/default.nix | 12 +++++++----- pkgs/servers/sql/virtuoso/default.nix | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix index b8a4a21cc73..deb90574e32 100644 --- a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix @@ -1,5 +1,5 @@ -{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica, - libcanberra, virtuoso, makeWrapper, samba +{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica +, libcanberra, virtuoso, makeWrapper, samba }: # TODO: Re-enable ntrack once it is fixed upstream @@ -10,12 +10,6 @@ kde { makeWrapper samba (libcanberra.override { gtk = null; }) ]; -# Copied from kde45, Nepomuk needs it. - postInstall = '' - wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \ - --prefix PATH : "${virtuoso}/bin" - ''; - meta = { license = "LGPL"; }; diff --git a/pkgs/desktops/kde-4.7/kdepim.nix b/pkgs/desktops/kde-4.7/kdepim.nix index c21e8c112a8..9b95d491a44 100644 --- a/pkgs/desktops/kde-4.7/kdepim.nix +++ b/pkgs/desktops/kde-4.7/kdepim.nix @@ -3,8 +3,10 @@ kde { - buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2 - libxslt cyrus_sasl gpgme libassuan grantlee ]; + buildInputs = + [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2 + libxslt cyrus_sasl gpgme libassuan grantlee + ]; passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; diff --git a/pkgs/desktops/kde-4.7/kdepimlibs.nix b/pkgs/desktops/kde-4.7/kdepimlibs.nix index c1e22427ac7..736508eaf0f 100644 --- a/pkgs/desktops/kde-4.7/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.7/kdepimlibs.nix @@ -2,8 +2,10 @@ , kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }: kde { - buildInputs = [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt - openldap cyrus_sasl akonadi prison ]; + buildInputs = + [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt + openldap cyrus_sasl akonadi prison + ]; propagatedBuildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix index baed2233152..dbb6773f890 100644 --- a/pkgs/desktops/kde-4.7/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix @@ -8,11 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z"; }; - patches = [ (fetchurl { - url = https://git.reviewboard.kde.org/r/102466/diff/raw/; - name = "soprano-virtuoso-restart.patch"; - sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y"; - })]; + patches = + [ (fetchurl { + url = https://git.reviewboard.kde.org/r/102466/diff/raw/; + name = "soprano-virtuoso-restart.patch"; + sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y"; + }) + ]; # We disable the Java backend, since we do not need them and they make the closure size much bigger buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ]; diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index 20c3d1f2cf9..31dcc842a19 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -4,15 +4,15 @@ stdenv.mkDerivation rec { name = "virtuoso-opensource-6.1.3"; src = fetchurl { - url = "mirror://sf/virtuoso/${name}.tar.gz"; + url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2"; }; buildInputs = [ libxml2 openssl readline gawk ]; - CPP="${stdenv.gcc}/bin/gcc -E"; + CPP = "${stdenv.gcc}/bin/gcc -E"; - configureFlags=" + configureFlags = " --enable-shared --disable-all-vads --with-readline=${readline} --disable-hslookup --disable-wbxml2 --without-iodbc --enable-openssl=${openssl} From bf69a3f6b6dd2df9aaa494a83887aad0a2380e73 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 23:26:06 +0000 Subject: [PATCH 202/504] * Layout. svn path=/nixpkgs/trunk/; revision=29049 --- pkgs/development/libraries/strigi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 78a288e0bc7..1888ef2aab6 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16qqnlh0dy3r92shzm2q36h5qi3m06pihr4h5cq944hpvqz5w7qi"; }; - includeAllQtDirs=true; + includeAllQtDirs = true; CLUCENE_HOME = clucene_core; From d80391b7dff9025aca3ab5a0c889f1acb9e09e1d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 23:30:26 +0000 Subject: [PATCH 203/504] * Add Xfce 4.8 to the channel. svn path=/nixpkgs/trunk/; revision=29050 --- pkgs/desktops/xfce-4.8/applications/mousepad.nix | 2 ++ pkgs/desktops/xfce-4.8/applications/ristretto.nix | 2 ++ pkgs/desktops/xfce-4.8/applications/terminal.nix | 2 ++ pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix | 2 ++ pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix | 2 ++ pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix | 2 ++ pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix | 2 ++ pkgs/desktops/xfce-4.8/core/thunar-volman.nix | 2 ++ pkgs/desktops/xfce-4.8/core/thunar.nix | 2 ++ pkgs/desktops/xfce-4.8/core/xfce-utils.nix | 2 ++ pkgs/desktops/xfce-4.8/core/xfce4-panel.nix | 2 ++ pkgs/desktops/xfce-4.8/core/xfce4-session.nix | 2 ++ pkgs/desktops/xfce-4.8/core/xfce4-settings.nix | 2 ++ pkgs/desktops/xfce-4.8/core/xfdesktop.nix | 2 ++ pkgs/desktops/xfce-4.8/core/xfwm4.nix | 2 ++ pkgs/desktops/xfce-4.8/support/gvfs.nix | 6 ++++++ 16 files changed, 36 insertions(+) diff --git a/pkgs/desktops/xfce-4.8/applications/mousepad.nix b/pkgs/desktops/xfce-4.8/applications/mousepad.nix index 920151282a8..ab4bea16f1c 100644 --- a/pkgs/desktops/xfce-4.8/applications/mousepad.nix +++ b/pkgs/desktops/xfce-4.8/applications/mousepad.nix @@ -14,5 +14,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/projects/mousepad/; description = "A simple text editor for Xfce"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/applications/ristretto.nix b/pkgs/desktops/xfce-4.8/applications/ristretto.nix index 50a67d95ee9..cbb22e12ea7 100644 --- a/pkgs/desktops/xfce-4.8/applications/ristretto.nix +++ b/pkgs/desktops/xfce-4.8/applications/ristretto.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { homepage = http://goodies.xfce.org/projects/applications/ristretto; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/applications/terminal.nix b/pkgs/desktops/xfce-4.8/applications/terminal.nix index cacb775f8f1..44aa72d9d8c 100644 --- a/pkgs/desktops/xfce-4.8/applications/terminal.nix +++ b/pkgs/desktops/xfce-4.8/applications/terminal.nix @@ -19,5 +19,7 @@ stdenv.mkDerivation { homepage = http://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix index d34a5afb36f..bb50a0610f6 100644 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix @@ -34,5 +34,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/projects/xfce4-mixer; description = "A volume control application for the Xfce desktop environment"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix index b683ef71a0a..bad3b52a6bb 100644 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix @@ -18,5 +18,7 @@ stdenv.mkDerivation rec { homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix index a17267a336c..d69a517b203 100644 --- a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix @@ -13,5 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Icons for Xfce"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix index 7cca247ae44..4518897cc2f 100644 --- a/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix @@ -15,5 +15,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "GTK+ theme engine for Xfce"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix index ac47b49f0be..490390d1bac 100644 --- a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix +++ b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { homepage = http://thunar.xfce.org/; description = "Thunar extension for automatic management of removable drives and media"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/thunar.nix b/pkgs/desktops/xfce-4.8/core/thunar.nix index c9ab76f2920..0e8f72e22d6 100644 --- a/pkgs/desktops/xfce-4.8/core/thunar.nix +++ b/pkgs/desktops/xfce-4.8/core/thunar.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix index 58ef4fbef2a..eb998c2759f 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix @@ -16,5 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Utilities and scripts for Xfce"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix index 0752d18d7f2..fc297df9cbf 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Xfce panel"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix index c6f6234f473..7aeaedb1e2a 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix @@ -18,5 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Session manager for Xfce"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix index 3515d2553c5..03d2ac67a39 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Settings manager for Xfce"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix index 3742686d2e3..5f64fff3b4d 100644 --- a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix +++ b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Xfce desktop manager"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/core/xfwm4.nix b/pkgs/desktops/xfce-4.8/core/xfwm4.nix index 7dc3c653909..aefae75a3c3 100644 --- a/pkgs/desktops/xfce-4.8/core/xfwm4.nix +++ b/pkgs/desktops/xfce-4.8/core/xfwm4.nix @@ -21,5 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Window manager for Xfce"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix index 880ca745b7a..de033189930 100644 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -9,4 +9,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig glib dbus.libs intltool udev ]; + + meta = { + description = "Virtual Filesystem support library (for Xfce)" + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + } } From fde6f6968846ed0d7d85b8789826ef0759a723bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 23:30:42 +0000 Subject: [PATCH 204/504] * Oops. svn path=/nixpkgs/trunk/; revision=29051 --- pkgs/desktops/xfce-4.8/support/gvfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix index de033189930..309b980ad86 100644 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib dbus.libs intltool udev ]; meta = { - description = "Virtual Filesystem support library (for Xfce)" + description = "Virtual Filesystem support library (for Xfce)"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; } From 0b7d7153e3435c9794a419cfcc49ac39a961cfb7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 23:31:04 +0000 Subject: [PATCH 205/504] * Urgh. Should test first. svn path=/nixpkgs/trunk/; revision=29052 --- pkgs/desktops/xfce-4.8/support/gvfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix index 309b980ad86..d679e31a997 100644 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -14,5 +14,5 @@ stdenv.mkDerivation rec { description = "Virtual Filesystem support library (for Xfce)"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; - } + }; } From 30bf1fcb2987210f40def69e860b588649d983a7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Sep 2011 01:00:23 +0000 Subject: [PATCH 206/504] * Add libgdu as a dependency to gvfs to enable mounting of volumes (through udisks) in Xfce. Libgdu is part of gnome-disk-utility, which would pull in lots of Gnome dependencies, so some hackery is necessary to build only the useful part. svn path=/nixpkgs/trunk/; revision=29054 --- pkgs/desktops/xfce-4.8/default.nix | 2 +- pkgs/desktops/xfce-4.8/support/gvfs.nix | 4 +- .../xfce-4.8/support/libgdu-only.patch | 144 ++++++++++++++++++ pkgs/desktops/xfce-4.8/support/libgdu.nix | 34 +++++ 4 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 pkgs/desktops/xfce-4.8/support/libgdu-only.patch create mode 100644 pkgs/desktops/xfce-4.8/support/libgdu.nix diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 821a8e92fab..056bc4368c6 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -5,7 +5,7 @@ rec { #### SUPPORT - #gnome_disk_utility = callPackage ./support/gnome-disk-utility.nix { }; + libgdu = callPackage ./support/libgdu.nix { }; # Gvfs is required by Thunar for the trash feature and for volume # mounting. Should use the one from Gnome, but I don't want to mess diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix index d679e31a997..6e50e6825dd 100644 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }: stdenv.mkDerivation rec { name = "gvfs-1.8.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"; }; - buildInputs = [ pkgconfig glib dbus.libs intltool udev ]; + buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ]; meta = { description = "Virtual Filesystem support library (for Xfce)"; diff --git a/pkgs/desktops/xfce-4.8/support/libgdu-only.patch b/pkgs/desktops/xfce-4.8/support/libgdu-only.patch new file mode 100644 index 00000000000..c5873c71681 --- /dev/null +++ b/pkgs/desktops/xfce-4.8/support/libgdu-only.patch @@ -0,0 +1,144 @@ +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac gnome-disk-utility-2.30.1/configure.ac +--- gnome-disk-utility-2.30.1-orig/configure.ac 2010-03-22 16:54:09.000000000 +0100 ++++ gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.000000000 +0200 +@@ -106,17 +106,6 @@ + # GNOME + # ***** + +-GNOME_COMMON_INIT +-GNOME_DOC_INIT +-GNOME_DEBUG_CHECK +-GNOME_COMPILE_WARNINGS([maximum]) +-GNOME_MAINTAINER_MODE_DEFINES +- +-AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc], +- [use gtk-doc to build documentation [default=yes]]),, +- enable_gtk_doc=yes) +-GTK_DOC_CHECK([1.3]) +- + # *************************** + # Check for required packages + # *************************** +@@ -130,7 +119,6 @@ + UNIQUE_REQUIRED=1.0 + LIBNOTIFY_REQUIRED=0.3.0 + NAUTILUS_REQUIRED=2.24.0 +-AVAHI_UI_REQUIRED=0.6.25 + + UDISKS_REQUIRED=1.0.0 + UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0 +@@ -144,13 +132,7 @@ + PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED]) + PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED]) + PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) +-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED]) +-PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED]) +-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) + PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) +-PKG_CHECK_MODULES(X11, [x11]) +-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) +-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED]) + + # ************* + # Remote Access +@@ -183,21 +165,10 @@ + AC_SUBST(GNOME_KEYRING_CFLAGS) + AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"]) + +-# ************* +-# Documentation +-# ************* +- +-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +-if test x$SCROLLKEEPER_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) +-fi +- + # ******************** + # Internationalization + # ******************** + +-IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED]) +- + GETTEXT_PACKAGE=gnome-disk-utility + AC_SUBST([GETTEXT_PACKAGE]) + AM_GLIB_GNU_GETTEXT +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am gnome-disk-utility-2.30.1/doc/Makefile.am +--- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02 20:52:38.000000000 +0100 ++++ gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.000000000 +0200 +@@ -70,9 +70,7 @@ + Makefile.in \ + $(NULL) + +-include $(top_srcdir)/gtk-doc.make +- +-CLEANFILES += *~ \ ++CLEANFILES = *~ \ + gnome-disk-utility-scan* \ + gnome-disk-utility.args \ + gnome-disk-utility.hierarchy \ +@@ -91,4 +89,4 @@ + $(NULL) + + # Version information for marking the documentation +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/gtk-doc.make gnome-disk-utility-2.30.1/gtk-doc.make +--- gnome-disk-utility-2.30.1-orig/gtk-doc.make 2010-03-16 00:08:20.000000000 +0100 ++++ gnome-disk-utility-2.30.1/gtk-doc.make 2011-09-06 02:15:33.000000000 +0200 +@@ -4,15 +4,9 @@ + # Everything below here is generic # + #################################### + +-if GTK_DOC_USE_LIBTOOL +-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = $(LIBTOOL) --mode=execute +-else + GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + GTKDOC_RUN = +-endif + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to +@@ -49,22 +43,7 @@ + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +-if ENABLE_GTK_DOC +-if GTK_DOC_BUILD_HTML +-HTML_BUILD_STAMP=html-build.stamp +-else +-HTML_BUILD_STAMP= +-endif +-if GTK_DOC_BUILD_PDF +-PDF_BUILD_STAMP=pdf-build.stamp +-else +-PDF_BUILD_STAMP= +-endif +- +-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +-else + all-local: +-endif + + docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/help/Makefile.am gnome-disk-utility-2.30.1/help/Makefile.am +--- gnome-disk-utility-2.30.1-orig/help/Makefile.am 2009-09-23 20:35:01.000000000 +0200 ++++ gnome-disk-utility-2.30.1/help/Makefile.am 2011-09-06 02:18:13.000000000 +0200 +@@ -1,4 +1,3 @@ +-include $(top_srcdir)/gnome-doc-utils.make + dist-hook: doc-dist-hook + + DOC_MODULE = palimpsest +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/Makefile.am gnome-disk-utility-2.30.1/Makefile.am +--- gnome-disk-utility-2.30.1-orig/Makefile.am 2010-03-16 00:12:39.000000000 +0100 ++++ gnome-disk-utility-2.30.1/Makefile.am 2011-09-06 02:17:34.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = src data doc help po ++SUBDIRS = src data + + EXTRA_DIST = \ + autogen.sh \ diff --git a/pkgs/desktops/xfce-4.8/support/libgdu.nix b/pkgs/desktops/xfce-4.8/support/libgdu.nix new file mode 100644 index 00000000000..32835f0434a --- /dev/null +++ b/pkgs/desktops/xfce-4.8/support/libgdu.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gnome, pkgconfig, glib, dbus_glib, intltool, udev, gtk +, libnotify, udisks, libatasmart, avahi +, autoconf, automake, libtool }: + +let version = "2.30.1"; in + +stdenv.mkDerivation rec { + name = "libgdu-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/2.30/gnome-disk-utility-${version}.tar.bz2"; + sha256 = "df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7"; + }; + + # Only build libgdu, not all that Gnome crap. + patches = [ ./libgdu-only.patch ]; + + buildInputs = + [ pkgconfig glib dbus_glib udisks + autoconf automake libtool + ]; + + preConfigure = + '' + substituteInPlace src/gdu/Makefile.am --replace /usr/share/dbus-1/interfaces ${udisks}/share/dbus-1/interfaces + autoreconf -f -i + ''; + + postConfigure = "cd src/gdu"; + + meta = { + description = "Xfce/Gvfs support library for mounting filesystems"; + }; +} From 14c11b349a0775b46ed00f877ac09fca1a1db053 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 6 Sep 2011 05:37:59 +0000 Subject: [PATCH 207/504] ruby/generated.nix: Add rails and its dependencies (which automatically updated rake) svn path=/nixpkgs/trunk/; revision=29055 --- .../interpreters/ruby/generated.nix | 419 +++++++++++++++++- 1 file changed, 413 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 7f6d51b2418..b6ec049f9f7 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,11 +3,244 @@ g: # Get dependencies from patched gems { aliases = { + actionmailer = g.actionmailer_3_1_0; + actionpack = g.actionpack_3_1_0; + activemodel = g.activemodel_3_1_0; + activerecord = g.activerecord_3_1_0; + activeresource = g.activeresource_3_1_0; + activesupport = g.activesupport_3_1_0; + arel = g.arel_2_2_1; + bcrypt_ruby = g.bcrypt_ruby_3_0_0; + builder = g.builder_3_0_0; + bundler = g.bundler_1_0_18; + erubis = g.erubis_2_7_0; + hike = g.hike_1_2_1; + i18n = g.i18n_0_6_0; + mail = g.mail_2_3_0; + mime_types = g.mime_types_1_16; + multi_json = g.multi_json_1_0_3; nix = g.nix_0_1_1; - rake = g.rake_0_8_7; + polyglot = g.polyglot_0_3_2; + rack = g.rack_1_3_2; + rack_cache = g.rack_cache_1_0_3; + rack_mount = g.rack_mount_0_8_3; + rack_ssl = g.rack_ssl_1_3_2; + rack_test = g.rack_test_0_6_1; + rails = g.rails_3_1_0; + railties = g.railties_3_1_0; + rake = g.rake_0_9_2; + rdoc = g.rdoc_3_9_4; + sprockets = g.sprockets_2_0_0; + thor = g.thor_0_14_6; + tilt = g.tilt_1_3_3; + treetop = g.treetop_1_4_10; + tzinfo = g.tzinfo_0_3_29; }; - gem_nix_args = [ ''nix'' ''rake'' ]; + gem_nix_args = [ ''nix'' ''rails'' ''rake'' ]; gems = { + actionmailer_3_1_0 = { + basename = ''actionmailer''; + meta = { + description = ''Email composition, delivery, and receiving framework (part of Rails).''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; + }; + name = ''actionmailer-3.1.0''; + requiredGems = [ g.mail_2_3_0 ]; + sha256 = ''1730ky434qhbqnwnvbj9r57i4s6lcmwvnfhv6i91iif7anmjl22p''; + }; + actionpack_3_1_0 = { + basename = ''actionpack''; + meta = { + description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; + }; + name = ''actionpack-3.1.0''; + requiredGems = [ g.activemodel_3_1_0 g.rack_cache_1_0_3 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_0 g.erubis_2_7_0 ]; + sha256 = ''0igy1dp8zdh653v4wz7vxdjmz681k8653n0xan9ng1qgsk9b7wlh''; + }; + activemodel_3_1_0 = { + basename = ''activemodel''; + meta = { + description = ''A toolkit for building modeling frameworks (part of Rails).''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; + }; + name = ''activemodel-3.1.0''; + requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 g.bcrypt_ruby_3_0_0 ]; + sha256 = ''1hpppp54v05ci4l7nx79i9lcnf6z00lhi5wpn8sgyr5869xihvq6''; + }; + activerecord_3_1_0 = { + basename = ''activerecord''; + meta = { + description = ''Object-relational mapper framework (part of Rails).''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; + }; + name = ''activerecord-3.1.0''; + requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_29 ]; + sha256 = ''1dq5k2r6a85wmzgv5gv0rrxf43agzzcj6z4az6w034nxarv7ccml''; + }; + activeresource_3_1_0 = { + basename = ''activeresource''; + meta = { + description = ''REST modeling framework (part of Rails).''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; + }; + name = ''activeresource-3.1.0''; + requiredGems = [ ]; + sha256 = ''1vd4mmfxk1zmqxv44q0wxhg74yc7qah17im44qjv0b850522vavg''; + }; + activesupport_3_1_0 = { + basename = ''activesupport''; + meta = { + description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; + }; + name = ''activesupport-3.1.0''; + requiredGems = [ g.multi_json_1_0_3 ]; + sha256 = ''0hrnak4rpaxxb34918d9yjvcgz2jv7mnbsf3a7nz6dvqf6gw7110''; + }; + arel_2_2_1 = { + basename = ''arel''; + meta = { + description = ''Arel is a SQL AST manager for Ruby''; + homepage = ''http://github.com/rails/arel''; + longDescription = ''Arel is a SQL AST manager for Ruby. It + +1. Simplifies the generation complex of SQL queries +2. Adapts to various RDBMS systems + +It is intended to be a framework framework; that is, you can build your own ORM +with it, focusing on innovative object and collection modeling as opposed to +database compatibility and query generation.''; + }; + name = ''arel-2.2.1''; + requiredGems = [ ]; + sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy''; + }; + bcrypt_ruby_3_0_0 = { + basename = ''bcrypt_ruby''; + meta = { + description = ''OpenBSD's bcrypt() password hashing algorithm.''; + homepage = ''http://bcrypt-ruby.rubyforge.org''; + longDescription = '' bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project + for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling + passwords. +''; + }; + name = ''bcrypt-ruby-3.0.0''; + requiredGems = [ ]; + sha256 = ''0chw0hh2vkb0nc4x1g350wzplf7kas6fddfa976c6gwvjgrbd7fw''; + }; + builder_3_0_0 = { + basename = ''builder''; + meta = { + description = ''Builders for MarkUp.''; + homepage = ''http://onestepback.org''; + longDescription = ''Builder provides a number of builder objects that make creating structured data +simple to do. Currently the following builder objects are supported: + +* XML Markup +* XML Events +''; + }; + name = ''builder-3.0.0''; + requiredGems = [ ]; + sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv''; + }; + bundler_1_0_18 = { + basename = ''bundler''; + meta = { + description = ''The best way to manage your application's dependencies''; + homepage = ''http://gembundler.com''; + longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; + }; + name = ''bundler-1.0.18''; + requiredGems = [ ]; + sha256 = ''0rz1qibmvydkfx0akq97rlihvf20jl51dxh8x0xivb1i0zkykb5b''; + }; + erubis_2_7_0 = { + basename = ''erubis''; + meta = { + description = ''a fast and extensible eRuby implementation which supports multi-language''; + homepage = ''http://www.kuwata-lab.com/erubis/''; + longDescription = '' Erubis is an implementation of eRuby and has the following features: + + * Very fast, almost three times faster than ERB and about 10% faster than eruby. + * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript) + * Auto escaping support + * Auto trimming spaces around '<% %>' + * Embedded pattern changeable (default '<% %>') + * Enable to handle Processing Instructions (PI) as embedded pattern (ex. '<?rb ... ?>') + * Context object available and easy to combine eRuby template with YAML datafile + * Print statement available + * Easy to extend and customize in subclass + * Ruby on Rails support +''; + }; + name = ''erubis-2.7.0''; + requiredGems = [ ]; + sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; + }; + hike_1_2_1 = { + basename = ''hike''; + meta = { + description = ''Find files in a set of paths''; + homepage = ''http://github.com/sstephenson/hike''; + longDescription = ''A Ruby library for finding files in a set of paths.''; + }; + name = ''hike-1.2.1''; + requiredGems = [ ]; + sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b''; + }; + i18n_0_6_0 = { + basename = ''i18n''; + meta = { + description = ''New wave Internationalization support for Ruby''; + homepage = ''http://github.com/svenfuchs/i18n''; + longDescription = ''New wave Internationalization support for Ruby.''; + }; + name = ''i18n-0.6.0''; + requiredGems = [ ]; + sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; + }; + mail_2_3_0 = { + basename = ''mail''; + meta = { + description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.''; + homepage = ''http://github.com/mikel/mail''; + longDescription = ''A really Ruby Mail handler.''; + }; + name = ''mail-2.3.0''; + requiredGems = [ g.mime_types_1_16 g.treetop_1_4_10 ]; + sha256 = ''1cnid9wn5wy0d2shx4ykvgd5jrvgq55yal8i51b47d4037n1yr53''; + }; + mime_types_1_16 = { + basename = ''mime_types''; + meta = { + description = ''Manages a MIME Content-Type database that will return the Content-Type for a given filename.''; + homepage = ''http://mime-types.rubyforge.org/''; + longDescription = ''MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen.''; + }; + name = ''mime-types-1.16''; + requiredGems = [ ]; + sha256 = ''1slp7g2xv9ygcapqv13qgh3g6ipx5k5c3imb5sdyh0b9ip5s34y3''; + }; + multi_json_1_0_3 = { + basename = ''multi_json''; + meta = { + description = ''A gem to provide swappable JSON backends.''; + homepage = ''http://github.com/intridea/multi_json''; + longDescription = ''A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.''; + }; + name = ''multi_json-1.0.3''; + requiredGems = [ ]; + sha256 = ''12c7h38x1cmgl265n4397zx3ag8szkrq1q4lw7pp6fkqd532n9xb''; + }; nix_0_1_1 = { basename = ''nix''; meta = { @@ -19,16 +252,190 @@ g: # Get dependencies from patched gems requiredGems = [ ]; sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k''; }; - rake_0_8_7 = { + polyglot_0_3_2 = { + basename = ''polyglot''; + meta = { + description = ''Augment 'require' to load non-Ruby file types''; + homepage = ''http://github.com/cjheath/polyglot''; + longDescription = '' +The Polyglot library allows a Ruby module to register a loader +for the file type associated with a filename extension, and it +augments 'require' to find and load matching files.''; + }; + name = ''polyglot-0.3.2''; + requiredGems = [ ]; + sha256 = ''0m2ni5bcwfmhjwndhy115zgcvq0wdf3hk0hal1sfidfz9vbd0hyz''; + }; + rack_1_3_2 = { + basename = ''rack''; + meta = { + description = ''a modular Ruby webserver interface''; + homepage = ''http://rack.rubyforge.org''; + longDescription = ''Rack provides minimal, modular and adaptable interface for developing +web applications in Ruby. By wrapping HTTP requests and responses in +the simplest way possible, it unifies and distills the API for web +servers, web frameworks, and software in between (the so-called +middleware) into a single method call. + +Also see http://rack.rubyforge.org. +''; + }; + name = ''rack-1.3.2''; + requiredGems = [ ]; + sha256 = ''1qrs4ryj8a4c3f9raz8mvcl82dinzyiy7rcp7i3jd2xjra75dz7k''; + }; + rack_cache_1_0_3 = { + basename = ''rack_cache''; + meta = { + description = ''HTTP Caching for Rack''; + homepage = ''http://tomayko.com/src/rack-cache/''; + longDescription = ''HTTP Caching for Rack''; + }; + name = ''rack-cache-1.0.3''; + requiredGems = [ g.rack_1_3_2 ]; + sha256 = ''188q2sf44380zqq8kpqb6d4gl7fh5bimkcn8khpri64n6lmqd42w''; + }; + rack_mount_0_8_3 = { + basename = ''rack_mount''; + meta = { + description = ''Stackable dynamic tree based Rack router''; + homepage = ''https://github.com/josh/rack-mount''; + longDescription = '' A stackable dynamic tree based Rack router. +''; + }; + name = ''rack-mount-0.8.3''; + requiredGems = [ ]; + sha256 = ''09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2''; + }; + rack_ssl_1_3_2 = { + basename = ''rack_ssl''; + meta = { + description = ''Force SSL/TLS in your app.''; + homepage = ''https://github.com/josh/rack-ssl''; + longDescription = '' Rack middleware to force SSL/TLS. +''; + }; + name = ''rack-ssl-1.3.2''; + requiredGems = [ ]; + sha256 = ''1h9pfn5c95qigkm1vb5nbla7fwjl86q887w57iiqp4kdvrjh9wrn''; + }; + rack_test_0_6_1 = { + basename = ''rack_test''; + meta = { + description = ''Simple testing API built on Rack''; + homepage = ''http://github.com/brynary/rack-test''; + longDescription = ''Rack::Test is a small, simple testing API for Rack apps. It can be used on its +own or as a reusable starting point for Web frameworks and testing libraries +to build on. Most of its initial functionality is an extraction of Merb 1.0's +request helpers feature.''; + }; + name = ''rack-test-0.6.1''; + requiredGems = [ ]; + sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; + }; + rails_3_1_0 = { + basename = ''rails''; + meta = { + description = ''Full-stack web application framework.''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; + }; + name = ''rails-3.1.0''; + requiredGems = [ g.activesupport_3_1_0 g.actionpack_3_1_0 g.activerecord_3_1_0 g.activeresource_3_1_0 g.actionmailer_3_1_0 g.railties_3_1_0 g.bundler_1_0_18 ]; + sha256 = ''1ki0jnq40kvfdp3kvnzvnrl9j09n9gql77pbl6jz565siqnvikms''; + }; + railties_3_1_0 = { + basename = ''railties''; + meta = { + description = ''Tools for creating, working with, and running Rails applications.''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; + }; + name = ''railties-3.1.0''; + requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_9_4 ]; + sha256 = ''155snh4hwflxqylyqlsyqpdm5f80qk2lqn9jhksx85m1sz99mxym''; + }; + rake_0_9_2 = { basename = ''rake''; meta = { description = ''Ruby based make-like utility.''; homepage = ''http://rake.rubyforge.org''; - longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.''; + longDescription = '' Rake is a Make-like program implemented in Ruby. Tasks + and dependencies are specified in standard Ruby syntax. +''; }; - name = ''rake-0.8.7''; + name = ''rake-0.9.2''; requiredGems = [ ]; - sha256 = ''03z1zm7xwl2r9v945ambwbd9sn2smbi34xldmac7qjcmsvd7pcqh''; + sha256 = ''1348lm18j0rki4zjgb4rgplai32j0izkvbbi66lk7n0z89dm4ny5''; + }; + rdoc_3_9_4 = { + basename = ''rdoc''; + meta = { + description = ''RDoc produces HTML and command-line documentation for Ruby projects''; + homepage = ''http://docs.seattlerb.org/rdoc''; + longDescription = ''RDoc produces HTML and command-line documentation for Ruby projects. RDoc +includes the +rdoc+ and +ri+ tools for generating and displaying online +documentation. + +See RDoc for a description of RDoc's markup and basic use.''; + }; + name = ''rdoc-3.9.4''; + requiredGems = [ ]; + sha256 = ''0znp5xssql3pmk38s58b0dvvcv5d3r28gx6jrzyb9158jz98jmf5''; + }; + sprockets_2_0_0 = { + basename = ''sprockets''; + meta = { + description = ''Rack-based asset packaging system''; + homepage = ''http://getsprockets.org/''; + longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; + }; + name = ''sprockets-2.0.0''; + requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; + sha256 = ''1b3yih9mzpbn6w1kymwrcd606yw8nds5h3ig4ky5g65qwl7gk75c''; + }; + thor_0_14_6 = { + basename = ''thor''; + meta = { + description = ''A scripting framework that replaces rake, sake and rubigen''; + homepage = ''http://github.com/wycats/thor''; + longDescription = ''A scripting framework that replaces rake, sake and rubigen''; + }; + name = ''thor-0.14.6''; + requiredGems = [ ]; + sha256 = ''18qmgv38gfw9clhq6szyw5kcxkkk8xr7c0klp3pk3cyznzbapif7''; + }; + tilt_1_3_3 = { + basename = ''tilt''; + meta = { + description = ''Generic interface to multiple Ruby template engines''; + homepage = ''http://github.com/rtomayko/tilt/''; + longDescription = ''Generic interface to multiple Ruby template engines''; + }; + name = ''tilt-1.3.3''; + requiredGems = [ ]; + sha256 = ''18qdl8nllbgwipa2ab9df3wlfgvsc8ml78hbypwc17b9qwv9bbs8''; + }; + treetop_1_4_10 = { + basename = ''treetop''; + meta = { + description = ''A Ruby-based text parsing and interpretation DSL''; + homepage = ''http://functionalform.blogspot.com''; + }; + name = ''treetop-1.4.10''; + requiredGems = [ g.polyglot_0_3_2 ]; + sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2''; + }; + tzinfo_0_3_29 = { + basename = ''tzinfo''; + meta = { + description = ''Daylight-savings aware timezone library''; + homepage = ''http://tzinfo.rubyforge.org/''; + longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; + }; + name = ''tzinfo-0.3.29''; + requiredGems = [ ]; + sha256 = ''10504cr141vgg12nqbd920xj0q2b07gbjjdwdrwjj35pp97ymrij''; }; }; } From 562384d2eb18cb89f9bc05963789c4282703fc10 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Sep 2011 09:50:20 +0000 Subject: [PATCH 208/504] * upower updated to 0.9.13. svn path=/nixpkgs/trunk/; revision=29056 --- pkgs/os-specific/linux/upower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index b0feb09cb86..963a4f48d7a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.12"; + name = "upower-0.9.13"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6"; + sha256 = "08jasjkp44ydvsnk020xghrshi0jspp5078id26n5nhidp1d4z9c"; }; buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; From eba95e013bb7f866924299f1a098d49942ebf3ee Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 6 Sep 2011 17:09:41 +0000 Subject: [PATCH 209/504] viewmtn: Update to new url svn path=/nixpkgs/trunk/; revision=29063 --- pkgs/applications/version-management/viewmtn/0.10.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix index 169bd407b7d..a8ced15b58c 100644 --- a/pkgs/applications/version-management/viewmtn/0.10.nix +++ b/pkgs/applications/version-management/viewmtn/0.10.nix @@ -2,7 +2,7 @@ args : with args; rec { src = fetchurl { - url = http://grahame.angrygoats.net/source/viewmtn/viewmtn-0.10.tgz; + url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz; sha256 = "1c6y708xaf6pds1r6l00q7vpgfagfbnf95kqj168vw3xr3l8a4yx"; }; From 9dd496c687eff3a641d3ca528ca3292331217ad5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 6 Sep 2011 17:10:08 +0000 Subject: [PATCH 210/504] highlight: Update to 3.5 svn path=/nixpkgs/trunk/; revision=29064 --- pkgs/tools/text/highlight/default.nix | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 53f562eb10a..40a3bcf78ea 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, getopt }: +{ stdenv, fetchurl, getopt, lua, boost }: stdenv.mkDerivation rec { - name = "highlight-2.6.10"; + name = "highlight-3.5"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira"; + sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28"; }; - buildInputs = [getopt]; + buildInputs = [ getopt lua boost ]; - preBuild = '' - sed -e '/#include /i#include ' -i src/re/Pattern.h - ''; - - makeFlags = ["PREFIX=$out"]; + makeFlags = [ + "PREFIX=$(out)" + "conf_dir=$(out)/etc/highlight/" + ]; meta = { description = "Source code highlighting tool"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19adc62dff7..67d2adc56f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -812,7 +812,9 @@ let hevea = callPackage ../tools/typesetting/hevea { }; - highlight = callPackage ../tools/text/highlight { }; + highlight = callPackage ../tools/text/highlight { + lua = lua5; + }; host = callPackage ../tools/networking/host { }; From 051326b8c762e3757e72a607db09ca5de4fc47d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Sep 2011 17:17:38 +0000 Subject: [PATCH 211/504] haskell-Hipmunk: updated to version 5.2.0.3 svn path=/nixpkgs/trunk/; revision=29065 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 537bc0ca30b..4bbe1f6498b 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.2"; - sha256 = "18ly05q953x59smqqrhwjlfa1v6lqma0xiarmr689i63zzb7ji8z"; + version = "5.2.0.3"; + sha256 = "1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m"; buildDepends = [ StateVar transformers ]; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; From 70c6cc780aac2fb4ee0c8ea0aecb5b0829a2cd89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Sep 2011 17:17:43 +0000 Subject: [PATCH 212/504] haskell-xml-enumerator: updated to version 0.4.1 svn path=/nixpkgs/trunk/; revision=29066 --- pkgs/development/libraries/haskell/xml-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index f06a64d6654..016c841eb07 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.0"; - sha256 = "1lgsm0xbz1f5941d8l3a9ipmwmffj1b8gp5a8if7r9davjf029xn"; + version = "0.4.1"; + sha256 = "081avccvkakcbf2m22xdda63jhwykqxxclmlhj6msawkyyqniadj"; buildDepends = [ attoparsecText attoparsecTextEnumerator blazeBuilder blazeBuilderEnumerator dataDefault enumerator failure text From dcd147a1411753d5acb9a22027002bdea9932dcb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 6 Sep 2011 20:47:27 +0000 Subject: [PATCH 213/504] Add note in binutils/default.nix to warn about the problematic source tarball svn path=/nixpkgs/trunk/; revision=29067 --- pkgs/development/tools/misc/binutils/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c3d25c72323..4ccaa550313 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -6,6 +6,22 @@ in stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; + # WARNING: Upstream made a mistake in packaging that may mean anyone + # but the FSF hosting this tarball is accidentally in violation of + # the GPL. We can't update binutils until the next stdenv-updates, + # so we are stuck with this version. The issue is discussed in + # this email: http://sourceware.org/ml/binutils/2011-08/msg00198.html + # The tarball for this minor version will not be fixed, as only the + # tarballs for the latest minor version of each major version will + # be repackaged. The fixed sources for the closest version to this one + # can be found at mirror://gnu/binutils/binutils-2.21.1a.tar.bz2 + # or http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2 + # The sources missing from this tarball come from cgen. It is unclear + # WHICH sources should be included, but the cvs tree can be checked out + # by: + # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src login + # {enter "anoncvs" as the password} + # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co cgen src = fetchurl { url = "http://nixos.org/tarballs/${basename}.tar.bz2"; sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0"; From 84e3e287c372b95dc4f52d02297bbccd16008791 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 6 Sep 2011 23:32:01 +0000 Subject: [PATCH 214/504] Add freerdp svn path=/nixpkgs/trunk/; revision=29068 --- .../networking/remote/freerdp/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/networking/remote/freerdp/default.nix diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix new file mode 100644 index 00000000000..51a1b5ae0e0 --- /dev/null +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, openssl +, printerSupport ? true, cups +, pkgconfig +, zlib +, libX11 +, libXcursor +, alsaLib +}: + +assert printerSupport -> cups != null; +stdenv.mkDerivation rec { + name = "freerdp-0.8.2"; + + src = fetchurl { + url = "mirror://sourceforge/freerdp/${name}.tar.gz"; + sha256 = "1q9hhwyc4hk49hsmd2kghrfsawxcc7gy7vcmhdf91l8v95xp16iq"; + }; + + buildInputs = [ + openssl + pkgconfig + zlib + libX11 + libXcursor + alsaLib + ] ++ stdenv.lib.optional printerSupport cups; + + configureFlags = [ + "--with-x" + ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67d2adc56f4..6c93fce6ceb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6549,6 +6549,8 @@ let xfontsel = callPackage ../applications/misc/xfontsel { }; xlsfonts = callPackage ../applications/misc/xlsfonts { }; + freerdp = callPackage ../applications/networking/remote/freerdp { }; + fspot = callPackage ../applications/graphics/f-spot { inherit (gnome) libgnome libgnomeui; gtksharp = gtksharp1; From 02aa1d7cde3a7cb50e7448e6862bbb2106d9ebde Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Sep 2011 01:12:38 +0000 Subject: [PATCH 215/504] Add cunit svn path=/nixpkgs/trunk/; revision=29069 --- pkgs/tools/misc/cunit/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/misc/cunit/default.nix diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix new file mode 100644 index 00000000000..22445b5d21c --- /dev/null +++ b/pkgs/tools/misc/cunit/default.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "CUnit-2.1-2"; + + src = fetchurl { + url = "mirror://sourceforge/cunit/${name}-src.tar.bz2"; + sha256 = "1slb2sybv886ys0qqikb8lzn0h9jcqfrv64lakdxmqbgncq5yw0z"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c93fce6ceb..38d7e04f34b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -526,6 +526,8 @@ let scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; }; + cunit = callPackage ../tools/misc/cunit { }; + curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { From 93be0770d7ba2e1c8c24242c6db864547faf7cee Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Sep 2011 03:41:18 +0000 Subject: [PATCH 216/504] Add unstable version of freerdp svn path=/nixpkgs/trunk/; revision=29070 --- .../networking/remote/freerdp/unstable.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/applications/networking/remote/freerdp/unstable.nix diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix new file mode 100644 index 00000000000..9856be275f0 --- /dev/null +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -0,0 +1,74 @@ +{ stdenv +, fetchgit +, openssl +, printerSupport ? true, cups +, pkgconfig +, zlib +, libX11 +, libXcursor +, alsaLib +, cmake +, libxkbfile +, libXinerama +, libXext +, directfb +, cunit +, xmonadHack ? false +}: + +assert printerSupport -> cups != null; + +let rev = "0d412ba629471aeb83d1c39d167d389d8f4262e5"; in + +stdenv.mkDerivation (rec { + name = "freerdp-1.0pre${rev}"; + + src = fetchgit { + url = git://github.com/FreeRDP/FreeRDP-1.0.git; + inherit rev; + sha256 = "e8997677bde3d99c8ae6b6dd85ca2b6a17cca49f7dbd4d460908c969088130e6"; + }; + + buildInputs = [ + openssl + pkgconfig + zlib + libX11 + libXcursor + libxkbfile + libXinerama + libXext + directfb + alsaLib + cmake + cunit + ] ++ stdenv.lib.optional printerSupport cups; + + postUnpack = '' + sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c + ''; + + cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ]; + + meta = { + description = "A Remote Desktop Protocol Client"; + + longDescription = '' + FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) + following the Microsoft Open Specifications. + ''; + + homepage = http://www.freerdp.com/; + + license = "free-non-copyleft"; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} // (stdenv.lib.optionalAttrs xmonadHack { + #xmonad doesn't provide the _NET_WORKAREA atom, so we need to remove the + #call that relies on it. This just messes up sizing in non-fullscreen mode + postUnpack = '' + sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c + ''; +})) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38d7e04f34b..afbe4e4f506 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6553,6 +6553,8 @@ let freerdp = callPackage ../applications/networking/remote/freerdp { }; + freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; + fspot = callPackage ../applications/graphics/f-spot { inherit (gnome) libgnome libgnomeui; gtksharp = gtksharp1; From c3dff03d1a8a9b6b6c292dd0c42c8b38bef0e5fb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Sep 2011 03:42:23 +0000 Subject: [PATCH 217/504] freerdp: Add meta information svn path=/nixpkgs/trunk/; revision=29071 --- .../networking/remote/freerdp/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 51a1b5ae0e0..8d80630f316 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -30,5 +30,20 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-x" ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"; + + meta = { + description = "A Remote Desktop Protocol Client"; + + longDescription = '' + FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) + following the Microsoft Open Specifications. + ''; + + homepage = http://www.freerdp.com/; + + license = "free-non-copyleft"; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; } From 9266c417956f8e84796c4b68b0fbdc40389486de Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Sep 2011 03:45:51 +0000 Subject: [PATCH 218/504] cunit: Add meta information svn path=/nixpkgs/trunk/; revision=29072 --- pkgs/tools/misc/cunit/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 22445b5d21c..aa586945cb9 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -7,5 +7,21 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/cunit/${name}-src.tar.bz2"; sha256 = "1slb2sybv886ys0qqikb8lzn0h9jcqfrv64lakdxmqbgncq5yw0z"; }; + + meta = { + description = "A Unit Testing Framework for C"; + + longDescription = '' + CUnit is a lightweight system for writing, administering, and running + unit tests in C. It provides C programmers a basic testing functionality + with a flexible variety of user interfaces. + ''; + + homepage = http://cunit.sourceforge.net/; + + license = "lgpl"; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; } From 53b10cac36808f254c559f4dc52fe9196db3ee3b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Sep 2011 03:55:09 +0000 Subject: [PATCH 219/504] FreeRDP just migrated their github servers. Also, bump revs while we're at it svn path=/nixpkgs/trunk/; revision=29073 --- pkgs/applications/networking/remote/freerdp/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 9856be275f0..cbc8c2c7a48 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -18,15 +18,15 @@ assert printerSupport -> cups != null; -let rev = "0d412ba629471aeb83d1c39d167d389d8f4262e5"; in +let rev = "93d09e1a38a94c2436c53ef5ff99668e6c55ef96"; in stdenv.mkDerivation (rec { name = "freerdp-1.0pre${rev}"; src = fetchgit { - url = git://github.com/FreeRDP/FreeRDP-1.0.git; + url = git://github.com/FreeRDP/FreeRDP.git; inherit rev; - sha256 = "e8997677bde3d99c8ae6b6dd85ca2b6a17cca49f7dbd4d460908c969088130e6"; + sha256 = "02594c248c7d3f30d43ac11ae5ea79df1c72d98b183caf041fc05db35d211837"; }; buildInputs = [ From 5c8d5852160940d3e989edffdf47f1a0f86a7f48 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Sep 2011 04:11:33 +0000 Subject: [PATCH 220/504] Argh, the hash given by nix-prefetch-git is unusable in fetchgit svn path=/nixpkgs/trunk/; revision=29074 --- pkgs/applications/networking/remote/freerdp/unstable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index cbc8c2c7a48..0905e2c71bd 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; inherit rev; - sha256 = "02594c248c7d3f30d43ac11ae5ea79df1c72d98b183caf041fc05db35d211837"; + sha256 = "a6662826fa0d8e5ecaaf42b40f1f3c54577a1d76ad58a01bd154647d5a1c01f7"; }; buildInputs = [ From 5f5a47fc769c30b986d32736e894d91aaa9a0b8a Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Wed, 7 Sep 2011 10:02:12 +0000 Subject: [PATCH 221/504] nix-prefetch-git: Remove missleading option name. svn path=/nixpkgs/trunk/; revision=29075 --- pkgs/build-support/fetchgit/nix-prefetch-git | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 01675ed02a7..bc82794102f 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -33,7 +33,6 @@ for arg; do --deepClone) deepClone=true;; --no-deepClone) deepClone=false;; --leave-dotGit) leaveDotGit=true;; - --keep-dotGit) leaveDotGit=;; --builder) builder=true;; *) argi=$(($argi + 1)) From 0608f1a9b53f5cab2d7ff897fb6e0c94aa4df4e9 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Wed, 7 Sep 2011 10:02:14 +0000 Subject: [PATCH 222/504] nix-prefetch-git: Display usage message if missing builder arguments are missing. svn path=/nixpkgs/trunk/; revision=29076 --- pkgs/build-support/fetchgit/nix-prefetch-git | 24 ++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index bc82794102f..7b05adab08c 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -55,9 +55,24 @@ for arg; do fi done -if test -z "$url"; then - echo "syntax: nix-prefetch-git URL [REVISION [EXPECTED-HASH]]" >&2 +usage(){ + echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]] + +Options: + --out path Path where the output would be stored. + --url url Any url understand by 'git clone'. + --rev ref Any sha1 or references (such as refs/heads/master) + --hash h Expected hash. + --deepClone Clone submodules recursively. + --no-deepClone Do not clone submodules. + --leave-dotGit Keep the .git directories. + --builder Clone as fetchgit does, but url, rev, and out option are mandatory. +" exit 1 +} + +if test -z "$url"; then + usage fi @@ -200,8 +215,9 @@ clone_user_rev() { } if test -n "$builder"; then - mkdir $out - clone_user_rev "$out" "$url" "$rev" + test -n "$out" -a -n "$url" -a -n "$rev" || usage + mkdir $out + clone_user_rev "$out" "$url" "$rev" else if test -z "$hashType"; then hashType=sha256 From 9cd0f7ed09cfc833f74b476ec6d1ab3393d859b5 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Wed, 7 Sep 2011 10:02:17 +0000 Subject: [PATCH 223/504] nix-prefetch-git: remove .git in the cloned directory. (Fix issue 116) svn path=/nixpkgs/trunk/; revision=29077 --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 7b05adab08c..979aa531092 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -210,7 +210,7 @@ clone_user_rev() { eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" if test -z "$leaveDotGit"; then echo "removing \`.git'..." >&2 - find $out -name .git\* | xargs rm -rf + find $dir -name .git\* | xargs rm -rf fi } From a2b2ad5782f3cba86c165007d135f1499b33fbdb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2011 15:13:00 +0000 Subject: [PATCH 224/504] * Firefox 6.0.2. svn path=/nixpkgs/trunk/; revision=29079 --- pkgs/applications/networking/browsers/firefox/6.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix index 85a467a641e..6842f4bf861 100644 --- a/pkgs/applications/networking/browsers/firefox/6.0.nix +++ b/pkgs/applications/networking/browsers/firefox/6.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "6.0.1"; + firefoxVersion = "6.0.2"; - xulVersion = "6.0.1"; # this attribute is used by other packages + xulVersion = "6.0.2"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "08pklavbb6miaav07a8liw17k8nnh3i97plz8l9pdclan4aczb3i"; + sha1 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6"; }; From 9c9cea35adc1e4712d360d7e3f1fba7c8ccdbb71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2011 16:14:42 +0000 Subject: [PATCH 225/504] * Bump nixUnstable. svn path=/nixpkgs/trunk/; revision=29082 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index c89b913200b..4011e7a3524 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre28391"; + name = "nix-1.0pre29060"; src = fetchurl { - url = "http://hydra.nixos.org/build/1232663/download/4/${name}.tar.bz2"; - sha256 = "c990f0ad564960b1d82fdbed32bee0db64c26b57400f027f01434237edd1be0f"; + url = "http://hydra.nixos.org/build/1301810/download/4/${name}.tar.bz2"; + sha256 = "f403213b56acfb2e74ae1e6fd136f3726940f098220d2ae8b46fa54c08f1aad0"; }; buildNativeInputs = [ perl pkgconfig ]; From c710e9e0e64b8cdddd83f0383cbdcabecaf2146d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 16:53:15 +0000 Subject: [PATCH 226/504] haskell-hakyll: updated to version 3.2.0.6 svn path=/nixpkgs/trunk/; revision=29084 --- pkgs/development/libraries/haskell/hakyll/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 1f42ba532fb..f25d1069a58 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,13 +1,13 @@ -{ cabal, binary, blazeHtml, hamlet, hopenssl, mtl, pandoc, parsec +{ cabal, binary, blazeHtml, cryptohash, hamlet, mtl, pandoc, parsec , regexBase, regexPcre, snapCore, snapServer, tagsoup, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.0.5"; - sha256 = "1rwmdkzwshhi6b27zff42gg65vds866l68h33p4kn6pq1rns3bz4"; + version = "3.2.0.6"; + sha256 = "11jdajciswswv9ciyd6hk7qc39l09y9s528vazxq0k6z5mwvwrbp"; buildDepends = [ - binary blazeHtml hamlet hopenssl mtl pandoc parsec regexBase + binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time ]; meta = { From 0d137ccd6700179ca10aa81b5657de68ac4fe4e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 16:53:20 +0000 Subject: [PATCH 227/504] haskell-primitive: added version 0.4.0.1 svn path=/nixpkgs/trunk/; revision=29085 --- .../primitive/{default.nix => 0.3.1.nix} | 0 .../libraries/haskell/primitive/0.4.0.1.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 20 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/primitive/{default.nix => 0.3.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/primitive/0.4.0.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/0.3.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/primitive/default.nix rename to pkgs/development/libraries/haskell/primitive/0.3.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix new file mode 100644 index 00000000000..62693a6d096 --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.4.0.1"; + sha256 = "08j7js5y2vk3ywfhs260fxngd725xkvhrp20dcwb67fk8qgxh4bz"; + meta = { + homepage = "http://code.haskell.org/primitive"; + description = "Wrappers for primitive operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d9e6b81ca87..63a231dd0c2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -909,7 +909,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; - primitive = callPackage ../development/libraries/haskell/primitive {}; + primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {}; + primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {}; + primitive = self.primitive_0_3_1; processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; From 4fba6f2bf32dd3f5834ef3cf738d6840f8fbae4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 16:53:27 +0000 Subject: [PATCH 228/504] haskell-vector: added version 0.9 svn path=/nixpkgs/trunk/; revision=29086 --- .../haskell/vector/{default.nix => 0.7.1.nix} | 0 .../libraries/haskell/vector/0.9.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/vector/{default.nix => 0.7.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/vector/0.9.nix diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/0.7.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/vector/default.nix rename to pkgs/development/libraries/haskell/vector/0.7.1.nix diff --git a/pkgs/development/libraries/haskell/vector/0.9.nix b/pkgs/development/libraries/haskell/vector/0.9.nix new file mode 100644 index 00000000000..549eaa4ae60 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.9.nix @@ -0,0 +1,18 @@ +{ cabal, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.9"; + sha256 = "0m8sfp924sw5dwr9a63jgsbj98qm9nyy903842x6ii4ljb1cpynz"; + buildDepends = [ primitive ]; + meta = { + homepage = "http://code.haskell.org/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 63a231dd0c2..e54326c7be1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1168,7 +1168,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; - vector = callPackage ../development/libraries/haskell/vector {}; + vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {}; + vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix { + primitive = self.primitive_0_4_0_1; + }; + vector = self.vector_0_7_1; vectorAlgorithms_0_4 = callPackage ../development/libraries/haskell/vector-algorithms/0.4.nix {}; vectorAlgorithms_0_5_3 = callPackage ../development/libraries/haskell/vector-algorithms/0.5.3.nix {}; From 2482d4ba22ff14912e4861c2bdac436fae1c8ffd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 16:53:30 +0000 Subject: [PATCH 229/504] wdiff: updated to version 1.0.0 svn path=/nixpkgs/trunk/; revision=29087 --- pkgs/tools/text/wdiff/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 1b51e19c427..a517991d99e 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,13 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, which, screen }: -stdenv.mkDerivation rec { - name = "wdiff-0.6.5"; +let + name = "wdiff-1.0.0"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "mirror://gnu/wdiff/${name}.tar.gz"; - sha256 = "1fij74hni4mi1zipf5is8kr1i9cssyyq5kqqhcxi0j7mynb5d1sm"; + sha256 = "00p0yww8dfszzhbwkfl4v5l9r55v9qznx3p089l2m2drjb1ahp3v"; }; + # Required for the compile-time for the test suite. + buildInputs = [ which screen ]; + doCheck = true; meta = { From 41dcf578ef15f5ae8b4322c3637b102ad2c33f46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:29:38 +0000 Subject: [PATCH 230/504] haskell-repa: updated to version 2.2.0.1 Note that the latest version requires GHC 7.2.1 or later; older GHC versions are no longer supported. svn path=/nixpkgs/trunk/; revision=29089 --- pkgs/development/libraries/haskell/repa/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index b5667144103..ffa75a9fd4f 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "2.1.1.5"; - sha256 = "14lq6nsifxsap98c1hpxsyv4g973vyzjn2s94b3vfzkbq8vd7695"; + version = "2.2.0.1"; + sha256 = "016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e54326c7be1..4f7642266f2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -989,7 +989,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regular = callPackage ../development/libraries/haskell/regular {}; - repa = callPackage ../development/libraries/haskell/repa {}; + repa = callPackage ../development/libraries/haskell/repa { + vector = self.vector_0_9; + }; repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {}; From ca93a87e0f55526e23bb080ee37dcc77308d4edb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:29:42 +0000 Subject: [PATCH 231/504] haskell-repa-algorithms: updated to version 2.2.0.1 svn path=/nixpkgs/trunk/; revision=29090 --- .../development/libraries/haskell/repa-algorithms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index 0ca84003fbf..991c1a3d779 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "2.1.0.1"; - sha256 = "101j18s2vqaxls87jzrlhzy2hlhqvgs27cs89j187c1s8z5vvjjg"; + version = "2.2.0.1"; + sha256 = "1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p"; buildDepends = [ repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; From 08d6c0a1d3232b05c90e36f562e9321c82fc2123 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:29:46 +0000 Subject: [PATCH 232/504] haskell-repa-bytestring: updated to version 2.2.0.1 svn path=/nixpkgs/trunk/; revision=29091 --- .../development/libraries/haskell/repa-bytestring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix index 8dfe4159d53..b06072d798b 100644 --- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/repa-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-bytestring"; - version = "2.1.0.1"; - sha256 = "01kvbd1kn0irldnfihhxa2jrz8fy1x9g7vz60ffgagj6yzp4bsnq"; + version = "2.2.0.1"; + sha256 = "0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg"; buildDepends = [ repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; From 08bdadc357d178a142996868758128b60b86b3f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:29:50 +0000 Subject: [PATCH 233/504] haskell-repa-examples: updated to version 2.2.0.1 svn path=/nixpkgs/trunk/; revision=29092 --- pkgs/development/libraries/haskell/repa-examples/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 04f75ae8c57..75d18daa635 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "2.1.0.2"; - sha256 = "056y2x8kada4d6a89sni2469c736z3d9ldp188n3i58h4kjqqfq7"; + version = "2.2.0.1"; + sha256 = "0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0"; isLibrary = false; isExecutable = true; buildDepends = [ random repa repaAlgorithms repaIo vector ]; From 05db155ad3041531583f070546850b84b17f09f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:29:54 +0000 Subject: [PATCH 234/504] haskell-repa-io: updated to version 2.2.0.1 svn path=/nixpkgs/trunk/; revision=29093 --- pkgs/development/libraries/haskell/repa-io/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 000f412a3da..e4eb113a435 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -1,10 +1,10 @@ -{ cabal, bmp, repa, repaBytestring }: +{ cabal, binary, bmp, repa, repaBytestring, vector }: cabal.mkDerivation (self: { pname = "repa-io"; - version = "2.1.0.1"; - sha256 = "1mjv90rr1vymrnv5kz8i4kvjal6mwhb2042ylbdggvv8hjsc8awq"; - buildDepends = [ bmp repa repaBytestring ]; + version = "2.2.0.1"; + sha256 = "1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1"; + buildDepends = [ binary bmp repa repaBytestring vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; From 437f2b06039d4be0b880680f34463c3ea8958937 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:29:59 +0000 Subject: [PATCH 235/504] haskell-packages.nix: disable repaExamples in all instances of haskellPackages older than GHC 7.2 Without this hack, "nix-env -u *" would update repa-examples to the GHC 7.0.4 version, because the package isn't tagged with the version of the compiler. Repa and friends don't build with older GHCs anymore, though. svn path=/nixpkgs/trunk/; revision=29094 --- pkgs/top-level/haskell-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f7642266f2..4307ffe0f25 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -194,6 +194,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; text = self.text_0_11_1_5; + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2011_2_0_1 = @@ -235,6 +236,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_0 self // { haskellPlatform = self.haskellPlatform_2011_2_0_0; mtl1 = self.mtl_1_1_1_1; + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2011_2_0_0 = @@ -272,6 +274,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformDefaults_2010_2_0_0 = self : self.haskellPlatformArgs_2010_2_0_0 self // { haskellPlatform = self.haskellPlatform_2010_2_0_0; + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2010_2_0_0 = @@ -308,6 +311,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2010_1_0_0 self // { haskellPlatform = self.haskellPlatform_2010_1_0_0; extensibleExceptions = self.extensibleExceptions_0_1_1_0; + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2010_1_0_0 = @@ -345,6 +349,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2009_2_0_2 self // { haskellPlatform = self.haskellPlatform_2009_2_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2009_2_0_2 = From 460164c1b33498918cb66f5d6ba6319c2e107638 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:30:02 +0000 Subject: [PATCH 236/504] haskell-flapjax: build this package with the latest version of WebBits svn path=/nixpkgs/trunk/; revision=29095 --- pkgs/top-level/haskell-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4307ffe0f25..c1f6a612879 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1288,9 +1288,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); epic = callPackage ../development/compilers/epic {}; - flapjax = callPackage ../development/compilers/flapjax { - WebBits = self.WebBits_1_0; - }; + flapjax = callPackage ../development/compilers/flapjax {}; helium = callPackage ../development/compilers/helium {}; From d923ec714e4f82b7399904a8a75d5f59f661eb34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:30:07 +0000 Subject: [PATCH 237/504] haskell-WebBits-Html: added version 1.0.2 svn path=/nixpkgs/trunk/; revision=29096 --- .../WebBits-Html/{default.nix => 1.0.1.nix} | 0 .../libraries/haskell/WebBits-Html/1.0.2.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++++- 3 files changed, 22 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/WebBits-Html/{default.nix => 1.0.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix diff --git a/pkgs/development/libraries/haskell/WebBits-Html/default.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/WebBits-Html/default.nix rename to pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix new file mode 100644 index 00000000000..cd34f3161f3 --- /dev/null +++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, parsec, syb, WebBits }: + +cabal.mkDerivation (self: { + pname = "WebBits-Html"; + version = "1.0.2"; + sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal"; + buildDepends = [ mtl parsec syb WebBits ]; + meta = { + homepage = "http://www.cs.brown.edu/research/plt/"; + description = "JavaScript analysis tools"; + license = "LGPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c1f6a612879..5f84ee63c48 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -771,6 +771,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); JsContracts = callPackage ../development/libraries/haskell/JsContracts { WebBits = self.WebBits_1_0; + WebBitsHtml = self.WebBitsHtml_1_0_1; }; json = callPackage ../development/libraries/haskell/json/default.nix {}; @@ -1207,7 +1208,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; WebBits = self.WebBits_2_0; - WebBitsHtml = callPackage ../development/libraries/haskell/WebBits-Html {}; + WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {}; + WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {}; + WebBitsHtml = self.WebBitsHtml_1_0_2; webRoutes = callPackage ../development/libraries/haskell/web-routes {}; From 7dc8b51b68477c7576219803f7b33ce0fab06ea6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 17:41:00 +0000 Subject: [PATCH 238/504] haskell-MissingH: updated to version 1.1.1.0 svn path=/nixpkgs/trunk/; revision=29097 --- pkgs/development/libraries/haskell/MissingH/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index ea70c41e770..47da3ba266a 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "MissingH"; - version = "1.1.0.3"; - sha256 = "2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf"; + version = "1.1.1.0"; + sha256 = "1i2fdr6p0jnn9w865ngjcchbsamrvnvdf9c4vzhjhzy500z2k1ry"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://software.complete.org/missingh"; description = "Large utility library"; - license = "GPL"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres From f47cea8699353b0f6b32ff540e7e39947be6d670 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2011 18:08:59 +0000 Subject: [PATCH 239/504] * Updated neon to 0.29.6. svn path=/nixpkgs/trunk/; revision=29098 --- pkgs/development/libraries/neon/0.29.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index df952a25315..8666f6233a9 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert static || shared; stdenv.mkDerivation rec { - name = "neon-0.29.3"; + name = "neon-0.29.6"; src = fetchurl { url = "http://www.webdav.org/neon/${name}.tar.gz"; - sha256 = "1d1c6zhr00yvg0fbhpkq8kmsq9cchr112ii9rl39gdybyflh9444"; + sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; }; buildInputs = [libxml2 pkgconfig openssl] From c92ea6742b7d503f35dd40bcde868c5127db926e Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Wed, 7 Sep 2011 19:52:33 +0000 Subject: [PATCH 240/504] The hash for cpufrequtils 005 has changed, updating to 008 svn path=/nixpkgs/trunk/; revision=29099 --- pkgs/os-specific/linux/cpufrequtils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index b810db2c1b5..6ef51cbc73d 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux && stdenv.system != "powerpc-linux"; stdenv.mkDerivation { - name = "cpufrequtils-005"; + name = "cpufrequtils-008"; src = fetchurl { - url = http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.gz; - md5 = "100a8220a546ce61ce943d4107e67db9"; + url = http://kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz; + md5 = "52d3e09e47ffef634833f7fab168eccf"; }; patchPhase = '' From c292d234eab47af4d049c71fa176256f66d060da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Sep 2011 20:21:01 +0000 Subject: [PATCH 241/504] haskell-system-filepath: added version 0.4.1 haskell-system-fileio: added version 0.3.2 svn path=/nixpkgs/trunk/; revision=29100 --- .../haskell/system-fileio/default.nix | 18 ++++++++++++++++++ .../haskell/system-filepath/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/haskell/system-fileio/default.nix create mode 100644 pkgs/development/libraries/haskell/system-filepath/default.nix diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix new file mode 100644 index 00000000000..0f29a5f23bd --- /dev/null +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -0,0 +1,18 @@ +{ cabal, systemFilepath, text, time }: + +cabal.mkDerivation (self: { + pname = "system-fileio"; + version = "0.3.2"; + sha256 = "10s0mih3mhpm0mh424kk330680qplwaddffr4rm4cf1bi7gbzrcq"; + buildDepends = [ systemFilepath text time ]; + meta = { + homepage = "https://john-millikin.com/software/hs-fileio/"; + description = "High-level filesystem interaction"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix new file mode 100644 index 00000000000..3e475d6f0e5 --- /dev/null +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -0,0 +1,18 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "system-filepath"; + version = "0.4.1"; + sha256 = "0jb32516xiwgbvr68yrf142fnzxfhn2dwh48nfr06gz65l7y4fcx"; + buildDepends = [ text ]; + meta = { + homepage = "https://john-millikin.com/software/hs-filepath/"; + description = "High-level, byte-based file and directory path manipulations"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5f84ee63c48..71054c3e961 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1093,6 +1093,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); svgcairo = callPackage ../development/libraries/haskell/svgcairo {}; + systemFilepath = callPackage ../development/libraries/haskell/system-filepath {}; + + systemFileio = callPackage ../development/libraries/haskell/system-fileio {}; + tabular = callPackage ../development/libraries/haskell/tabular {}; tagged = callPackage ../development/libraries/haskell/tagged {}; From fcec1593b88dbb30c50e09b54fbb0dce60999c43 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 7 Sep 2011 22:52:52 +0000 Subject: [PATCH 242/504] git doesn't need subversion server svn path=/nixpkgs/trunk/; revision=29102 --- .../applications/version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/git/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e0c5400d2a9..52ff83317d1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -10,7 +10,7 @@ rec { git = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt - cpio tcl tk makeWrapper subversion; + cpio tcl tk makeWrapper subversionClient; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk sendEmailSupport = false; # requires plenty of perl libraries diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index ee207788875..1491b6f7417 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper -, svnSupport, subversion, perlLibs, smtpPerlLibs +, svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport , pythonSupport ? true , sendEmailSupport }: let - svn = subversion.override { perlBindings = true; }; + svn = subversionClient.override { perlBindings = true; }; in stdenv.mkDerivation rec { From 133310cb87910457e06375b65044e4cc9eaf037b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 7 Sep 2011 22:53:11 +0000 Subject: [PATCH 243/504] soprano: find virtuoso without LD_LIBRARY_PATH hack Now it finds virtuoso driver provided that virtuoso-t binary is in PATH. svn path=/nixpkgs/trunk/; revision=29103 --- .../kde-4.7/support/soprano/default.nix | 1 + .../support/soprano/find-virtuoso.patch | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix index dbb6773f890..9dc6d1d1de6 100644 --- a/pkgs/desktops/kde-4.7/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { name = "soprano-virtuoso-restart.patch"; sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y"; }) + ./find-virtuoso.patch ]; # We disable the Java backend, since we do not need them and they make the closure size much bigger diff --git a/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch b/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch new file mode 100644 index 00000000000..649f22a3b74 --- /dev/null +++ b/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch @@ -0,0 +1,77 @@ +From: Yury G. Kudryashov +Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH + +--- + backends/virtuoso/virtuosobackend.cpp | 29 ++++++++++++++++++++--------- + backends/virtuoso/virtuosobackend.h | 2 +- + 2 files changed, 21 insertions(+), 10 deletions(-) + +diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp +index c83605d..c24854e 100644 +--- a/backends/virtuoso/virtuosobackend.cpp ++++ b/backends/virtuoso/virtuosobackend.cpp +@@ -188,19 +188,19 @@ namespace { + + bool Soprano::Virtuoso::BackendPlugin::isAvailable() const + { +-#ifndef Q_OS_WIN +- if ( findVirtuosoDriver().isEmpty() ) { +- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; +- return false; +- } +-#endif +- + QString virtuosoBin = VirtuosoController::locateVirtuosoBinary(); + if ( virtuosoBin.isEmpty() ) { + qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; + return false; + } + ++#ifndef Q_OS_WIN ++ if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) { ++ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; ++ return false; ++ } ++#endif ++ + QString vs = determineVirtuosoVersion( virtuosoBin ); + if ( vs.isEmpty() ) { + qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; +@@ -217,9 +217,20 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const + + + #ifndef Q_OS_WIN +-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const ++QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) const + { +- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); ++ QString virtuosoBin; ++ if (virtuosoBinHint.isEmpty()) ++ virtuosoBin = VirtuosoController::locateVirtuosoBinary(); ++ else ++ virtuosoBin = virtuosoBinHint; ++ ++ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir(); ++ return Soprano::findLibraryPath( "virtodbc_r", ++ QStringList() << virtuosoBinDir.absolutePath() ++ << virtuosoBinDir.absoluteFilePath("../lib"), ++ QStringList() << QLatin1String( "virtuoso/plugins/" ) << ++ QLatin1String( "odbc/" ) ); + } + #endif + +diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h +index 3971b83..0807e5d 100644 +--- a/backends/virtuoso/virtuosobackend.h ++++ b/backends/virtuoso/virtuosobackend.h +@@ -50,7 +50,7 @@ namespace Soprano { + + #ifndef Q_OS_WIN + private: +- QString findVirtuosoDriver() const; ++ QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()) const; + #endif + }; + } +-- +tg: (432b73f..) t/find-virtuoso (depends on: master) From 5fb9815469660628bd843cd7b13fbd062930b73e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 7 Sep 2011 22:53:20 +0000 Subject: [PATCH 244/504] kioslave-svn does not need subversion server svn path=/nixpkgs/trunk/; revision=29104 --- pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix index ec7f7a61ed5..db0bd27094b 100644 --- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix +++ b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, subversion, apr, aprutil }: +{ kde, kdelibs, subversionClient, apr, aprutil }: kde { - buildInputs = [ kdelibs subversion apr aprutil ]; + buildInputs = [ kdelibs subversionClient apr aprutil ]; patches = [ ./find-svn.patch ]; From cded4473e7ab52afcd5da1622546b9fcf60d8e10 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 7 Sep 2011 22:53:31 +0000 Subject: [PATCH 245/504] Apply upstream patches to ntrack\n\nProbably fixes 100% CPU problem in kded module svn path=/nixpkgs/trunk/; revision=29105 --- pkgs/development/libraries/ntrack/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index e2d811ab339..bd1c97c3043 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }: +{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python, automake +, autoconf }: let version = "014"; @@ -14,11 +15,27 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - buildNativeInputs = [ pkgconfig python ]; + buildNativeInputs = [ pkgconfig python automake autoconf ]; configureFlags = "--without-gobject CFLAGS=--std=gnu99"; - postPatch = '' - sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c + patchP0 = fetchurl { + url = http://bazaar.launchpad.net/~asac/ntrack/main/diff/312/309; + name = "ntrack-bzr-309-to-312.patch"; + sha256 = "1bpjpikln2i7nsmd2gl82g08yzaqac311sgsva7z7pqccxz0vsj5"; + }; + + patchP1 = fetchurl { + url = "https://bugs.launchpad.net/ntrack/+bug/750554/+attachment/2291609/+files/ntrack_libnl_link.diff"; + sha256 = "1al6wfjph7nmck1q2q2z98cnzcrwpln2wwh45xynsxr6wgczwck6"; + }; + + patchPhase = + '' + patch -p0 < ${patchP0} + patch -p1 < ${patchP1} + sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; + + preConfigure = "automake"; # The second patch changes Makefile.am files } From f4ba87948ab8c29a716490be15755da0ce5e9b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 8 Sep 2011 10:30:24 +0000 Subject: [PATCH 246/504] Updating gdb. They hit the trouble of GPL violation too like binutils, and the tarball went away. svn path=/nixpkgs/trunk/; revision=29108 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index b2ce5aa6297..7da5ac31e2a 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -11,7 +11,7 @@ let basename = if bleedingEdgeVersion then "gdb-7.3.20110726" - else "gdb-7.3"; + else "gdb-7.3.1"; in stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gdb/${basename}.tar.bz2"; # md5 is provided by the annoucement page # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT - md5 = "485022b8df7ba2221f217e128f479fe7"; + md5 = "b89a5fac359c618dda97b88645ceab47"; }; # I think python is not a native input, but I leave it From 18f76f04ac06069f26120524f3d8e5bdcb077968 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Sep 2011 16:39:14 +0000 Subject: [PATCH 247/504] pkgs/top-level/all-packages.nix: stripped extraneous whitespace svn path=/nixpkgs/trunk/; revision=29109 --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afbe4e4f506..fb0abd18aa8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7202,14 +7202,12 @@ let httpd = apacheHttpd; }; - subversionClient = lowPrio (appendToName "client" (subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; })); - surf = callPackage ../applications/misc/surf { inherit (gtkLibs) gtk glib; libsoup = gnome28.libsoup; From 050d264bfcff210d3ad6b41b0dd2a4299c14dcfd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Sep 2011 17:25:09 +0000 Subject: [PATCH 248/504] haskell-deepseq: added version 1.2.0.1 svn path=/nixpkgs/trunk/; revision=29110 --- .../libraries/haskell/deepseq/1.2.0.1.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix new file mode 100644 index 00000000000..35fca66fa86 --- /dev/null +++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "deepseq"; + version = "1.2.0.1"; + sha256 = "0r7lkqhllj7phmn4sq836fmis4wy9fpka4hjzhqzhbbykzys0z7d"; + meta = { + description = "Deep evaluation of data structures"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 71054c3e961..2ada2215c5a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -511,6 +511,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; + deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; deepseq = self.deepseq_1_1_0_0; derive = callPackage ../development/libraries/haskell/derive {}; From e0b8620b50874638a98c5f687745e81eea73b8ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Sep 2011 17:25:15 +0000 Subject: [PATCH 249/504] haskell-uuagc-cabal: updated to version 1.0.0.6 svn path=/nixpkgs/trunk/; revision=29111 --- pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 7af637cd665..f25afb170e8 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.0.5"; - sha256 = "1is7kcbx7hlrzqxqz40sggniwxwnzd6k18dxsra4bibfcg8fvy4h"; + version = "1.0.0.6"; + sha256 = "1ij84n2pjhqyz10vsa9qxk4k227wg1c96rq5sylvcwdkzciww81d"; buildDepends = [ mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; From 4a2b9bbaa82e9a2d19e91171febca2b3c00c8a6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Sep 2011 17:25:19 +0000 Subject: [PATCH 250/504] haskell-Crypto: updated to version 4.2.4 svn path=/nixpkgs/trunk/; revision=29112 --- pkgs/development/libraries/haskell/Crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index 3b2eccf081b..0adb00ccc86 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Crypto"; - version = "4.2.3"; - sha256 = "02wi8lyi27i8cdj8vclrl7vcng38srdzz9qpqwsc4y4lmvgg82br"; + version = "4.2.4"; + sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p"; isLibrary = true; isExecutable = true; buildDepends = [ HUnit QuickCheck random ]; From 3a1d709073dd42f6962591ae4f568ba8a08d3b62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Sep 2011 18:39:54 +0000 Subject: [PATCH 251/504] haskell-cryptohash: updated to version 0.7.2 svn path=/nixpkgs/trunk/; revision=29113 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 70dbbf15ea4..5e1214e15ac 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.7.1"; - sha256 = "1bblhqidzb8b75fk9zb1ibdssmbh1kaq20q144c9y1cas3gbn6h3"; + version = "0.7.2"; + sha256 = "1c23cgkp9y18yrahjn7nz5z2y3xdn16mrgpczidd6jwhp6f2zd42"; isLibrary = true; isExecutable = true; buildDepends = [ cereal cryptoApi tagged ]; From 8dbe7158f5216976850e289e5cfd3ff7b2cd3a0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Sep 2011 18:39:58 +0000 Subject: [PATCH 252/504] haskell-happstack-server: updated to version 6.2.3 svn path=/nixpkgs/trunk/; revision=29114 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 3b3d37bb0b8..810e7936d03 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "6.2.2"; - sha256 = "1nrvi3hf689bxvlzc9crav70dmnv3lagafsrc4gmnizqliw6p62g"; + version = "6.2.3"; + sha256 = "0rrwzp8il6vfw17m5rqj3ad418k4gxvaa99s817r00iyhna7clmi"; isLibrary = true; isExecutable = true; buildDepends = [ From 80ec5348e02c4959fb664912f6a0db307843a371 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Sep 2011 19:06:59 +0000 Subject: [PATCH 253/504] haskell-packages.nix: blind attempt to fix assertion error on Darwin svn path=/nixpkgs/trunk/; revision=29115 --- pkgs/top-level/haskell-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2ada2215c5a..63b551d7425 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -612,6 +612,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs.gtkLibs) gtk; + glibc = if pkgs.stdenv.isLinux then pkgs.stdenv.glibc else null; }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; From 958b1464244e3f78f91bb6d218b82caa930968e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Sep 2011 21:48:10 +0000 Subject: [PATCH 254/504] * Added flvtool2. svn path=/nixpkgs/trunk/; revision=29116 --- pkgs/tools/video/flvtool2/default.nix | 28 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/video/flvtool2/default.nix diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix new file mode 100644 index 00000000000..dbda4e11770 --- /dev/null +++ b/pkgs/tools/video/flvtool2/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, ruby }: + +stdenv.mkDerivation rec { + name = "flvtool2-1.0.6"; + + src = fetchurl { + url = "http://rubyforge.org/frs/download.php/17497/${name}.tgz"; + sha256 = "1pbsf0fvqrs6xzfkqal020bplb68dfiz6c5sfcz36k255v7c5w9a"; + }; + + buildInputs = [ ruby ]; + + configurePhase = + '' + substituteInPlace bin/flvtool2 --replace "/usr/bin/env ruby" "ruby -I$out/lib/ruby/site_ruby/1.8" + ruby setup.rb config --prefix=$out --siterubyver=$out/lib/ruby/site_ruby/1.8 + ''; + + installPhase = + '' + ruby setup.rb install + ''; + + meta = { + homepage = http://www.inlet-media.de/flvtool2/; + description = "A tool to manipulate Macromedia Flash Video files"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb0abd18aa8..78a6882fdd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -651,6 +651,8 @@ let flvstreamer = callPackage ../tools/networking/flvstreamer { }; + flvtool2 = callPackage ../tools/video/flvtool2 { }; + fontforge = callPackage ../tools/misc/fontforge { }; fontforgeX = callPackage ../tools/misc/fontforge { From c94dc8d0cabfe4c7c9013bdae19cbe8e3be67e3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Sep 2011 09:39:43 +0000 Subject: [PATCH 255/504] * Zabbix updated to 1.8.7. svn path=/nixpkgs/trunk/; revision=29122 --- pkgs/servers/monitoring/zabbix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 09d53627450..41e617d80b6 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.4"; + version = "1.8.7"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0fhn4gw8r96dy0z227k5bl144zpmgsk1jkwzhi61qqr44mz27fqc"; + sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d"; }; preConfigure = From 7147e9db8f9dd2832595570dde4cf6d4e1dd1f39 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Sep 2011 09:55:49 +0000 Subject: [PATCH 256/504] * Add bridge-utils to the channel. svn path=/nixpkgs/trunk/; revision=29123 --- pkgs/os-specific/linux/bridge-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index b3285ce3343..cadc49195e3 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "http://sourceforge.net/projects/bridge/"; homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ]; license = "GPL"; + platforms = stdenv.lib.platforms.linux; }; } From 55ae7b67d49a98f692d20cdb274906d4d5db45d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Sep 2011 13:16:35 +0000 Subject: [PATCH 257/504] * radvd updated to 1.8.1. svn path=/nixpkgs/trunk/; revision=29126 --- pkgs/tools/networking/radvd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 31351436d94..14d0d99119d 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "radvd-1.7"; + name = "radvd-1.8.1"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.gz"; - sha256 = "04rlz5fhparridjm32wcq9h1s3vxyiac7d3l6cvfgrlxixikgrzq"; + sha256 = "1sg3halppbz3vwr88lbcdv7mndzwl4nkqnrafkyf2a248wwz2cbc"; }; buildInputs = [ bison flex ]; meta.homepage = http://www.litech.org/radvd/; meta.description = "IPv6 Router Advertisement Daemon"; + meta.platforms = stdenv.lib.platforms.linux; } From 2610ed2ac96e219192d2ce513e371ddc1050ebfa Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 9 Sep 2011 14:20:43 +0000 Subject: [PATCH 258/504] added scipy, reportlab, pyreport, updated numpy matplotlib svn path=/nixpkgs/trunk/; revision=29132 --- pkgs/top-level/python-packages.nix | 74 +++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2efb8a9fe8a..f8d54936de3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -734,11 +734,10 @@ let pythonPackages = python.modules // rec { matplotlib = buildPythonPackage ( rec { - name = "matplotlib-0.99.1.2"; - + name = "matplotlib-1.0.1"; src = fetchurl { url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; - sha256 = "12lhwgkahck795946hb8wp605c912zq9ds8067ybbifqs56q24b9"; + sha256 = "1xksjix227n9hm6jnhlwkdf1yf1zgz18665cisqk8grv6xvn7g43"; }; doCheck = false; @@ -975,18 +974,18 @@ let pythonPackages = python.modules // rec { }); numpy = buildPythonPackage ( rec { - name = "numpy-1.4.1"; + name = "numpy-1.6.1"; src = fetchurl { url = "mirror://sourceforge/numpy/${name}.tar.gz"; - sha256 = "01lf3nc2lp1qkrqnnar50vb7i6y07d1zs6f9yc3kw4p5fd2vhyrf"; + sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq"; }; # TODO: add ATLAS=${pkgs.atlas} installCommand = '' export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} python setup.py build --fcompiler="gnu95" - python setup.py install --root="$out" + python setup.py install --prefix=$out ''; doCheck = false; @@ -1357,6 +1356,24 @@ let pythonPackages = python.modules // rec { }; }; + pyreport = buildPythonPackage (rec { + name = "pyreport-0.3.4c"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyreport/${name}.tar.gz"; + md5 = "3076164a7079891d149a23f9435581db"; + }; + + doCheck = false; + + meta = { + homepage = http://pypi.python.org/pypi/pyreport; + license = "BSD"; + description = "Pyreport makes notes out of a python script."; + }; + }); + + pysqlite = buildPythonPackage (rec { name = "pysqlite-2.5.5"; @@ -1510,6 +1527,25 @@ let pythonPackages = python.modules // rec { }; }); + reportlab = + let freetype = pkgs.lib.overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); + in buildPythonPackage rec { + name = "reportlab-2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/reportlab/${name}.tar.gz"; + md5 = "cdf8b87a6cf1501de1b0a8d341a217d3"; + }; + + buildInputs = [freetype]; + doCheck = false; + + meta = { + description = "The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics."; + homepage = http://www.reportlab.com/; + }; + }; + rdflib = buildPythonPackage (rec { name = "rdflib-3.0.0"; @@ -1595,6 +1631,32 @@ let pythonPackages = python.modules // rec { }; + scipy = buildPythonPackage rec { + name = "scipy-0.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz"; + md5 = "ebfef6e8e82d15c875a4ee6a46d4e1cd"; + }; + + buildInputs = [pkgs.gfortran]; + propagatedBuildInputs = [ numpy ]; + doCheck = false; + + # TODO: add ATLAS=${pkgs.atlas} + installCommand = '' + export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} + python setup.py build --fcompiler="gnu95" + python setup.py install --prefix=$out + ''; + + meta = { + description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; + homepage = http://www.scipy.org/; + }; + }; + + scripttest = buildPythonPackage rec { version = "1.1.1"; name = "scripttest-${version}"; From a13bbb3b10f2d721be350081248d3b1aa84f7da9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Sep 2011 18:44:19 +0000 Subject: [PATCH 259/504] haskell-cabal-ghci: added version 0.1 svn path=/nixpkgs/trunk/; revision=29133 --- .../tools/haskell/cabal-ghci/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/haskell/cabal-ghci/default.nix diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix new file mode 100644 index 00000000000..a119301e90e --- /dev/null +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -0,0 +1,20 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cabal-ghci"; + version = "0.1"; + sha256 = "05xyd3xl238pi5vq392m62p4vdf1n8wwxvbi05bh8hamqrkd3j8p"; + isLibrary = true; + isExecutable = true; + noHaddock = true; + meta = { + homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki"; + description = "Set up ghci with options taken from a .cabal file"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 63b551d7425..bbfac68f515 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1370,6 +1370,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; + cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {}; + cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; From 3864892222adf0abc9aba53efde1382d9faafeca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Sep 2011 18:44:26 +0000 Subject: [PATCH 260/504] haskell-happstack-server: updated to version 6.2.4 svn path=/nixpkgs/trunk/; revision=29134 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 810e7936d03..b62c8bd0202 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "6.2.3"; - sha256 = "0rrwzp8il6vfw17m5rqj3ad418k4gxvaa99s817r00iyhna7clmi"; + version = "6.2.4"; + sha256 = "0lhyjaxw1qkh1pi0v14j7ya2ljrfizmxwahrhqk3sasnf2mrqycp"; isLibrary = true; isExecutable = true; buildDepends = [ From 4b66e4ce2506720b489fe1197c94017f36acdc0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Sep 2011 18:44:33 +0000 Subject: [PATCH 261/504] haskell-happstack-hamlet: added version 6.2.0 svn path=/nixpkgs/trunk/; revision=29135 --- .../haskell/happstack/happstack-hamlet.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix new file mode 100644 index 00000000000..3eccba4eb38 --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -0,0 +1,18 @@ +{ cabal, hamlet, happstackServer, text }: + +cabal.mkDerivation (self: { + pname = "happstack-hamlet"; + version = "6.2.0"; + sha256 = "1y3nc6z9y96fci25dc6w66l0qlnkz29kr29dpd2sjnhpqm0kvzsc"; + buildDepends = [ hamlet happstackServer text ]; + meta = { + homepage = "http://www.happstack.com/"; + description = "Support for Hamlet HTML templates in Happstack"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bbfac68f515..66d562a4986 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -640,6 +640,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {}; + happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; + hashable = callPackage ../development/libraries/haskell/hashable {}; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; From b917ed049334ca8199d91bf9811c0fdf6dc72a89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Sep 2011 18:44:40 +0000 Subject: [PATCH 262/504] haskell-deepseq-th: added version 0.1.0.2 svn path=/nixpkgs/trunk/; revision=29136 --- .../libraries/haskell/deepseq-th/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/deepseq-th/default.nix diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix new file mode 100644 index 00000000000..ccffbe54f02 --- /dev/null +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "deepseq-th"; + version = "0.1.0.2"; + sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc"; + buildDepends = [ deepseq ]; + meta = { + description = "Template Haskell based deriver for optimised NFData instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 66d562a4986..99c4f704f8e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -514,6 +514,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; deepseq = self.deepseq_1_1_0_0; + deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; + derive = callPackage ../development/libraries/haskell/derive {}; Diff = callPackage ../development/libraries/haskell/Diff {}; From 29de18d26296ab9373699d5d981ccc61c69ddfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 9 Sep 2011 19:30:53 +0000 Subject: [PATCH 263/504] Added generic-deriving. svn path=/nixpkgs/trunk/; revision=29137 --- .../haskell/generic-deriving/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/generic-deriving/default.nix diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix new file mode 100644 index 00000000000..e576812fc1d --- /dev/null +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "generic-deriving"; + version = "1.0.2"; + sha256 = "0qj4ql44f87rgg5l512mh863c1zjfklw1w5k8x4nyw37s7qx9hvq"; + meta = { + description = "Generic programming library for generalized deriving."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 99c4f704f8e..c08b352f46b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -576,6 +576,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gdiff = callPackage ../development/libraries/haskell/gdiff {}; + genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {}; + getOptions = callPackage ../development/libraries/haskell/get-options {}; ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; From 6a754d3119d9b2a2fb25184edb60b803dc3f5ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 9 Sep 2011 19:35:31 +0000 Subject: [PATCH 264/504] Minor fix. svn path=/nixpkgs/trunk/; revision=29138 --- pkgs/development/libraries/haskell/generic-deriving/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index e576812fc1d..b6f79ed16c2 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self: { version = "1.0.2"; sha256 = "0qj4ql44f87rgg5l512mh863c1zjfklw1w5k8x4nyw37s7qx9hvq"; meta = { - description = "Generic programming library for generalized deriving."; + description = "Generic programming library for generalized deriving"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 19995681f36b040456e2442859563bb02bf62a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 9 Sep 2011 19:43:04 +0000 Subject: [PATCH 265/504] Added instant-generics. svn path=/nixpkgs/trunk/; revision=29139 --- .../haskell/instant-generics/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/instant-generics/default.nix diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix new file mode 100644 index 00000000000..ca02a9bc8c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -0,0 +1,19 @@ +{ cabal, syb }: + +cabal.mkDerivation (self: { + pname = "instant-generics"; + version = "0.3.3"; + sha256 = "125ninsm1k9hixlwqdn7b842fpqxz4zih4rh8fn7r7djmv1zpq9q"; + buildDepends = [ syb ]; + noHaddock = true; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; + description = "Generic programming library with a sum of products view"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c08b352f46b..20f816d81e8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -769,6 +769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {}; + instantGenerics = callPackage ../development/libraries/haskell/instant-generics {}; + irc = callPackage ../development/libraries/haskell/irc { parsec = self.parsec2; }; From 4e6013e90962a6638802f0b628898e8a7a462139 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Sep 2011 19:57:44 +0000 Subject: [PATCH 266/504] haskell-gtk still fails an assertion on Darwin; my attempt to fix that hasn't worked, so I revert the change. Someone with access to that platform will have to worry about those on Hydra assertions, I'm afraid. svn path=/nixpkgs/trunk/; revision=29143 --- pkgs/top-level/haskell-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 20f816d81e8..f7f15dec07a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -616,7 +616,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs.gtkLibs) gtk; - glibc = if pkgs.stdenv.isLinux then pkgs.stdenv.glibc else null; }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; From bc3c074cb858cf82cde42212ebf66b06d3c9e370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 9 Sep 2011 20:45:04 +0000 Subject: [PATCH 267/504] Added unbound, RepLib, type-equality. svn path=/nixpkgs/trunk/; revision=29148 --- .../libraries/haskell/RepLib/default.nix | 19 +++++++++++++++++++ .../haskell/type-equality/default.nix | 18 ++++++++++++++++++ .../libraries/haskell/unbound/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++++ 4 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/haskell/RepLib/default.nix create mode 100644 pkgs/development/libraries/haskell/type-equality/default.nix create mode 100644 pkgs/development/libraries/haskell/unbound/default.nix diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix new file mode 100644 index 00000000000..908ff5b62a9 --- /dev/null +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -0,0 +1,19 @@ +{ cabal, mtl, typeEquality }: + +cabal.mkDerivation (self: { + pname = "RepLib"; + version = "0.5.1"; + sha256 = "1c6zqi87lmmmiz8amsvhw6wkhg90rhh6yl5vh0a9ism3apwh1i7r"; + buildDepends = [ mtl typeEquality ]; + noHaddock = true; + meta = { + homepage = "http://code.google.com/p/replib/"; + description = "Generic programming library with representation types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix new file mode 100644 index 00000000000..922f7bbd62f --- /dev/null +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -0,0 +1,18 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "type-equality"; + version = "0.1.0.2"; + sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q"; + noHaddock = true; + meta = { + homepage = "http://github.com/hesselink/type-equality/"; + description = "Type equality, coercion/cast and other operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix new file mode 100644 index 00000000000..e58da04d039 --- /dev/null +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -0,0 +1,19 @@ +{ cabal, mtl, RepLib, transformers }: + +cabal.mkDerivation (self: { + pname = "unbound"; + version = "0.3.1"; + sha256 = "13k53dcap8knvl2qzcykx838laas34xfc0480705vzl1z9z1xppz"; + buildDepends = [ mtl RepLib transformers ]; + noHaddock = true; + meta = { + homepage = "http://code.google.com/p/replib/"; + description = "Generic support for programming with names and binders"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f7f15dec07a..86a1ca2b4e7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1016,6 +1016,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); repaIo = callPackage ../development/libraries/haskell/repa-io {}; + RepLib = callPackage ../development/libraries/haskell/RepLib {}; + RSA = callPackage ../development/libraries/haskell/RSA {}; safe = callPackage ../development/libraries/haskell/safe {}; @@ -1161,6 +1163,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tuple = callPackage ../development/libraries/haskell/tuple {}; + typeEquality = callPackage ../development/libraries/haskell/type-equality {}; + + unbound = callPackage ../development/libraries/haskell/unbound {}; + uniplate = callPackage ../development/libraries/haskell/uniplate {}; uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; From 3f94f217d18c538da6e9169d240740847e9e3ecb Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 9 Sep 2011 21:15:20 +0000 Subject: [PATCH 268/504] Add clooj, IDE for clojure svn path=/nixpkgs/trunk/; revision=29149 --- .../interpreters/clojure/binary.nix | 1 - .../interpreters/clojure/clooj-wrapper.nix | 11 ++++++++ .../interpreters/clojure/clooj.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/clojure/clooj-wrapper.nix create mode 100644 pkgs/development/interpreters/clojure/clooj.nix diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix index 39b98b0843c..7b53ea9022d 100644 --- a/pkgs/development/interpreters/clojure/binary.nix +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation { install -t $out/lib/java clojure.jar "; - meta = { description = "a Lisp dialect for the JVM"; homepage = http://clojure.org/; diff --git a/pkgs/development/interpreters/clojure/clooj-wrapper.nix b/pkgs/development/interpreters/clojure/clooj-wrapper.nix new file mode 100644 index 00000000000..fd95b86451f --- /dev/null +++ b/pkgs/development/interpreters/clojure/clooj-wrapper.nix @@ -0,0 +1,11 @@ +{writeTextFile, jre, clooj}: + +writeTextFile { + name = "clooj-wrapper"; + executable = true; + destination = "/bin/clooj"; + text = '' + #!/bin/sh + exec ${jre}/bin/java -jar ${clooj}/lib/java/clooj.jar + ''; +} diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix new file mode 100644 index 00000000000..23bf9ad03b7 --- /dev/null +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl}: + +let + jar = fetchurl { + url = https://github.com/downloads/arthuredelstein/clooj/clooj-0.1.36-STANDALONE.jar; + sha256 = "173c66c0aade3ae5d21622f629e60efa51a03ad83c087b02c25e806c5b7f838c"; + }; +in + +stdenv.mkDerivation { + name = "clooj-0.1.32"; + + phases = "installPhase"; + + installPhase = '' + ensureDir $out/lib/java + ln -s ${jar} $out/lib/java/clooj.jar + ''; + + meta = { + description = "clooj, a lightweight IDE for clojure"; + homepage = https://github.com/arthuredelstein/clooj; + license = stdenv.lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a6882fdd6..f1cc581c6f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2460,6 +2460,11 @@ let #clojure = clojure_binary; }; + clooj_standalone_binary = callPackage ../development/interpreters/clojure/clooj.nix { }; + + clooj_wrapper = callPackage ../development/interpreters/clojure/clooj-wrapper.nix { + clooj = clooj_standalone_binary; + }; erlang = callPackage ../development/interpreters/erlang { }; From 49bf0b50a8e5b5364e36335ca21661ffd68e23e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Sep 2011 11:27:13 +0000 Subject: [PATCH 269/504] haskell-cabal-ghci: updated to version 0.1.1 svn path=/nixpkgs/trunk/; revision=29152 --- pkgs/development/tools/haskell/cabal-ghci/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index a119301e90e..ad452a663e8 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "cabal-ghci"; - version = "0.1"; - sha256 = "05xyd3xl238pi5vq392m62p4vdf1n8wwxvbi05bh8hamqrkd3j8p"; + version = "0.1.1"; + sha256 = "09r66fv8ncsdj90zrhg4srxhmbhmf7q61kvfc39x4jbyskgciqms"; isLibrary = true; isExecutable = true; - noHaddock = true; meta = { homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki"; description = "Set up ghci with options taken from a .cabal file"; From ae94d87ef4c4f260dd2bc1957e3a4c85f7e7eecb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 10 Sep 2011 19:23:26 +0000 Subject: [PATCH 270/504] Trying to fix networkmanager svn path=/nixpkgs/trunk/; revision=29160 --- .../networking/network-manager/default.nix | 54 ++++++-- .../network-manager/nixos-purity.patch | 123 ++++++++++++++++++ 2 files changed, 166 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/networking/network-manager/nixos-purity.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index edfc9f547f4..88b61c33dd6 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,22 +1,54 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib -, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, iptables, libtasn1 -, libgcrypt }: -stdenv.mkDerivation rec { +, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables, libtasn1 +, libgcrypt, dnsmasq, avahi }: +stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.8.1"; + version = "0.9.0"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/0.8/NetworkManager-${version}.tar.bz2"; - sha256 = "1yhr1zc9p2dakvg6m33jgkf09r6f6bzly7kqqjcpim4r66z6y4nw"; + url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.bz2"; + sha256 = "0kvi767c224zlja65r8gixmhj57292k0gsxa0217lw5i99l2incq"; }; - configureFlags = [ "--with-distro=gentoo" "--with-dhclient=${dhcp}/sbin" - "--with-dhcpcd=${dhcp}/sbin" "--with-iptables=${iptables}/sbin/iptables" - "--with-crypto=gnutls" "--disable-more-warnings" - "--with-udev-dir=\${out}/lib/udev" ]; + # Right now we hardcode quite a few paths at build time. Probably we should + # patch networkmanager to allow passing these path in config file. This will + # remove unneeded build-time dependencies. + configureFlags = [ + "--with-distro=exherbo" + "--with-dhclient=${dhcp}/sbin/dhclient" + # Upstream prefers dhclient, so don't add dhcpcd to the closure + #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd" + "--with-dhcpcd=no" + "--with-iptables=${iptables}/sbin/iptables" + "--with-udev-dir=\${out}/lib/udev" + "--without-resolvconf" + "--sysconfdir=/etc" "--localstatedir=/var" + "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" + "--with-crypto=gnutls" "--disable-more-warnings" ]; - buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 libuuid polkit gnutls ppp libtasn1 libgcrypt ]; + buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 + libuuid polkit gnutls ppp libtasn1 libgcrypt ]; + + patches = [ ./nixos-purity.patch ]; + + preInstall = + '' + installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) + ''; + + inherit avahi dnsmasq ppp; + glibc = stdenv.gcc.libc; + + # Substitute full paths, check if there any not substituted path + postPatch = + '' + for i in src/backends/NetworkManagerExherbo.c src/dns-manager/nm-dns-dnsmasq.c \ + src/dnsmasq-manager/nm-dnsmasq-manager.c src/nm-device.c src/ppp-manager/nm-ppp-manager.c; do + substituteAll "$i" "$i" + done + find . -name \*.c | xargs grep '@[a-zA-Z]*@' && exit 1 || true + ''; meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch new file mode 100644 index 00000000000..93e651ea096 --- /dev/null +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -0,0 +1,123 @@ +diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c +index d7e24cf..aa64210 100644 +--- a/src/backends/NetworkManagerExherbo.c ++++ b/src/backends/NetworkManagerExherbo.c +@@ -56,9 +56,9 @@ void nm_system_enable_loopback (void) + */ + void nm_system_update_dns (void) + { +- if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { ++ if (g_file_test ("@glibc@/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); +- nm_spawn_process ("/usr/sbin/nscd -i hosts"); ++ nm_spawn_process ("@glibc@/sbin/nscd -i hosts"); + } + } + +diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c +index 88136a9..b4113a9 100644 +--- a/src/dhcp-manager/nm-dhcp-dhclient.c ++++ b/src/dhcp-manager/nm-dhcp-dhclient.c +@@ -68,10 +68,6 @@ const char * + nm_dhcp_dhclient_get_path (const char *try_first) + { + static const char *dhclient_paths[] = { +- "/sbin/dhclient", +- "/usr/sbin/dhclient", +- "/usr/pkg/sbin/dhclient", +- "/usr/local/sbin/dhclient", + NULL + }; + const char **path = dhclient_paths; +diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c +index 237661f..48bc33f 100644 +--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c ++++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c +@@ -51,10 +51,6 @@ const char * + nm_dhcp_dhcpcd_get_path (const char *try_first) + { + static const char *dhcpcd_paths[] = { +- "/sbin/dhcpcd", +- "/usr/sbin/dhcpcd", +- "/usr/pkg/sbin/dhcpcd", +- "/usr/local/sbin/dhcpcd", + NULL + }; + const char **path = dhcpcd_paths; +diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c +index 2767208..6562015 100644 +--- a/src/dns-manager/nm-dns-dnsmasq.c ++++ b/src/dns-manager/nm-dns-dnsmasq.c +@@ -52,9 +52,7 @@ static inline const char * + find_dnsmasq (void) + { + static const char *paths[] = { +- "/usr/local/sbin/dnsmasq", +- "/usr/sbin/dnsmasq", +- "/sbin/dnsmasq", ++ "@dnsmasq@/sbin/dnsmasq", + NULL + }; + const char **binary = paths; +diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c +index ca2f9dc..7afb118 100644 +--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c ++++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c +@@ -170,9 +170,7 @@ static inline const char * + nm_find_dnsmasq (void) + { + static const char *dnsmasq_binary_paths[] = { +- "/usr/local/sbin/dnsmasq", +- "/usr/sbin/dnsmasq", +- "/sbin/dnsmasq", ++ "@dnsmasq@/sbin/dnsmasq", + NULL + }; + +diff --git a/src/nm-device.c b/src/nm-device.c +index 3522ea4..75b2db3 100644 +--- a/src/nm-device.c ++++ b/src/nm-device.c +@@ -1285,8 +1285,7 @@ aipd_exec (NMDevice *self, GError **error) + gboolean success = FALSE; + const char **aipd_binary = NULL; + static const char *aipd_paths[] = { +- "/usr/sbin/avahi-autoipd", +- "/usr/local/sbin/avahi-autoipd", ++ "@avahi@/sbin/autoipd", + NULL + }; + int i = 0; +@@ -2446,7 +2445,7 @@ share_init (void) + } + + for (iter = modules; *iter; iter++) { +- char *argv[3] = { "/sbin/modprobe", *iter, NULL }; ++ char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe", *iter, NULL }; + char *envp[1] = { NULL }; + GError *error = NULL; + +diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c +index e863aab..27c14e2 100644 +--- a/src/ppp-manager/nm-ppp-manager.c ++++ b/src/ppp-manager/nm-ppp-manager.c +@@ -661,9 +661,7 @@ static inline const char * + nm_find_pppd (void) + { + static const char *pppd_binary_paths[] = { +- "/usr/local/sbin/pppd", +- "/usr/sbin/pppd", +- "/sbin/pppd", ++ "@ppp@/sbin/pppd", + NULL + }; + +@@ -992,7 +990,7 @@ nm_ppp_manager_start (NMPPPManager *manager, + + /* Make sure /dev/ppp exists (bgo #533064) */ + if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) +- ignored = system ("/sbin/modprobe ppp_generic"); ++ ignored = system ("/var/run/current-system/sw/sbin/modprobe ppp_generic"); + + connection = nm_act_request_get_connection (req); + g_assert (connection); From e236848406a7d85175ff87f11bc97bb830a6dfaa Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 10 Sep 2011 20:09:11 +0000 Subject: [PATCH 271/504] Disable networkmanager in kdebase-workspace-4.5.5 NM-0.8 never worked in NixOS, and KDE-4.5 doesn't support newer NM svn path=/nixpkgs/trunk/; revision=29161 --- pkgs/desktops/kde-4.5/base-workspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix index 0fbafd2e407..648e24d987d 100644 --- a/pkgs/desktops/kde-4.5/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix @@ -3,7 +3,7 @@ , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost , automoc4, strigi, soprano, qimageblitz, akonadi -, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez, networkmanager +, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez }: kde.package { @@ -13,7 +13,7 @@ kde.package { kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394 libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate - pciutils bluez networkmanager ]; + pciutils bluez ]; patches = [ # Don't do compositing with the software GLX driver, since it's From 134fb92f73b4397da9007a93036524f871a09798 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Sep 2011 07:25:30 +0000 Subject: [PATCH 272/504] Drop unused buildInput Mark virtuoso as a runtime dependency of kdebase-runtime. The propagatedUserEnvPackages is not used by buildEnv, but I'm going to let it use this property (instead of/in addition to) $prefix/nix-support/propagated-user-env-packages. svn path=/nixpkgs/trunk/; revision=29162 --- pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix index deb90574e32..dd2ddab6c61 100644 --- a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix @@ -1,15 +1,17 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica -, libcanberra, virtuoso, makeWrapper, samba +, libcanberra, virtuoso, samba }: # TODO: Re-enable ntrack once it is fixed upstream kde { buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica virtuoso - makeWrapper samba (libcanberra.override { gtk = null; }) + [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica + samba (libcanberra.override { gtk = null; }) ]; + passthru.propagatedUserEnvPackages = [ virtuoso ]; + meta = { license = "LGPL"; }; From 68a3b1395e4153b33cc1c0faca30aa4cef56833f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Sep 2011 07:27:01 +0000 Subject: [PATCH 273/504] wpa_supplicant-0.7.3 Add D-Bus interface required by NM-0.9 svn path=/nixpkgs/trunk/; revision=29163 --- .../linux/wpa_supplicant/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 875a4811f92..64efc1aee39 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, openssl, qt4, inkscape}: +{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig}: let - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz"; - sha256 = "1gnwhnczli50gidsq22ya68hixmdrhd1sxw202ygihvg6xsjl06z"; + sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh"; }; in @@ -16,10 +16,22 @@ in cd wpa_supplicant cp -v defconfig .config echo CONFIG_DEBUG_SYSLOG=y | tee -a .config + echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config + echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config + echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [openssl]; + buildInputs = [openssl dbus_libs]; + + buildNativeInputs = [ pkgconfig ]; + + # Upstream patch required for NetworkManager-0.9 + patches = [ (fetchurl { + url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; + name = "wpa_supplicant-nm-0.9.patch"; + sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8"; + }) ]; postInstall = '' ensureDir $out/share/man/man5 $out/share/man/man8 From 829a5e32095218cc1ce0c7b88a7aff8ce9cc19b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 11 Sep 2011 09:14:22 +0000 Subject: [PATCH 274/504] Bump GHC HEAD snapshot. svn path=/nixpkgs/trunk/; revision=29164 --- pkgs/development/compilers/ghc/head.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 3e30cd9b72b..8e60b4f2fc1 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: stdenv.mkDerivation rec { - version = "7.3.20110825"; + version = "7.3.20110910"; name = "ghc-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${homepage}/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "06ngp3blg1nb1akiyxx2iypiwmybw4jg67lk9nmsn1jmj41v7dsm"; + sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5"; }; buildInputs = [ghc perl gmp ncurses]; From ee57346eb9ebad3bb86269e30cdcb7b04438f5e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:32:59 +0000 Subject: [PATCH 275/504] haskell-shakespeare-text: added version 0.10.1 svn path=/nixpkgs/trunk/; revision=29165 --- .../libraries/haskell/shakespeare-text/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/shakespeare-text/default.nix diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix new file mode 100644 index 00000000000..fd0751ac510 --- /dev/null +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -0,0 +1,14 @@ +{ cabal, shakespeare, text }: + +cabal.mkDerivation (self: { + pname = "shakespeare-text"; + version = "0.10.1"; + sha256 = "1p05nsfmlibhpik6dd40m0djk5yckl4i2ylx9lwyi68lx0izbm5j"; + buildDepends = [ shakespeare text ]; + meta = { + homepage = "http://www.yesodweb.com/book/templates"; + description = "Interpolation with quasi-quotation: put variables strings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 86a1ca2b4e7..65f78617738 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1075,9 +1075,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); shakespeare = callPackage ../development/libraries/haskell/shakespeare {}; + shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {}; + shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js {}; - shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {}; + shakespeareText = callPackage ../development/libraries/haskell/shakespeare-text {}; Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {}; From e364367ec99a377d2990f385703d7b386ae18f9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:08 +0000 Subject: [PATCH 276/504] haskell-hamlet: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=29166 --- .../libraries/haskell/hamlet/{0.10.0.nix => 0.10.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/hamlet/{0.10.0.nix => 0.10.1.nix} (86%) diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.0.nix b/pkgs/development/libraries/haskell/hamlet/0.10.1.nix similarity index 86% rename from pkgs/development/libraries/haskell/hamlet/0.10.0.nix rename to pkgs/development/libraries/haskell/hamlet/0.10.1.nix index 280e49ea435..e3b80dd1edc 100644 --- a/pkgs/development/libraries/haskell/hamlet/0.10.0.nix +++ b/pkgs/development/libraries/haskell/hamlet/0.10.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.0"; - sha256 = "0xqlc03g0qnpnrw957108rpjbs88p9wwvcgmz7vc1f0k88lc0h6n"; + version = "0.10.1"; + sha256 = "1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 65f78617738..257d89a0cbf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -634,8 +634,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {}; - hamlet_0_10_0 = callPackage ../development/libraries/haskell/hamlet/0.10.0.nix {}; - hamlet = self.hamlet_0_10_0; + hamlet_0_10_1 = callPackage ../development/libraries/haskell/hamlet/0.10.1.nix {}; + hamlet = self.hamlet_0_10_1; happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {}; From af78f75777ff1737141db47bbae1bdda70bf2f2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:15 +0000 Subject: [PATCH 277/504] haskell-authenticate: updated to version 0.10.2.1 svn path=/nixpkgs/trunk/; revision=29167 --- pkgs/development/libraries/haskell/authenticate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index dd6ea47fb50..ed91c9d4dd9 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.2"; - sha256 = "02zgl7r2jpiw2srd6bzxkhxmbzvggbqs4qd4fhv7jn5y4jbwaw75"; + version = "0.10.2.1"; + sha256 = "1bi46bls57wzmd90grrp6rpvgzsz064yi804b6pavq0pxiz1yaj9"; buildDepends = [ aesonNative attoparsec base64Bytestring blazeBuilder caseInsensitive enumerator failure httpEnumerator httpTypes network From eb588afe731f2176636b1201aeca6fb154a88425 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:23 +0000 Subject: [PATCH 278/504] haskell-persistent-template: updated to version 0.6.2 svn path=/nixpkgs/trunk/; revision=29168 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 8f0e3263ed7..af69ad9d267 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.6.1"; - sha256 = "1ggfdq1d32i5ny57cvdf8yw5pwhbw2sc31mrj1whb0ggkcwaqh9l"; + version = "0.6.2"; + sha256 = "1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx"; buildDepends = [ monadControl persistent text ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From e75afee27c1a5cbc6b37ce5d3eebedbf84fab274 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:31 +0000 Subject: [PATCH 279/504] haskell-persistent: updated to version 0.6.2 svn path=/nixpkgs/trunk/; revision=29169 --- .../libraries/haskell/persistent/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index a3ce3564a52..9329faad348 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeHtml, enumerator, monadControl, mtl, parsec -, pathPieces, pool, sqlite, text, time, transformers +{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool +, sqlite, text, time, transformers }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.6.1"; - sha256 = "1pb34n7rwj6jvk18c802kd99rrlhrav1hkx600rs6pp5zjic3mp7"; + version = "0.6.2"; + sha256 = "1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2"; buildDepends = [ - blazeHtml enumerator monadControl mtl parsec pathPieces pool text - time transformers + blazeHtml enumerator monadControl mtl pathPieces pool text time + transformers ]; extraLibraries = [ sqlite ]; meta = { From 74d68f2be9fb9a00d0b94910edf32619454dcc30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:36 +0000 Subject: [PATCH 280/504] haskell-shakespeare-css: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=29170 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index cb5f5ca39b5..0bc2f187fb2 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.0"; - sha256 = "12gdpxsh6x95m9vp0nrffri1bh8d6zhd7qqjrrkp49rvjf8fjwrk"; + version = "0.10.1"; + sha256 = "1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 8b42338143c8da0af387867f018182c85705d273 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:43 +0000 Subject: [PATCH 281/504] haskell-shakespeare-text: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=29171 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index fd0751ac510..7c8cfceef17 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Interpolation with quasi-quotation: put variables strings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From e85eca5f8d03913e3e59a1bbce3d2ea730f940d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:49 +0000 Subject: [PATCH 282/504] haskell-shakespeare: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=29172 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index e99b6c4b7cc..409b9b838a4 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "0.10.0"; - sha256 = "14q0z2q7c27pp6hnwzn50zjb4rzhy7znmahnzn8b59274jkbbzjs"; + version = "0.10.1"; + sha256 = "1ckzfxrs65n8cx0hm64c3jd4hbw48x1vi0cvnkz39k500jpq874f"; buildDepends = [ blazeBuilder blazeHtml failure parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 06a51a4a46d23e43ea5e3d7b5d99978a092f472b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:33:56 +0000 Subject: [PATCH 283/504] haskell-wai: updated to version 0.4.2 svn path=/nixpkgs/trunk/; revision=29173 --- pkgs/development/libraries/haskell/wai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index e7d7d48d738..d85d3629cae 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,13 +4,13 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "0.4.1"; - sha256 = "089i9qj7vban1qdrdpx836c31yakg3l3lx7y36h56livy6n37k72"; + version = "0.4.2"; + sha256 = "18w4wzryyqcqqihwckbz92smkqhhxh3lmi0kgxkcgivyzvhd2jqy"; buildDepends = [ blazeBuilder enumerator httpTypes network text transformers ]; meta = { - homepage = "http://github.com/snoyberg/wai"; + homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From e8375ba69c6193987d0d48db4d0d0304b9532f3a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:34:04 +0000 Subject: [PATCH 284/504] haskell-warp: updated to version 0.4.5 svn path=/nixpkgs/trunk/; revision=29174 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 843a931ef35..b461e36d33f 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "0.4.4"; - sha256 = "1mlwny6pfgngpqb4lh6v373m98agf275mbl2p6mxxfh1581fz863"; + version = "0.4.5"; + sha256 = "0ql9a7qa6ivsvgr66hgj6bs8c3y8rr320kk1cxq9qbpi00gy5j8b"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator httpTypes network simpleSendfile transformers unixCompat wai From 4be1a7827083c2f3fd16c6c0a4243c062bfb0ab7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:34:13 +0000 Subject: [PATCH 285/504] haskell-yesod-auth: updated to version 0.7.2 svn path=/nixpkgs/trunk/; revision=29175 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index c7b32f2a431..56d5c43887b 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.1.1"; - sha256 = "1jh9m8knrgjrm553s3y239ryvk8cv84v5yq8zng20b7marrhfy0p"; + version = "0.7.2"; + sha256 = "18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn"; buildDepends = [ aesonNative authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From e4f516bda4cfcaa3d1c1b6dfc61742c7df72bd5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:34:17 +0000 Subject: [PATCH 286/504] haskell-yesod-core: updated to version 0.9.2 svn path=/nixpkgs/trunk/; revision=29176 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 10ea9aa2052..5321294e55a 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.1.1"; - sha256 = "1cwywjks37i7411m6ab827q5vx1yjgnqn04am0bxzw001vciadm5"; + version = "0.9.2"; + sha256 = "1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf"; buildDepends = [ blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie enumerator failure hamlet httpTypes monadControl parsec pathPieces From 5557e9dcf20e29b24eefebd5c2c64e38aaf9d792 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:34:22 +0000 Subject: [PATCH 287/504] haskell-yesod-form: updated to version 0.3.2 svn path=/nixpkgs/trunk/; revision=29177 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 5d841c925cd..29e4631bbd9 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.1"; - sha256 = "0xa9950michbwlp90xcr8ybpig7f026zwq28lg03zavnaqisqkfj"; + version = "0.3.2"; + sha256 = "08lf4fqb9vp9xmj5y5diqyl0iv2gf254l5hspxyihnnnf1nsz69k"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From 8993dabdf40d2ab814e51ca6a35837c3975967c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Sep 2011 10:34:26 +0000 Subject: [PATCH 288/504] haskell-yesod: updated to version 0.9.2 svn path=/nixpkgs/trunk/; revision=29178 --- .../libraries/haskell/yesod/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index b649c9cfa1e..02162fade6f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,20 +1,21 @@ { cabal, attoparsecText, blazeBuilder, blazeHtml, hamlet, httpTypes -, monadControl, parsec, shakespeareCss, shakespeareJs, text, time -, transformers, unixCompat, wai, waiExtra, warp, yesodAuth -, yesodCore, yesodForm, yesodJson, yesodPersistent +, monadControl, parsec, shakespeareCss, shakespeareJs +, shakespeareText, text, time, transformers, unixCompat, wai +, waiExtra, warp, yesodAuth, yesodCore, yesodForm, yesodJson +, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.1.1"; - sha256 = "1f1l9davhqdf6fnkcrclf2dvszqsw2jby7y865y4sgcb73jb32fp"; + version = "0.9.2"; + sha256 = "1074vbrab8c0nrmkv1fn4rm65fyfw08b3mj498cxala3nm382whd"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsecText blazeBuilder blazeHtml hamlet httpTypes monadControl - parsec shakespeareCss shakespeareJs text time transformers - unixCompat wai waiExtra warp yesodAuth yesodCore yesodForm - yesodJson yesodPersistent + parsec shakespeareCss shakespeareJs shakespeareText text time + transformers unixCompat wai waiExtra warp yesodAuth yesodCore + yesodForm yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From b6648e207dce1c25e20ccfb37a6d7fd3afce2695 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Sep 2011 12:39:06 +0000 Subject: [PATCH 289/504] KDE SC 4.7.1 Mostly automatic update. The only manual change caused by some movements on projects.kde.org. Untested. svn path=/nixpkgs/trunk/; revision=29179 --- pkgs/desktops/kde-4.7/default.nix | 9 +- .../{kdebase => kde-baseapps}/kate.nix | 0 .../kde-baseapps.nix | 0 .../{kdebase => kde-baseapps}/konsole.nix | 0 pkgs/desktops/kde-4.7/kde-package/4.7.1.nix | 273 ++++++++++++++++++ .../kde-4.7/kde-package/kde-manifest.sh | 46 +-- .../kde-4.7/{kdebase => }/kde-runtime.nix | 0 .../kde-4.7/{kdebase => }/kde-workspace.nix | 0 pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix | 262 +++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 10 files changed, 569 insertions(+), 24 deletions(-) rename pkgs/desktops/kde-4.7/{kdebase => kde-baseapps}/kate.nix (100%) rename pkgs/desktops/kde-4.7/{kdebase => kde-baseapps}/kde-baseapps.nix (100%) rename pkgs/desktops/kde-4.7/{kdebase => kde-baseapps}/konsole.nix (100%) create mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.1.nix rename pkgs/desktops/kde-4.7/{kdebase => }/kde-runtime.nix (100%) rename pkgs/desktops/kde-4.7/{kdebase => }/kde-workspace.nix (100%) create mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index a0c59c4e044..5b677dd13d4 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,7 +1,7 @@ { callPackage, callPackageOrig, stdenv, qt47 }: let - release = "4.7.0"; + release = "4.7.1"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { @@ -47,7 +47,12 @@ kde.modules // kde.individual // qt4 = qt47; - kdebase_workspace = kde.individual.kde_workspace; + kdebase_workspace = kde.modules.kde_workspace; + + kde_baseapps = kde.modules.kde_baseapps // { + inherit (kde.individual) kate konsole; + propagatedUserEnvPackages = [ kde.individual.kate kde.individual.konsole ]; + }; inherit release; diff --git a/pkgs/desktops/kde-4.7/kdebase/kate.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix similarity index 100% rename from pkgs/desktops/kde-4.7/kdebase/kate.nix rename to pkgs/desktops/kde-4.7/kde-baseapps/kate.nix diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix similarity index 100% rename from pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix rename to pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix diff --git a/pkgs/desktops/kde-4.7/kdebase/konsole.nix b/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix similarity index 100% rename from pkgs/desktops/kde-4.7/kdebase/konsole.nix rename to pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix new file mode 100644 index 00000000000..43de59d7a2e --- /dev/null +++ b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix @@ -0,0 +1,273 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="blinken";value="0946y6g67bqbkdcnqas97izr514190f08qzq5jg12xjv3q5i9xnr";} + {name="cantor";value="1yipf6019nr1vacdl1mp6wwffwaq7khyh1rp5wx0f3y70p7q6w8v";} + {name="gwenview";value="00vxhpg2481pz7bh0kac1fsl8dawjlxm7x38y572802qbhd02jr4";} + {name="kalgebra";value="1rkl8jyiqi9ymwl4inflgwg2252k5x5yag25zr8crwg1ax9rvmhv";} + {name="kalzium";value="110l065vwjfyjr0130xklrsr3jwlqb27fv9mhc9w5v9i5shl79xm";} + {name="kamera";value="17sac0bydq4d2rv63jzjy87dry9g3n6chw7gg6nncisvkgz1dyz2";} + {name="kanagram";value="10nhgb1gf5vh6767xrbfwicdhw4kd3za4lnwrsww823dqpi6cryz";} + {name="kate";value="1n3zs4rs3y4z9g2ssiqi6jy7c2li0pah2p0vsdjw0ifq0xqvvz67";} + {name="kbruch";value="0x3y5gbq4xhqjrp4g91v3wjggrimxx6k8nsvny0ykriqql6xzq77";} + {name="kcolorchooser";value="1fwjf0fys3iz4c86jfhzq6j43ps7jiab9qhspkv6cvnv1dyi0ryy";} + {name="kdeaccessibility";value="1980y2vqxkhz40xkkljqawkafshhrimlyb7hvk5waz9a2jz0vwwj";} + {name="kdeadmin";value="1614acnvycihysxy3k26q8xsxswsx73m32n0c34hb0d5xj87ndk0";} + {name="kdeartwork";value="0xsmq5x9lbplj3rxza0lxxdbnz5srmxjzw993rzwj9687jvgi6hv";} + {name="kde-baseapps";value="1jpfslapsl4l7yqxq4cry0dwj2hps2s6kayj81dcs2crqrz75plc";} + {name="kdegames";value="0b3zljmkhyml31kfj9n75sa9h3xknn8v0y099mdc1wcny7p7zyrl";} + {name="kdegraphics-strigi-analyzer";value="1xnaipyn29wa5i26rgv2jbijii64qklz5fgcy49zpd0pxqnkxxwl";} + {name="kdegraphics-thumbnailers";value="07nvydwzzwnr1a5x3v732mry1qw7lvn8l3h3b73r6fvmnhs91iyp";} + {name="kdelibs";value="1gwgilr2m95m8w4q55d79g3qsgpq5jv7aq7crq7xbrhz3smv6ciw";} + {name="kdemultimedia";value="1p76vrzr1wmlpnkspy9nf8v1am6bdi5wc6zl4y9lp6y6qv9diz1w";} + {name="kdenetwork";value="1hmcljp8d85zyi55314js7jl5ihf060hji5gcm6s4s95xqg7hwvh";} + {name="kdepim";value="09lvdpq8nm9b97g0xlmc2ikklq7pc4c61v9lz53mb8c1hi9yxasd";} + {name="kdepimlibs";value="0svj7fqkn3g8ryip9qy4rh0j7xnjgwhv45rbz4s6lsjh81ipnc4j";} + {name="kdepim-runtime";value="0iy0sph5cvzmyn2gi0had5xhppdxdhs5dqm7lm79lk27i8913sjk";} + {name="kdeplasma-addons";value="1xrdqhaklf2l5043l1qhfjqyr6985m5j1jzd8rgabkwa9dv5bb4c";} + {name="kde-runtime";value="1qppx56xdrmapl0l0fv2p502yg470hiwhzdjv5kiw0akwl7g2ll5";} + {name="kdesdk";value="0db4kiikf0bl07m09cj01id0ivl1hm30pr5401xscqask7ddq2v9";} + {name="kdetoys";value="02zjz6h62nlxhjhsv5apxyhs140h6dc5i5laxi68j8fi4p8gyk5a";} + {name="kdeutils";value="0s7lw9qiyzn4wccbgalrsb91hspqniaf93x94s3gcw7jmk4znwwd";} + {name="kde-wallpapers";value="17x3npychdv9z90a6y2yxxscnczrpzkd8zanml3y1kkx1kcwvkrv";} + {name="kdewebdev";value="0ll5s60231vc6k989ahfw7k9wk0r6ml3icg25zj90785ildqqrnz";} + {name="kde-workspace";value="15kvc30w4ysjm7il7lkfls3xm9v4azhlz2jv75n5bp5h41kbznl5";} + {name="kgamma";value="1fzhhjqz6x19lk6c77mmq94bjk5f8qj0pq9c7923gd9d644azbsc";} + {name="kgeography";value="0s9nnsjma95j402wlcswrqdjz9csxbnxpnshcg5xxj3135122yv6";} + {name="khangman";value="04frra3qj4jkmhlsr4im6sjhyv7rs32fj88vphzwx0nbq086i078";} + {name="kig";value="1si3zi3w75mg9sd2imbs6f2z0ywkzbvg9cj672fmamczw5wrjp6n";} + {name="kimono";value="1bqw23g6c1l3bxnnzgz4pn5j2w2vxwfi1nrdjcbkfwsa4px2q7bn";} + {name="kiten";value="0i3dp8jqqjlx2hjbqwc01qaja9bh7aas0m4s75py5j2im7gkxncs";} + {name="klettres";value="1mxpxh4p16jnxmd2gff4ink222hbd1qxigr3hn8jc3a0kwrnpxdk";} + {name="kmplot";value="1adw71m9h6z85lwavsjsbdcnlgkchic6y5110hmb9x067n5hrfkq";} + {name="kolourpaint";value="01lc73vvpl5jmzvx9vi857k69mww97rd7fnqm2776d7dbkgpzzs8";} + {name="konsole";value="0ywy8xy38v058hfl6yakxqz355y64mmqbhxf0j1h0zz50744ww1r";} + {name="korundum";value="1ib02m2dr9ab1v1xxcngdisprr7mlll3h52d9lrjj6clnxlxz1sz";} + {name="kross-interpreters";value="1glb2hkj84zmcjjq3sh79w7g4y0v25ddd9hjiilppskwnqby16bb";} + {name="kruler";value="18h5kp7pni6j9nqfxzwfcfnv8sbgg1s656clzyi7f9znsw8bgzvd";} + {name="ksaneplugin";value="0mk7q66h6v5carkywkpjr5893r01vgcqf0lx9c1fq7n0mn22zl9s";} + {name="ksnapshot";value="0wf1bwkrhp714fhhh3y82p35rxk7prwqsn89nsl7rj3l7gryismp";} + {name="kstars";value="0bbnf8vnhinmgb03dab7ji2rpb3k2d901nm5r11lxwjdv58d4vkn";} + {name="ktouch";value="1b354imxnfv4yklzh0xd358gydczmlijkkjm2ks04111895h97b1";} + {name="kturtle";value="147sn2lrzxgfwiqxziymjvvy67sgwmdfcrgqvv93rmp5r9y3zmiy";} + {name="kwordquiz";value="1a2vifgixn6zgrp4nm5lvq41v24xp4nbnv8a7c9p53chx3y8i2px";} + {name="libkdcraw";value="1h49g41c2sxxzx6w865k2ljiqlgill7imh1pnkw1wsfwk4ii9msz";} + {name="libkdeedu";value="058gidzzda4ca4h2125ja17gdfq52zqdh70c22f6p4ph47qw503m";} + {name="libkexiv2";value="0vkl2gnp7saw26crj2hbg953knrv3v1pjd9c5d29vckdn5q417zr";} + {name="libkipi";value="00wnm45v65my7dp7g3sri54prjk1mkqi4nqf3f5xisnshi3vzr5f";} + {name="libksane";value="1w0d164lnc576irrxfi1f6rzv85wn5gawqp92yg8zqhna1zxjhzp";} + {name="marble";value="1964ix9dcssw4bny944rdwhxifnj5ay6nmbhvbvwq1d77ckzz9sf";} + {name="mobipocket";value="1npmbkvrg1kil6sh91m79kavfrivkk3jpb0c0spm0s93b85pgvky";} + {name="okular";value="0fw49r0hskhscml18715yqxxwrzigrx0rkhcljgckss7bksyfsfn";} + {name="oxygen-icons";value="1gwpsh7iwmzl1n9wzp8q95jlimbmygcrqwkzzp9jwsyfl9qn86y5";} + {name="parley";value="0c8k3sxpzxnaldvyskfp86cnhrzabq8alkv32ikr3y948ib9q31m";} + {name="perlkde";value="01ysn4bq5zjc0b8gqyinx08scimiix505zvdw13a9axfb4vnk05j";} + {name="perlqt";value="067hj2fw2jvd6d0ywdmq6y630ygm6xjrvkrnhm3czqxpfs6hp2mk";} + {name="pykde4";value="106kjcbg2gpgj7kypg79yjb2b3jbcc8zfslc65vkb32ivipk0j16";} + {name="qtruby";value="1dp3zdh5m3yp55r7pwxi4nqfjsfv84qcg9n5msp7lw78k04xidg7";} + {name="qyoto";value="1kynbz0gpjbq5xdpfv1by39cxji1z3wisv8c6bgxz7yknqp16qix";} + {name="rocs";value="1mlvw0fb83f0vjdf0amlx92w2fvjl79rcvhlv267vsw0idd3vp2g";} + {name="smokegen";value="1j0apyqv17fycysfjc0mf4rhq2g6zwn9fz7dsib1hylza813smxr";} + {name="smokekde";value="1zgf2pcxwxzhjhab46q2ir1ys4mq2xf9ais9473xc6xjvrbg74dd";} + {name="smokeqt";value="19xfpm9as6sbsfjsn8qiqnlfsqwpri56886kl9kp7qhr6dga54ma";} + {name="step";value="1819shriclbp1ny28gjik1mg1c3mvm4drk0c84zcq2vj6dz2fp61";} + {name="svgpart";value="1wcjbhl608y7a0rzwziaja7zi1kjixcnmwaik5xyss2hmx59m934";} +]; +modules=[ +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="mobipocket"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kate"; } + { name="kde-baseapps"; sane="kde_baseapps"; } + { name="konsole"; } + ]; +} +{ module="kdeaccessibility"; split=false; + pkgs=[ + { name="kaccessible"; } + { name="kmag"; } + { name="kmouth"; } + { name="kmousetool"; } + { name="jovie"; } + ]; + +} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + { name="system-config-printer-kde"; sane="system_config_printer_kde";} + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + { name="aurorae"; } + ]; + +} +{ module="kdegames"; split=false;} +{ module="kdelibs"; split=false;} +{ module="kdemultimedia"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kdesdk"; split=false; + pkgs=[ + { name="cervisia"; } + { name="lokalize"; } + { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } + { name="kcachegrind"; } + { name="kapptemplate"; } + { name="kpartloader"; } + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kioslave"; } + { name="okteta"; } + { name="kmtrace"; } + { name="kompare"; } + { name="kprofilemethod"; } + { name="kstartperf"; } + { name="kuiviewer"; } + { name="poxml"; } + { name="scripts"; } + { name="umbrello"; } + ]; + +} +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kdeutils"; split=false; + pkgs=[ + { name="ark"; } + { name="kcalc"; } + { name="kremotecontrol"; } + { name="kdf"; } + { name="kfloppy"; } + { name="printer-applet"; sane="printer_applet";} + { name="filelight"; } + { name="kcharselect"; } + { name="kgpg"; } + { name="ktimer"; } + { name="kwallet"; } + { name="sweeper"; } + { name="superkaramba"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh index 10ce57cee6a..dbb5970ab64 100755 --- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh +++ b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh @@ -33,6 +33,8 @@ if [[ ! -f kde_projects.xml ]]; then fi eval `xsltproc kde-submodules.xslt kde_projects.xml` +module[kde-baseapps]=kde-baseapps + print_sane() { echo "Called print_sane $1" >&2 sane="${1//[^a-z0-9_]/_}" @@ -62,38 +64,39 @@ done print_pkg_hash() { - echo -n "{name=\"${1}\";value=\"${hash[$1]}\";}" + echo " {name=\"${1}\";value=\"${hash[$1]}\";}" } print_hashes(){ - echo -n "hashes=builtins.listToAttrs[" + echo "hashes=builtins.listToAttrs[" for p in "${packages[@]}"; do print_pkg_hash "$p"; done - echo -n "];" + echo "];" } print_split_module(){ echo -n "$1:" >&2 - echo -n "{module=\"$1\";" + echo -e "{\n module=\"$1\";" print_sane "$1" - echo -n "split=true;" - echo -n "pkgs=[" + echo " split=true;" + echo " pkgs=[" for p in "${packages[@]}"; do if [[ "${module[$p]}" == "$1" ]]; then - echo -n "{name=\"$p\";" + echo -n " { name=\"$p\"; " print_sane "$p" - echo -n "}" + echo " }" echo -n " $p" >&2 fi done - echo -n "];}" + echo " ];" + echo "}" echo >&2 } print_mono_module(){ - echo -n "{module=\"$1\";" + echo -en "{ module=\"$1\"; " print_sane "$1" echo -n "$1 ... " >&2 - echo -n "split=false;" + echo -n " split=false;" cml="$1-$release/CMakeLists.txt" tar -xf "${dir}/$1-${release}.tar.bz2" "$cml" if grep '^[^#]*add_subdirectory' $cml >/dev/null; then @@ -104,38 +107,39 @@ print_mono_module(){ sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | grep -v '\(doc\|cmake\)'` ) echo " seems splittable, subdirs: ${subdirs[*]}" >&2 - echo -n "pkgs=[" + echo -e "\n pkgs=[" for s in "${subdirs[@]}"; do - echo -n "{name=\"${s//\//-}\";" + echo -en " {" + echo -n " name=\"${s//\//-}\"; " print_sane "$s" if [[ $s != "${s//\//-}" ]]; then - echo -n "subdir=\"$s\";" + echo -n "subdir=\"$s\"; " fi - echo -n "}" + echo "}" done - echo -n "];" + echo -e " ];\n" fi else echo " is monolithic (has no subdirs)" >&2 fi rm $cml rmdir $1-$release - echo -n "}" + echo "}" } print_modules(){ - echo -n "modules=[" + echo "modules=[" echo "Printing modules splitted by upstream" >&2 for m in "${!modules[@]}"; do print_split_module "$m"; done echo >&2 echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 for m in "${top_level[@]}"; do print_mono_module "$m"; done - echo -n "];" + echo "];" } echo "Writing ${release}.nix" >&2 exec > "${release}.nix" -echo -n "{stable=${stable};" +echo "{stable=${stable};" print_hashes print_modules -echo -n "}" +echo "}" diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix similarity index 100% rename from pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix rename to pkgs/desktops/kde-4.7/kde-runtime.nix diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix similarity index 100% rename from pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix rename to pkgs/desktops/kde-4.7/kde-workspace.nix diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix new file mode 100644 index 00000000000..f4ecf8656cf --- /dev/null +++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix @@ -0,0 +1,262 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "03sl2d83hyl138kl7424nxi546v1x1yp5ywqknk194532gf7isf2"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "0dal1sdvr28d0w9izl6chzybp1xgnvl20yn59yszl9zfwxzm5z45"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "17galw35j93jsmdpihr2x1jrpz8phyrrw403q77xb7csdc89mg41"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "07llq52f0hxz39h2amq1an788m6bijijifk9hilbkiixs1bpcycp"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "0f07p6nz0gryjihz35ga4hn7gj32is978ns74mxkgql3cqkmzpp8"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "0lcmp4lrlzjx8003fdpgsz5xi33ldj5sxkim90y76866kwgfd8a0"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "10ja0jg6fqq0a9nx2lcljp4fmrvn8yicv75wchfmz6ydrylfmlmc"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "10xbbjq08r47pcxg6j8k3yyvfjf6fvk16f3njriclsrxg5kgjcb1"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "0w6fkkmqqx73mf3piwqfk98xyk8izvrxkhw653npm30j2x5l1ccf"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "1xpsly96d68kzswscfz7fj4xzk3z92ddlzs06jl5ga3vi5v08br9"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "12wpzdqx5ckkr3x7wsbyb6ljixm66cxsxw5vpxf987hm9pblip9c"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "11s8wlv3qpnd9hf39z53nan6ljxdvh17knaz1jl7a04f0dczc1hj"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0a491igqcz1gb7218m9wflvrlyj0h95xlmsn70pb1jv0kvmpib7w"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0c5fji14j8h7zpj5941wrl6nar76ll5ry2yhcdq82ciphc74421q"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "1bgmlj7s7rdzva5i3kdi0hf16kh929a9qmhg745ivbfl89slbi6c"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "1fail3mpmsb0zvskwrxzjx0bvsbf28rv5qjzh061w1a9jqd0ggn3"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "0hx6y2xzgvnhcvmdf7qh1bk1jk87srmxpi1m4blwqara189bmqz7"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "1fjdjaqplqs9jk0np4fj8sm9jds8i9hxxf64cqj0is6wcf7lf9bc"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "1j56aj0bhpgfzlxcav3rwzahxm6q00hpdg6jmgq0m02d45kvn8z5"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1syxpqk37jwippx7p273f4h6n14jhbv22wmq8la48jsqdkgrrgjg"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "1jazhp4n5ymz5gbxc3g3c9jvd7k1fs2b1w09vhnbgwa6i3gpa1i8"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "1g85002i29g6qzmjrwng4pndrkxnkg1ph1qvkkrnkkpygbw3whvm"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "11aavg4gw7xcdaq72ygynm2zbjcmal0baaw6sk1gy597620hfm5g"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1395nskpbg8ah2q18ahsfv39ixhw74gb5cxr2irsfkgnwbmglas1"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "0jrnbd8j6qcfhxvfs014qq0dbdbp6632bk2210xg07sfmrz43csm"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "0rxvj142rw40d93ygfysavpw4jbyn8yx6c828sv5lp8c2r4kid5a"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "12x5dnk33khmfnf9fk5qq3par1l21xfy24lq4a6jdf8ya9nj62r5"; +} +{ + lang = "kn"; + saneName = "kn"; + sha256 = "0c4cp019ij80fc188dzkv5nbxplxhnhqc3b2qda9xr1j78vbbh46"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "0lhnvy370fk21z1r1wdq484pdjq6c0jsj3s2z58z4x7rfw2lq487"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "1blcg57vm05sbvcgslr49k84whm3f99mcd15zb8fxvvrybg0hr2m"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "0jc2vv97jwbbr966spzv10aimb9c42x5ia1rnr2kvs1hb8sxwvp1"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "04362qr5p3dhscrppcbg9cj28idrs0hslc2lk98drpq2rkc8rjmb"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "1ci4xh56w6rn68sl5xk23l1rxxfz7ni7y4z2sc5yidwi1acxfwpm"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "197jdabjxk61n5b69sw9jqcpp7561hq3dw086z2pymqll5irjf7f"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1cd0ifr6p9m8h665grwy8nk3gw72w9h5a8bygf5nj55164qmff98"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "1scn7nkl521v1f1y0km3s57s02xfblblg2f572s9yz5j2da9p2j0"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "1qn6lakcfah85ws9njz2xp36xj2n3ld3mhqkvcb6mddv943x65vj"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "0pw2zvma1jczkp0ypshxyl4dcnx6jakms91i2pwyswa8jv3mfx3b"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1n9m7wj5gd3kwf6smbx53l3jbjyvd26ginw007bnv6x14g2y7k19"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "155l1szxvjcgmw44097q8dvgd9ljgs2y3dn8mpi3y6cqj5kdb42s"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "166ck2pvhdrpyf269fmkqkqs3l6s4cc8f2p3w88f5z75qg9xc3bj"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "18bidvnhg2gqnjgr6np1gm2irn81b108kx7ri11gwppqh3h90340"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "0c2av80r3zc1jkybj3yp5hspv5rwlyda039jy11y49d6zwval097"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "0dffkmsd9l30c17fi5x6m6lx5hi5diqqxmmn36a9wb393mw8srm9"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "10rrlrwarh8sks2wym2kq3rk69kgzqk38ll93i0i0zhjgyqiahrg"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "1sqyw6zd3vnpkvb7iisqhnk7vjp3212h97yqgmlsxfry2rys1kmr"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "0vzr81c004zwxqhfwhpfs4g1w5dvbxzb9y3g3vsagnsc94i5fb9y"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "0p0ln8dcpq2hbqz651lb7izb82dqhh5pl3a931yzd99a6lr3kd39"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "0b6q2s1qigzchqs9dmzm31jrnhz3vfsix4zbmzs0wdib05qy6y1f"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "01hi12hanz44lbn52dcll2glcljax1mv3n5qc8w9gf4cqjjrs2ia"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "0iwszbl2myh9ik3yk19nyrj43rcki23amp5i2sx7lz9gy14lvgl8"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "1j1kvyc82ysin4ksp63gzczg4ihvn4qlfjd5l16qi0galp96mz21"; +} +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1cc581c6f2..138b8ff624a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7879,7 +7879,8 @@ let digikam = callPackage ../applications/graphics/digikam { }; - filelight = callPackage ../applications/misc/filelight { }; + filelight = if kde4 ? filelight then kde4.filelight + else callPackage ../applications/misc/filelight { }; k3b = callPackage ../applications/misc/k3b { }; From 23737894ec2c8c4d39a47b7cd3ecf98f08df70e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 11 Sep 2011 15:18:53 +0000 Subject: [PATCH 290/504] Updating comments: latest ghc-7.3 snapshot succeeds on more packages. svn path=/nixpkgs/trunk/; revision=29183 --- pkgs/top-level/haskell-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 257d89a0cbf..934ec4c0b69 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -124,7 +124,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.2 ok, 7.3 ok - fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 fails + fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 ok GLUT = self.GLUT_2_1_2_1; # 7.2 ok, 7.3 ok haskellSrc = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok @@ -141,9 +141,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb = self.syb_0_3_3; # 7.2 ok, 7.3 ok xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok - HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 fails + HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_5; # 7.2 ok, 7.3 fails + text = self.text_0_11_1_5; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok From 8351a946d2b26f01dc36d9675d40bcaada28c74b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 11 Sep 2011 16:45:42 +0000 Subject: [PATCH 291/504] Adding libmodplug svn path=/nixpkgs/trunk/; revision=29186 --- .../libraries/libmodplug/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/libmodplug/default.nix diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix new file mode 100644 index 00000000000..a45bc9fdf8d --- /dev/null +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -0,0 +1,47 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="libmodplug"; + version="0.8.8.4"; + name="${baseName}-${version}"; + url="mirror://sourceforge/project/modplug-xmms/${baseName}/${version}/${name}.tar.gz"; + hash="1xv44bd84c4qi41i1wwjr6qzazx15l85yvi74sz49ldyvlyy2pjw"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "Music library"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.publicDomain; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/modplug-xmms/files/libmodplug/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 138b8ff624a..b022a42ddae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3909,6 +3909,8 @@ let libmng = callPackage ../development/libraries/libmng { }; + libmodplug = callPackage ../development/libraries/libmodplug {}; + libmpcdec = callPackage ../development/libraries/libmpcdec { }; libmrss = callPackage ../development/libraries/libmrss { }; From 90d89bfe68529dfbba764d34487a5dba6bb2f5d5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 11 Sep 2011 16:46:17 +0000 Subject: [PATCH 292/504] Fixing some of Veracity tests svn path=/nixpkgs/trunk/; revision=29187 --- pkgs/applications/version-management/veracity/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index 8eb72f934f1..b4aa63ed014 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -31,7 +31,8 @@ rec { mkdir pseudo-home export HOME=$PWD/pseudo-home export LC_ALL=en_US.UTF-8 - ${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale-archive;" else ""} + export LANG=en_US.UTF-8 + ${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale/locale-archive;" else ""} make test || true '' else "") ["doMake" "minInit"]; From 7bb4bf3fe053d93354172d63b6ce272112736cf6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 11 Sep 2011 17:05:48 +0000 Subject: [PATCH 293/504] Adding LOVE Lua-based game framework/interpreter svn path=/nixpkgs/trunk/; revision=29188 --- .../development/interpreters/love/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/interpreters/love/default.nix diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix new file mode 100644 index 00000000000..ee68f85725a --- /dev/null +++ b/pkgs/development/interpreters/love/default.nix @@ -0,0 +1,58 @@ +x@{builderDefsPackage + , lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis + , libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="love"; + version="0.7.2"; + name="${baseName}-${version}"; + url="https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + hash="0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["setVars" "fixSrc" "doConfigure" "doMakeInstall"]; + + fixSrc =a.fullDepEntry '' + sed -e '/typedef void (\*__GLXextFuncPtr)/d' -i src/modules/graphics/opengl/GLee.h + '' ["minInit" "doUnpack"]; + + setVars = a.noDepEntry '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" + ''; + + meta = { + description = "A Lua-based 2D game engine/scripting language"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.zlib; + }; + passthru = { + updateInfo = { + downloadPage = "http://love2d.org/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b022a42ddae..eb7db6f7343 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2490,6 +2490,8 @@ let kona = callPackage ../development/interpreters/kona {}; + love = callPackage ../development/interpreters/love {}; + lua4 = callPackage ../development/interpreters/lua-4 { }; lua5 = callPackage ../development/interpreters/lua-5 { }; From 2155a9b00ff99abfc1933b65cf46db405f29ddee Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Sep 2011 18:28:14 +0000 Subject: [PATCH 294/504] Fix evaluation errors for haskellPackages.gtk on darwin. Note that the build is currently not successful. svn path=/nixpkgs/trunk/; revision=29189 --- pkgs/top-level/haskell-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 934ec4c0b69..6f7501f505d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -434,6 +434,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cairo = callPackage ../development/libraries/haskell/cairo { inherit (pkgs) cairo zlib; + glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; caseInsensitive_0_3 = callPackage ../development/libraries/haskell/case-insensitive/0.3.nix {}; @@ -601,6 +602,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; + glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; @@ -616,6 +618,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs.gtkLibs) gtk; + glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; @@ -891,6 +894,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pango = callPackage ../development/libraries/haskell/pango { inherit (pkgs.gtkLibs) pango; + glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; From d1808a89d3c8a6ad4c0d666de8e64d53e8d15c98 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Sep 2011 18:48:46 +0000 Subject: [PATCH 295/504] haskellPackages.{cairo,pango,glib,gtk}: Depend on the stdenv libc instead of glibc svn path=/nixpkgs/trunk/; revision=29190 --- pkgs/development/libraries/haskell/cairo/default.nix | 4 ++-- pkgs/development/libraries/haskell/glib/default.nix | 4 ++-- pkgs/development/libraries/haskell/gtk/default.nix | 4 ++-- pkgs/development/libraries/haskell/pango/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ---- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 293f692c67f..24f2319c842 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,4 +1,4 @@ -{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }: +{ cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }: cabal.mkDerivation (self: { pname = "cairo"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9"; buildDepends = [ mtl ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ cairo glibc pkgconfig zlib ]; + extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ]; pkgconfigDepends = [ cairo ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 9d7750e24de..6c685812846 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -1,11 +1,11 @@ -{ cabal, glib, glibc, gtk2hsBuildtools, pkgconfig }: +{ cabal, glib, gtk2hsBuildtools, pkgconfig }: cabal.mkDerivation (self: { pname = "glib"; version = "0.12.0"; sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19"; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ glibc pkgconfig ]; + extraLibraries = [ self.stdenv.gcc.libc pkgconfig ]; pkgconfigDepends = [ glib ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 0b9cd20eb0a..41b72975eb1 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -1,4 +1,4 @@ -{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, mtl, pango +{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango , pkgconfig }: @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ glibc pkgconfig ]; + extraLibraries = [ self.stdenv.gcc.libc pkgconfig ]; pkgconfigDepends = [ glib gtk ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index aff6bdb7315..7e1f3c933ba 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -1,4 +1,4 @@ -{ cabal, cairo, glib, glibc, gtk2hsBuildtools, mtl, pango +{ cabal, cairo, glib, gtk2hsBuildtools, mtl, pango , pkgconfig }: @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ glibc pkgconfig ]; + extraLibraries = [ self.stdenv.gcc.libc pkgconfig ]; pkgconfigDepends = [ cairo pango ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6f7501f505d..934ec4c0b69 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -434,7 +434,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cairo = callPackage ../development/libraries/haskell/cairo { inherit (pkgs) cairo zlib; - glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; caseInsensitive_0_3 = callPackage ../development/libraries/haskell/case-insensitive/0.3.nix {}; @@ -602,7 +601,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; - glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; @@ -618,7 +616,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs.gtkLibs) gtk; - glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; @@ -894,7 +891,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pango = callPackage ../development/libraries/haskell/pango { inherit (pkgs.gtkLibs) pango; - glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc; }; parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; From 6a73467eac6fe9d37c024b959a9a8a5fde150bcf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 11 Sep 2011 20:48:02 +0000 Subject: [PATCH 296/504] =?UTF-8?q?*=20Chromium=20updated=20to=20the=20lat?= =?UTF-8?q?est=20version.=20=20Because=20Chromium=20now=20used=20=20=20Gol?= =?UTF-8?q?d,=20this=20requires=20a=20new=20patchelf.=20*=20Changed=20the?= =?UTF-8?q?=20package=20name=20from=20=E2=80=98chrome=E2=80=99=20to=20?= =?UTF-8?q?=E2=80=98chromium=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=29197 --- .../networking/browsers/chromium/default.nix | 21 ++++++++++++------- pkgs/development/tools/misc/patchelf/0.6.nix | 10 ++++----- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 74f80ccdab9..bd98d48ffa7 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -2,23 +2,28 @@ , fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11 , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf -, stdenv, unzip, zlib, pam }: +, stdenv, unzip, zlib, pam, pcre }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { - name = "chrome-${version}"; - version = "88807"; + name = "chromium-16.0.879.0-pre${version}"; + + # To determine the latest revision, get + # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’. + # For the version number, see ‘about:config’. + version = "100626"; + src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip"; - sha256 = "c158f58fa8220782ec8dec4170f90c564b978d1c6ead298cc2f67e84613f17b1"; + sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip"; - sha256 = "01sr882c7hr53001p8bnk5vyj8zfjm6r3i4a6wxzxd17xjh1bcxb"; + sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca"; } else throw "Chromium is not supported on this platform."; @@ -31,7 +36,7 @@ stdenv.mkDerivation rec { [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat ffmpeg fontconfig freetype libX11 libXScrnSaver libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg - libpng nspr nss stdenv.gcc.gcc zlib stdenv.gcc.libc + libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango pam ]; @@ -41,6 +46,8 @@ stdenv.mkDerivation rec { ensureDir $out/libexec/chrome cp -R * $out/libexec/chrome + + strip $out/libexec/chrome/chrome ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ @@ -48,7 +55,7 @@ stdenv.mkDerivation rec { $out/libexec/chrome/chrome makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \ - --prefix LD_LIBRARY_PATH : "${nss}/lib" + --prefix LD_LIBRARY_PATH : "${pcre}/lib:${nss}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/patchelf/0.6.nix b/pkgs/development/tools/misc/patchelf/0.6.nix index 68cdf47e48b..5a2a7c1d716 100644 --- a/pkgs/development/tools/misc/patchelf/0.6.nix +++ b/pkgs/development/tools/misc/patchelf/0.6.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "patchelf-0.6pre23458"; - + name = "patchelf-0.6pre29192"; + src = fetchurl { - url = "http://hydra.nixos.org/build/838169/download/2/patchelf-0.6pre23458.tar.bz2"; - sha256 = "18d74n14s4xh8aqwisvz63gx9j4d5b9bzb8k1jnp8whvvwzasdq5"; + url = "http://hydra.nixos.org/build/1319933/download/2/${name}.tar.bz2"; + sha256 = "1873d76994c112355f53d1ac6233ce334d0852ce67cae6b21f492b9b8e0b48b5"; }; meta = { From 4a47336cb5a87c2b1ef045e4d0ad3bca4704b289 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 12 Sep 2011 03:38:12 +0000 Subject: [PATCH 297/504] linux-3.1.nix: Bump to rc5 I wanted to wait for kernel.org to get back up, but there doesn't seem to be any information about when that will be. If you don't trust that this is Torvalds' github, see https://lkml.org/lkml/2011/9/4/92 for how to verify svn path=/nixpkgs/trunk/; revision=29198 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 4f0f6380ae3..8cd5381aec3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -200,13 +200,14 @@ in import ./generic.nix ( rec { - version = "3.1-rc4"; + version = "3.1-rc5"; - modDirVersion = "3.1.0-rc4"; + modDirVersion = "3.1.0-rc5"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.bz2"; - sha256 = "1inb4iyj9r7lk68bw1mznxk726n3cxcbylqnb62ycisi1z2gxwjw"; + url = "https://github.com/torvalds/linux/tarball/v${version}"; + sha256 = "1gs12hnkci1w21wwkpd9985ws6aldki6gzgdi4xmffcr4ypf1j4k"; + name = "v${version}.tar.gz"; }; config = configWithPlatform stdenv.platform; From bc1298e65142ffbd9b2541ec4c84db74d25d1d1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 10:02:03 +0000 Subject: [PATCH 298/504] * Updated nixUnstable. svn path=/nixpkgs/trunk/; revision=29203 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 4011e7a3524..6bc3f33750b 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre29060"; + name = "nix-1.0pre29200"; src = fetchurl { - url = "http://hydra.nixos.org/build/1301810/download/4/${name}.tar.bz2"; - sha256 = "f403213b56acfb2e74ae1e6fd136f3726940f098220d2ae8b46fa54c08f1aad0"; + url = "http://hydra.nixos.org/build/1320284/download/4/${name}.tar.bz2"; + sha256 = "a10f65b52bcf72b9ec7bf5610e16de2d49c1cc4c008bf0a93281e8e2233fa1b1"; }; buildNativeInputs = [ perl pkgconfig ]; From 3e3613c75a4d1cbceafb09a8c97d6ad245243fef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 12:34:06 +0000 Subject: [PATCH 299/504] * Update the oxygen-icons output hash. svn path=/nixpkgs/trunk/; revision=29204 --- pkgs/desktops/kde-4.7/oxygen-icons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix index b8e272c20a2..655aadda48e 100644 --- a/pkgs/desktops/kde-4.7/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.7/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "7d7f352f574f5747f16ac517cbe19d0b011adb74e7a0b791705afb3addac1e96"; + outputHash = "87010a208f6860429d78c0d518a4f70c450b9c199900076d0aa232de8ae6452e"; buildNativeInputs = [ cmake ]; From f16c8d72db0b5c1bbbb19d8a0eb45032abae44f9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 12:40:58 +0000 Subject: [PATCH 300/504] * Remove obsolete file. svn path=/nixpkgs/trunk/; revision=29205 --- pkgs/desktops/kde-4.7/kde-package/4.7.0.nix | 1 - 1 file changed, 1 deletion(-) delete mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.0.nix diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix deleted file mode 100644 index b3192fadb8b..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix +++ /dev/null @@ -1 +0,0 @@ -{stable=true;hashes=builtins.listToAttrs[{name="blinken";value="1g4vpwbal6d7ypmq6l8dh17gi249cd261hsa4bjkvb0wx88i66qr";}{name="cantor";value="0xb4xja9ab4kzgzpikhlkrl68287lqdigvl6pzbh9m6g0ghlp697";}{name="gwenview";value="14a1mjcfcw4nq2c5qkvca8mgdrr31gm24l9nlkcj7p8yrpkxfykh";}{name="kalgebra";value="140528rn3zx489g1lawr1n19i3rrc58h2ii8gh46dnlfcgig13bb";}{name="kalzium";value="1vfa9kdxrdfqqfad0dp2pwi919qs5pbgdk7jmi4dccwlhgmv3226";}{name="kamera";value="02g3mh14rfyrmpa3r8m5pqzxhs4kdb3xvg34434g9r51v3am3ypk";}{name="kanagram";value="04hv13mij4kg8bifs690q4qxr4qk7dnviihlc297x434l0iz2spd";}{name="kate";value="0bd0b354a7cx8cmw2d5pbqn0an38xls86454gclyjd1ilr3l41m9";}{name="kbruch";value="169c6xq0jvp9cv6p9ypk8sryxsh711xdgbs02yiqd476ykavj3jv";}{name="kcolorchooser";value="1f7nj9ccvf1bg3nnm7xchaqvfnskkbnd1h2xd5fxmj9fz1195kqv";}{name="kdeaccessibility";value="01qx0w5dylkbxchj5kg9iawdc0rjbxv1w1dg90ld98fn583g70ws";}{name="kdeadmin";value="1zm6p65wgdn0rv9vzcm89vsiw1696g0bf7kshvwnjmsfc9whsgq3";}{name="kdeartwork";value="12cqpam82k086088i2p1318y1vjr7c8iffppnm6mkbllg2g8ydip";}{name="kde-baseapps";value="0jpi3fjsav52v6ziwdldy03akfpahaagjp3g3m015cmn9bhk2l71";}{name="kdegames";value="1n98jiax7s4m8gb2jq5vdwsg6sfkls7m4mfm627dfsqmvpcgf9k0";}{name="kdegraphics-strigi-analyzer";value="15p0wsiawhygdq9fwp451vcbxbf1sv9pvlwz3x4ma5mp8la7k4vd";}{name="kdegraphics-thumbnailers";value="1gl08an6gzdxvam9fvq5c98zm8m95h6184y0hf0zlqjzkqgg312l";}{name="kdelibs";value="1f0wmcsw0lkfaqdil2yxjfpldr0ckwy5iblkwwaad4n1b4hyssyv";}{name="kdemultimedia";value="0b53vg6gp4qv92w7y721xwbv23bzzljvyl18j05z8ig2l6m57kf5";}{name="kdenetwork";value="1ifg2hxbh80fpszm9r1jzamy65jlkqb6y8fcfa0sngwsklkxn5sh";}{name="kdepim";value="140n4q1rf2jbxmqmkwzam1fipk4k30n3wn9ik8mlqfmxm06dhgqs";}{name="kdepimlibs";value="020irkn43q999idk4kwfi9250fvk98ffi9m998ywgzfl9wps01g0";}{name="kdepim-runtime";value="11ad82hisya8ysx6p1ik6nw1hbyqwksxhimlxcrjkkjh76nphs2g";}{name="kdeplasma-addons";value="1bi7n6lav9z08pvarhsgx9wmm14mr34mvjm4vk9jszrdi7vl2ayj";}{name="kde-runtime";value="1wm91hkj8h1rbavcxwgjfsfrzhr3rs1xd6zf2kxyh1hh9fkdrx3w";}{name="kdesdk";value="04kx9srv8a4z9lic9v3f375rglpz87hhq6wppxksi9qgyc0vzqnv";}{name="kdetoys";value="1ahsk0990a3zx665mjqaljb5w392qkk1pnla5srqg57g62yhig8f";}{name="kdeutils";value="1n031c1i42bq08md156k7fhzw67b28b0a6168m9c9hnhh3483r7l";}{name="kde-wallpapers";value="1xb9k9w479xcwa4caxqn4z1h942lvx7ahy0crxkk41ra3xgw7fg9";}{name="kdewebdev";value="0v8v45rwfldk299ny0jhxqa7xsa1x0ywz7lbqc9i0m3g808ifa29";}{name="kde-workspace";value="0s1l7airb92dd4vprry39nzikarv03qfsmd2j0brif5jjfjd2c3y";}{name="kgamma";value="1xgxnb8x2iy1ikychs8bh5jplkdlk7br6yrmivzrz7s2337dlm35";}{name="kgeography";value="1pm4y5d4d0cl36wgwrkm48yk60m73ljys2awahjsfdpwxs0x42ca";}{name="khangman";value="0ccp1qsji6jjybcbc0rwkw78ypl5kwk1kb74vrnz2ss9anxky2c3";}{name="kig";value="06nk38wg43rxxdzr535vrw4f3d1v9kym5bir6vfpyay8xdxqgf5f";}{name="kimono";value="1p4scmzn0kbkpbrv27658bh56ll9zazaf3rk1p2c6lm6zglvm9gd";}{name="kiten";value="119h7fslp975r0kd7i1zmvhrfrr19rlhm4ni99pd4jxnhz05n47k";}{name="klettres";value="0znca4iqgxlmldyzmd5rf9z2c0jhmmijwxyxaqjffrphq407wms0";}{name="kmplot";value="1zyk3701mhga9d53bm8xyzbw4zn6s9ijfnp0ww2hq9dcm81w12ga";}{name="kolourpaint";value="0ckqz8fmaq92lkaxm87c2nfdjvwp4l310vnicqm2bkkmkma9p6cs";}{name="konsole";value="1apchw8n1k2xyi3h0n3w4fxwy6vx6lxhx7ll3vhfmyl8wa0gzwf5";}{name="korundum";value="1ndhbn6i5napfgp5czsbww1vknss49xhxlj6rn5ci1m5j2zfajic";}{name="kross-interpreters";value="0hzx08r60z9pl7i1hnh6q1zq4s7wmny4015b55prllaa94yb1ya2";}{name="kruler";value="1bydk587las6dx447mihkg7qmn0hn6iis20xfl4wygx7a81imnw3";}{name="ksaneplugin";value="02g4vdgz4k7rahkwss5m1vfv22rzhr6gzmzf79vrbg15mci57jzz";}{name="ksnapshot";value="1dllmx8v2qzkfhy9b3j87yjmkyl3fdkjbmdfqlk5kq2n40k3fha0";}{name="kstars";value="0qgsphimg200kapnjwqh3186z27ypszmhr4knk46jyyczmj2k4nd";}{name="ktouch";value="1w1ps11xazqvvh66v78r714283kd5icvz6dgbh7wfangpqya2g9i";}{name="kturtle";value="0xiz13nb2wgajgm2z105pywi0fcw09appp4k4wbg6nykqdcql0n5";}{name="kwordquiz";value="1rja09mvp7j264ap27m4413dy8l1867ds1w3yizlqlcrl92fby7b";}{name="libkdcraw";value="0dcplib41s5cnv5jjnx2y7d9gd4vls6qlf1vpr1iqsbhrr0az50a";}{name="libkdeedu";value="0nq2b4l5134lkyv0vzfqpp5w7vbr0b6lg88xyjlpih6n9bywiv16";}{name="libkexiv2";value="1fgawizv09vv0almb05sf5f93iqsp3w8x9nx4p9hys66qiz8n467";}{name="libkipi";value="09gpjx4vyncf6js79jf7w4w55lgnzawii40ar7ssrhnxspckbdn0";}{name="libksane";value="1ffwz2g4y12fg8pckz1a0qizziljv17zbn7g1vjf30pw8dpk0x12";}{name="marble";value="0x5yhs28g0z1s9qjmgkdidfp0hmy526l9cmqjccaqn7a61ziv0qz";}{name="mobipocket";value="06qh1xdijc4fscpbxfc7f6mmy1dkxvhx7sb4fmhk2m3z569ir2jx";}{name="okular";value="016xa6i0n1nyq1h9z8nhwc9br9k09l0c2gxhzfd9g6nf528zlbdf";}{name="oxygen-icons";value="1a4dkhay0qrbz9gz2xx3d7vbk18qyjrx9hxgdazjxr35ba6xipgc";}{name="parley";value="0zkj272wrih66mcpr27am9qnp3ab4275is06c8h6hzf5wmfq6sib";}{name="perlkde";value="0pp8ljvck68b45yxhknmyn8z1a1xnq3ahcpz8m6pfch77hlg7fhj";}{name="perlqt";value="0sw1dpxshmmdvp93x59wclslm5xza0yy0f8nmqgdns8c77g0b3k8";}{name="pykde4";value="1mdq474f4jj637k0a9jpb2vcvq4f90vwrhgjs7mqqwmvkh6vv6h0";}{name="qtruby";value="1h7m17d36y5vgaxcqwa814yxmsx19v0xh9m83cq1zznxl62sbmh1";}{name="qyoto";value="1lbdv00hd0s0m5ywjnb52wgz3hb5nx45kwpjkjrjcj1jg76rvk72";}{name="rocs";value="1ma5ylc4rvzjrn1l8rv8684map78zk73fa1a3iz996z1c5fg09wm";}{name="smokegen";value="1g05if9k9ichxlrfly5lha6n2mcihbaz681yg14cjj806s0qs53l";}{name="smokekde";value="0b8kx8a3990l6f7pf252diz7b50r81kxkhigkzkc9lzq833a2siq";}{name="smokeqt";value="0cgjdh9dr4pn1yh423mhifv2yvd283k2mhwkmfn2i0398h71a252";}{name="step";value="1pg7k60rbvr6nfq47xnj98w121703s79z8rap601xrmb8wyfhmyy";}{name="svgpart";value="0xyp4sibcdjxq2ny348m4z95bh71r3q3pm8xfwb1j50my9g8ijir";}];modules=[{module="kdegraphics";split=true;pkgs=[{name="gwenview";}{name="kamera";}{name="kcolorchooser";}{name="kdegraphics-strigi-analyzer";sane="kdegraphics_strigi_analyzer";}{name="kdegraphics-thumbnailers";sane="kdegraphics_thumbnailers";}{name="kgamma";}{name="kolourpaint";}{name="kruler";}{name="ksaneplugin";}{name="ksnapshot";}{name="libkdcraw";}{name="libkexiv2";}{name="libkipi";}{name="libksane";}{name="mobipocket";}{name="okular";}{name="svgpart";}];}{module="kdebase";split=true;pkgs=[{name="kate";}{name="kde-baseapps";sane="kde_baseapps";}{name="kde-runtime";sane="kde_runtime";}{name="kde-workspace";sane="kde_workspace";}{name="konsole";}];}{module="kdeedu";split=true;pkgs=[{name="blinken";}{name="cantor";}{name="kalgebra";}{name="kalzium";}{name="kanagram";}{name="kbruch";}{name="kgeography";}{name="khangman";}{name="kig";}{name="kiten";}{name="klettres";}{name="kmplot";}{name="kstars";}{name="ktouch";}{name="kturtle";}{name="kwordquiz";}{name="libkdeedu";}{name="marble";}{name="parley";}{name="rocs";}{name="step";}];}{module="kdebindings";split=true;pkgs=[{name="kimono";}{name="korundum";}{name="kross-interpreters";sane="kross_interpreters";}{name="perlkde";}{name="perlqt";}{name="pykde4";}{name="qtruby";}{name="qyoto";}{name="smokegen";}{name="smokekde";}{name="smokeqt";}];}{module="kdeaccessibility";split=false;pkgs=[{name="kaccessible";}{name="kmag";}{name="kmouth";}{name="kmousetool";}{name="jovie";}];}{module="kdeadmin";split=false;pkgs=[{name="strigi-analyzer";sane="strigi_analyzer";}{name="kuser";}{name="kcron";}{name="ksystemlog";}{name="system-config-printer-kde";sane="system_config_printer_kde";}];}{module="kdeartwork";split=false;pkgs=[{name="ColorSchemes";}{name="IconThemes";}{name="emoticons";}{name="kscreensaver";}{name="kwin-styles";sane="kwin_styles";}{name="sounds";}{name="styles";}{name="wallpapers";}{name="HighResolutionWallpapers";}{name="WeatherWallpapers";}{name="desktopthemes";}{name="aurorae";}];}{module="kdegames";split=false;}{module="kdelibs";split=false;}{module="kdemultimedia";split=false;}{module="kdenetwork";split=false;pkgs=[{name="kfile-plugins";sane="kfile_plugins";}{name="kget";}{name="kopete";}{name="krdc";}{name="kppp";}{name="krfb";}{name="kdnssd";}{name="filesharing";}];}{module="kdepim";split=false;}{module="kdepimlibs";split=false;}{module="kdepim-runtime";sane="kdepim_runtime";split=false;}{module="kdeplasma-addons";sane="kdeplasma_addons";split=false;}{module="kdesdk";split=false;pkgs=[{name="cervisia";}{name="lokalize";}{name="kdeaccounts-plugin";sane="kdeaccounts_plugin";}{name="dolphin-plugins-svn";sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn";}{name="dolphin-plugins-git";sane="dolphin_plugins_git";subdir="dolphin-plugins/git";}{name="kcachegrind";}{name="kapptemplate";}{name="kpartloader";}{name="strigi-analyzer";sane="strigi_analyzer";}{name="kioslave";}{name="okteta";}{name="kmtrace";}{name="kompare";}{name="kprofilemethod";}{name="kstartperf";}{name="kuiviewer";}{name="poxml";}{name="scripts";}{name="umbrello";}];}{module="kdetoys";split=false;pkgs=[{name="kteatime";}{name="ktux";}{name="amor";}];}{module="kdeutils";split=false;pkgs=[{name="ark";}{name="kcalc";}{name="kremotecontrol";}{name="kdf";}{name="kfloppy";}{name="printer-applet";sane="printer_applet";}{name="filelight";}{name="kcharselect";}{name="kgpg";}{name="ktimer";}{name="kwallet";}{name="sweeper";}{name="superkaramba";}];}{module="kde-wallpapers";sane="kde_wallpapers";split=false;}{module="kdewebdev";split=false;pkgs=[{name="klinkstatus";}{name="kfilereplace";}{name="kimagemapeditor";}{name="kommander";}];}{module="oxygen-icons";sane="oxygen_icons";split=false;}];} \ No newline at end of file From 74e4d96e7e85539a8b075518678543f68b76b906 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 12:45:59 +0000 Subject: [PATCH 301/504] * Remove the kde_baseapps wrapper because 1) It broke the Gwenview build (it ended up depending on the wrapper). 2) It's confusing to have two identically named packages. 3) If upstream's kde_baseapps doesn't include Konsole and Kate, then why should ours? svn path=/nixpkgs/trunk/; revision=29206 --- pkgs/desktops/kde-4.7/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 5b677dd13d4..9d6981f1168 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -49,11 +49,6 @@ kde.modules // kde.individual // kdebase_workspace = kde.modules.kde_workspace; - kde_baseapps = kde.modules.kde_baseapps // { - inherit (kde.individual) kate konsole; - propagatedUserEnvPackages = [ kde.individual.kate kde.individual.konsole ]; - }; - inherit release; full = stdenv.lib.attrValues kde.modules; From 41d9959ed3e96d09c58cc48bc7de14e7079dace0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 13:02:54 +0000 Subject: [PATCH 302/504] * Better description. svn path=/nixpkgs/trunk/; revision=29207 --- pkgs/development/compilers/adobe-flex-sdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index 779aa48c2d0..190da872278 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "flex sdk flash / action script developement kit"; + description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; license = "MPLv1.1"; # Mozilla Public License Version 1.1 }; From 3e54387efd6b65f592abf24e55fb99d6a3ef9cde Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 16:09:00 +0000 Subject: [PATCH 303/504] * Added OpenSSL 1.0.0e (not updating the default yet because a lot depends on it). Also, install the manpages in $out/share/man rather than $out/ssl/man. svn path=/nixpkgs/trunk/; revision=29208 --- pkgs/development/libraries/openssl/1.0.0e.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/openssl/1.0.0e.nix diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix new file mode 100644 index 00000000000..e1a550dc525 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.0.0e.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, perl }: + +let + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] + (throw "openssl needs its platform name cross building" null) + stdenv.cross; +in + +stdenv.mkDerivation rec { + name = "openssl-1.0.0e"; + + src = fetchurl { + url = "http://www.openssl.org/source/${name}.tar.gz"; + sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3"; + }; + + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; + + buildNativeInputs = [ perl ]; + + # On x86_64-darwin, "./config" misdetects the system as + # "darwin-i386-cc". So specify the system type explicitly. + configureScript = + if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; + + configureFlags = "shared --libdir=lib"; + + makeFlags = "MANDIR=$(out)/share/man"; + + postInstall = + '' + # If we're building dynamic libraries, then don't install static + # libraries. + if [ -n "$(echo $out/lib/*.so)" ]; then + rm $out/lib/*.a + fi + ''; # */ + + crossAttrs = { + preConfigure='' + # It's configure does not like --build or --host + export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" + ''; + + postInstall = '' + # Openssl installs readonly files, which otherwise we can't strip. + # This could at some stdenv hash change be put out of crossAttrs, too + chmod -R +w $out + + # Remove references to perl, to avoid depending on it at runtime + rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget + ''; + configureScript = "./Configure"; + }; + + meta = { + homepage = http://www.openssl.org/; + description = "A cryptographic library that implements the SSL and TLS protocols"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb7db6f7343..0485e621d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4253,6 +4253,8 @@ let fetchurl = fetchurlBoot; }; + opensslNew = callPackage ../development/libraries/openssl/1.0.0e.nix { }; + ortp = callPackage ../development/libraries/ortp { }; pangoxsl = callPackage ../development/libraries/pangoxsl { From 3ac8f8c89271ff5ad02b03f4ec9182e0f04b8ed1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:08 +0000 Subject: [PATCH 304/504] haskell-snap-core: updated to version 0.5.4 svn path=/nixpkgs/trunk/; revision=29209 --- pkgs/development/libraries/haskell/snap/core.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 4cc036ef080..5baa0c9d82b 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.5.3.1"; - sha256 = "0qwlcak1hi4cqyhnks7qqf4zq0rw2486paf0mlasyzb6ba0pwl6m"; + version = "0.5.4"; + sha256 = "0v6lsb60s3w96rqpp9ky8nd660zja8asw02vx1562nvd19k65jbb"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder bytestringMmap bytestringNums caseInsensitive deepseq dlist enumerator diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 934ec4c0b69..7aea4664ef4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1030,9 +1030,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; - snapCore = callPackage ../development/libraries/haskell/snap/core.nix { - caseInsensitive = self.caseInsensitive_0_3; - }; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; snapServer = callPackage ../development/libraries/haskell/snap/server.nix { vectorAlgorithms = self.vectorAlgorithms_0_4; From d1219f3e3aa9f123d4071bb785d7766189e3904b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:13 +0000 Subject: [PATCH 305/504] haskell-snap-server: updated to version 0.5.4 svn path=/nixpkgs/trunk/; revision=29210 --- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 474719a90a9..c2c1fcddbf1 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.5.3.1"; - sha256 = "0rbfklgngrpp2aggkmyamfxn9hpnz3bsxd58lw0fi4ls76bagxvz"; + version = "0.5.4"; + sha256 = "1kzhmn8pg2lzpqz6319lcy5lk27jcl7jlxq96x1bhnxss8k0idix"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7aea4664ef4..3c89fe73e90 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1032,10 +1032,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; - snapServer = callPackage ../development/libraries/haskell/snap/server.nix { - vectorAlgorithms = self.vectorAlgorithms_0_4; - caseInsensitive = self.caseInsensitive_0_3; - }; + snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; stateref = callPackage ../development/libraries/haskell/stateref {}; From 107201f99f216f16013ee38ed9b2bc3cee3cc05b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:18 +0000 Subject: [PATCH 306/504] haskell-case-insensitive: dropped obsolete version 0.3 svn path=/nixpkgs/trunk/; revision=29211 --- .../libraries/haskell/case-insensitive/0.3.nix | 17 ----------------- .../{0.3.0.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/case-insensitive/0.3.nix rename pkgs/development/libraries/haskell/case-insensitive/{0.3.0.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/case-insensitive/0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/0.3.nix deleted file mode 100644 index 6a59c9e840b..00000000000 --- a/pkgs/development/libraries/haskell/case-insensitive/0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, hashable, text }: - -cabal.mkDerivation (self: { - pname = "case-insensitive"; - version = "0.3"; - sha256 = "0k3y09ak4k0jwx7bh5awcznw064xgf6yzidq3jalif7m3c9bv5q7"; - buildDepends = [ hashable text ]; - meta = { - description = "Case insensitive string comparison"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/case-insensitive/0.3.0.1.nix rename to pkgs/development/libraries/haskell/case-insensitive/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3c89fe73e90..edd20a600cf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -436,9 +436,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (pkgs) cairo zlib; }; - caseInsensitive_0_3 = callPackage ../development/libraries/haskell/case-insensitive/0.3.nix {}; - caseInsensitive_0_3_0_1 = callPackage ../development/libraries/haskell/case-insensitive/0.3.0.1.nix {}; - caseInsensitive = self.caseInsensitive_0_3_0_1; + caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {}; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; From 20c7526891b0f3f89a59b0dea2e086ad9950751c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:23 +0000 Subject: [PATCH 307/504] haskell-vector-algorithms: dropped obsolete version 0.4 svn path=/nixpkgs/trunk/; revision=29212 --- .../haskell/vector-algorithms/0.4.nix | 18 ------------------ .../{0.5.3.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/vector-algorithms/0.4.nix rename pkgs/development/libraries/haskell/vector-algorithms/{0.5.3.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/0.4.nix b/pkgs/development/libraries/haskell/vector-algorithms/0.4.nix deleted file mode 100644 index c8b11755420..00000000000 --- a/pkgs/development/libraries/haskell/vector-algorithms/0.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, primitive, vector }: - -cabal.mkDerivation (self: { - pname = "vector-algorithms"; - version = "0.4"; - sha256 = "04ig2bx3gm42mwhcz5n8kp9sy33d1hrwm940kfxny74fc06422h8"; - buildDepends = [ primitive vector ]; - meta = { - homepage = "http://code.haskell.org/~dolio/"; - description = "Efficient algorithms for vector arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/vector-algorithms/0.5.3.nix rename to pkgs/development/libraries/haskell/vector-algorithms/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index edd20a600cf..3a2e35129a4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1196,9 +1196,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; vector = self.vector_0_7_1; - vectorAlgorithms_0_4 = callPackage ../development/libraries/haskell/vector-algorithms/0.4.nix {}; - vectorAlgorithms_0_5_3 = callPackage ../development/libraries/haskell/vector-algorithms/0.5.3.nix {}; - vectorAlgorithms = self.vectorAlgorithms_0_5_3; + vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; From 775896c15ff0f0938d86b9ac15ce7a559b54b935 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:27 +0000 Subject: [PATCH 308/504] haskell-epic: updated to version 0.1.13 svn path=/nixpkgs/trunk/; revision=29213 --- pkgs/development/compilers/epic/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 936710888ee..b4a53df9433 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -2,14 +2,13 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.1.11"; - sha256 = "12dz1wjaf3n8fqk46vhpnxq9z633wi6wyihcmif7amxmqv3l8zn9"; + version = "0.1.13"; + sha256 = "00rdprgndrvssrjlp6jh5jak2rxq6bcd2dknldx6i8h1cq6i69rb"; isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; - noHaddock = true; meta = { homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php"; description = "Compiler for a simple functional language"; From 744450f9c4619401ce567c33ec0e0dea96131dad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:31 +0000 Subject: [PATCH 309/504] haskell-yesod: updated to version 0.9.2.1 svn path=/nixpkgs/trunk/; revision=29214 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 02162fade6f..3221d003d5c 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.2"; - sha256 = "1074vbrab8c0nrmkv1fn4rm65fyfw08b3mj498cxala3nm382whd"; + version = "0.9.2.1"; + sha256 = "08mnybxdcswhxc1gqgjsy1mx43cp6b78javjcqgbrsfd8f4h9xzq"; isLibrary = true; isExecutable = true; buildDepends = [ From f0e8a10ff485ad2abeabb5b4a4158221cf572b5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:35 +0000 Subject: [PATCH 310/504] haskell-cairo: updated to version 0.12.1 svn path=/nixpkgs/trunk/; revision=29215 --- pkgs/development/libraries/haskell/cairo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 24f2319c842..aa7fae51544 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,15 +1,15 @@ -{ cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }: +{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib }: cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.0"; - sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9"; + version = "0.12.1"; + sha256 = "0krclr32cn3vq3cmwhmxz7wzams92iliq44p6s4nj9jg4928cgfk"; buildDepends = [ mtl ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ]; + extraLibraries = [ cairo libc pkgconfig zlib ]; pkgconfigDepends = [ cairo ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Cairo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From c59d360c6a772ee5b9e58888116a0ca983ddc253 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:39 +0000 Subject: [PATCH 311/504] haskell-glade: updated to version 0.12.1 svn path=/nixpkgs/trunk/; revision=29216 --- .../libraries/haskell/glade/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index 8f43af57b8d..f1bae4ad9fe 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -1,17 +1,17 @@ -{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, gtkC, libglade -, mtl, pango, pkgconfig +{ cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade +, pkgconfig }: cabal.mkDerivation (self: { pname = "glade"; - version = "0.12.0"; - sha256 = "0h7l1kp9y17xqyz16kv0dvwgblph9r70wimyl8aq9gi1r4is5lmq"; - buildDepends = [ cairo glib gtk mtl pango ]; + version = "0.12.1"; + sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990"; + buildDepends = [ glib gtk ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ glibc pkgconfig ]; + extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ gtkC libglade ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the glade library"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; From 2f28f479979b360b3e53f439880f83c9e6207779 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:47 +0000 Subject: [PATCH 312/504] haskell-glib: updated to version 0.12.1 svn path=/nixpkgs/trunk/; revision=29217 --- pkgs/development/libraries/haskell/glib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 6c685812846..445f7122809 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -1,14 +1,14 @@ -{ cabal, glib, gtk2hsBuildtools, pkgconfig }: +{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig }: cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.0"; - sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19"; + version = "0.12.1"; + sha256 = "0lsgpbd08w64npc0xsnxg8n4vj2hdnjvs55h4lhgc61p05q9gv52"; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ self.stdenv.gcc.libc pkgconfig ]; + extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GLIB library for Gtk2Hs"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; From 676a2a355ee41aaba20432f68558a1ff8edd4d1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:51 +0000 Subject: [PATCH 313/504] haskell-gtk: updated to version 0.12.1 svn path=/nixpkgs/trunk/; revision=29218 --- pkgs/development/libraries/haskell/gtk/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 41b72975eb1..e3fac24865b 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -1,17 +1,17 @@ -{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango +{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango , pkgconfig }: cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.0"; - sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2"; + version = "0.12.1"; + sha256 = "007wxxff2ibfi3848yjxg7hqgpiqpn0zpyivjvjv0zphk1d2j9sv"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ self.stdenv.gcc.libc pkgconfig ]; + extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib gtk ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; From dc0a01018e4e7d21d4877151b8cd39f4c2dc8140 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:45:57 +0000 Subject: [PATCH 314/504] haskell-gtk2hs-buildtools: updated to version 0.12.1 svn path=/nixpkgs/trunk/; revision=29219 --- .../libraries/haskell/gtk2hs-buildtools/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 9b0fe07653c..036067ec1aa 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -1,14 +1,15 @@ -{ cabal, alex, happy }: +{ cabal, alex, happy, random }: cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.12.0"; - sha256 = "1czlmyr9zhzc0h1j0z3chv06ma77cibq2yc6h1slfphb1lkv66a8"; + version = "0.12.1"; + sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl"; isLibrary = false; isExecutable = true; + buildDepends = [ random ]; buildTools = [ alex happy ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; From a69572d3a5807dd571f131c94632118fb47d5551 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:46:02 +0000 Subject: [PATCH 315/504] haskell-gtksourceview2: updated to version 0.12.3 svn path=/nixpkgs/trunk/; revision=29220 --- .../libraries/haskell/gtksourceview2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 6f69696d1f4..7ab1b1eda71 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -1,17 +1,17 @@ -{ cabal, glib, glibc, gtk, gtk2hsBuildtools, gtksourceview, mtl +{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl , pkgconfig }: cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.12.2"; - sha256 = "0l9y48kmzqzps6k54fgf0dkmmv0ppxx8amggfdswwk86zsf8j81r"; + version = "0.12.3"; + sha256 = "0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd"; buildDepends = [ glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ glibc pkgconfig ]; + extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ gtksourceview ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; From 7c6aa89222d836cd0f2cb78c462b03034c44ea65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:46:06 +0000 Subject: [PATCH 316/504] haskell-pango: updated to version 0.12.1 svn path=/nixpkgs/trunk/; revision=29221 --- pkgs/development/libraries/haskell/pango/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 7e1f3c933ba..2bf090ab746 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -1,17 +1,16 @@ -{ cabal, cairo, glib, gtk2hsBuildtools, mtl, pango -, pkgconfig +{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig }: cabal.mkDerivation (self: { pname = "pango"; - version = "0.12.0"; - sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb"; + version = "0.12.1"; + sha256 = "0bfwgz2wx0hw9lrf9fdc0pic7xjkiqnv1wr1lfp55gm2qhakz83w"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ self.stdenv.gcc.libc pkgconfig ]; + extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ cairo pango ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; From 631772e028243b464b2d391edc8cb11cee9a528e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:46:10 +0000 Subject: [PATCH 317/504] haskell-svgcairo: updated to version 0.12.1 svn path=/nixpkgs/trunk/; revision=29222 --- .../libraries/haskell/svgcairo/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 007b17507bf..9d1ae862ee1 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -1,15 +1,15 @@ -{ cabal, cairo, glib, glibc, gtk2hsBuildtools, librsvg, mtl }: +{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }: cabal.mkDerivation (self: { pname = "svgcairo"; - version = "0.12.0"; - sha256 = "1zialw59njmq0sfz9f0rx6v50d4bvld2ivmwljkp5bmxii3hcjl3"; + version = "0.12.1"; + sha256 = "1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ glibc ]; - pkgconfigDepends = [ cairo librsvg ]; + extraLibraries = [ libc ]; + pkgconfigDepends = [ librsvg ]; meta = { - homepage = "http://www.haskell.org/gtk2hs/"; + homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the libsvg-cairo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From c88d870123678cd122a54ce64de75367d8b003aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 16:46:14 +0000 Subject: [PATCH 318/504] Haskell packages that require access to libc (for , etc.) consistently depend on the (non-existent) attribute 'libc'. That dependency is then fulfilled by defining libc = pkgs.stdenv.gcc.libc; in haskell-packages.nix where appropriate. On platforms impure platforms, such as Darwin, that attribute evaluates to 'null'. svn path=/nixpkgs/trunk/; revision=29223 --- pkgs/top-level/haskell-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3a2e35129a4..2841a2bf271 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -434,6 +434,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cairo = callPackage ../development/libraries/haskell/cairo { inherit (pkgs) cairo zlib; + libc = pkgs.stdenv.gcc.libc; }; caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {}; @@ -595,10 +596,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs.gnome) libglade; gtkC = pkgs.gnome.gtk; + libc = pkgs.stdenv.gcc.libc; }; glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; + libc = pkgs.stdenv.gcc.libc; }; GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; @@ -614,6 +617,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs.gtkLibs) gtk; + libc = pkgs.stdenv.gcc.libc; }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; @@ -621,6 +625,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { inherit (pkgs.gnome) gtksourceview; + libc = pkgs.stdenv.gcc.libc; }; Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {}; @@ -889,6 +894,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pango = callPackage ../development/libraries/haskell/pango { inherit (pkgs.gtkLibs) pango; + libc = pkgs.stdenv.gcc.libc; }; parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; @@ -1097,7 +1103,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {}; - svgcairo = callPackage ../development/libraries/haskell/svgcairo {}; + svgcairo = callPackage ../development/libraries/haskell/svgcairo { + libc = pkgs.stdenv.gcc.libc; + }; systemFilepath = callPackage ../development/libraries/haskell/system-filepath {}; From 17925a9d3ce0d83d3b4eba3b2b9bc4280408d772 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Sep 2011 16:57:34 +0000 Subject: [PATCH 319/504] =?UTF-8?q?*=20OpenSSL:=20Allow=20the=20location?= =?UTF-8?q?=20of=20the=20X509=20certificate=20file=20(the=20CA=20=20=20bun?= =?UTF-8?q?dle)=20to=20be=20set=20through=20the=20environment=20variable?= =?UTF-8?q?=20=20=20=E2=80=98OPENSSL=5FX509=5FCERT=5FFILE=E2=80=99.=20=20T?= =?UTF-8?q?his=20is=20necessary=20because=20the=20default=20=20=20location?= =?UTF-8?q?=20($out/ssl/cert.pem)=20doesn't=20exist,=20and=20hardcoding=20?= =?UTF-8?q?something=20=20=20like=20/etc/ssl/cert.pem=20is=20impure=20and?= =?UTF-8?q?=20cannot=20be=20overriden=20=20=20per-process.=20=20For=20secu?= =?UTF-8?q?rity,=20the=20environment=20variable=20is=20ignored=20for=20=20?= =?UTF-8?q?=20setuid=20binaries.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=29224 --- pkgs/development/libraries/openssl/1.0.0e.nix | 12 ++++++- .../libraries/openssl/cert-file.patch | 35 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/openssl/cert-file.patch diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix index e1a550dc525..b1e1c3aa1d0 100644 --- a/pkgs/development/libraries/openssl/1.0.0e.nix +++ b/pkgs/development/libraries/openssl/1.0.0e.nix @@ -14,7 +14,17 @@ stdenv.mkDerivation rec { sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; + patches = + [ # Allow the location of the X509 certificate file (the CA + # bundle) to be set through the environment variable + # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the + # default location ($out/ssl/cert.pem) doesn't exist, and + # hardcoding something like /etc/ssl/cert.pem is impure and + # cannot be overriden per-process. For security, the + # environment variable is ignored for setuid binaries. + ./cert-file.patch + ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch new file mode 100644 index 00000000000..6b7a60e9026 --- /dev/null +++ b/pkgs/development/libraries/openssl/cert-file.patch @@ -0,0 +1,35 @@ +diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypto/x509/x509_def.c +--- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.000000000 +0200 ++++ openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609 +0200 +@@ -57,6 +57,10 @@ + */ + + #include ++#include ++#include ++#include ++#include + #include "cryptlib.h" + #include + #include +@@ -71,7 +75,19 @@ + { return(X509_CERT_DIR); } + + const char *X509_get_default_cert_file(void) +- { return(X509_CERT_FILE); } ++ { ++ static char buf[PATH_MAX] = X509_CERT_FILE; ++ static int init = 0; ++ if (!init) { ++ init = 1; ++ char * s = getenv("OPENSSL_X509_CERT_FILE"); ++ if (s && getuid() == geteuid()) { ++ strncpy(buf, s, sizeof(buf)); ++ buf[sizeof(buf) - 1] = 0; ++ } ++ } ++ return buf; ++ } + + const char *X509_get_default_cert_dir_env(void) + { return(X509_CERT_DIR_EVP); } From 7bc8c122bd68f8fca494f6b72f1d1528646aca65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 17:31:11 +0000 Subject: [PATCH 320/504] bash-completion: fixed hard-coded reference to /etc svn path=/nixpkgs/trunk/; revision=29226 --- pkgs/shells/bash-completion/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 0cda358b8ef..916c7600dfd 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation { postInstall = '' rm $out/etc/profile.d/bash_completion.sh rmdir $out/etc/profile.d + sed -i -e "s|/etc/bash_completion|$out/etc/bash_completion|g" $out/etc/bash_completion ''; meta = { From 93955eabc50033ae944536b767a6912d36e7c164 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Sep 2011 17:31:15 +0000 Subject: [PATCH 321/504] haskell-cabal2nix: updated to version 1.15 svn path=/nixpkgs/trunk/; revision=29227 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 5ec64e2e059..e2da82d36c7 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.14"; - sha256 = "0sdim1yqxx2wplfz6skz78y5lmh6dknc1k7jszmjnq0n9yc0b4bf"; + version = "1.15"; + sha256 = "0v2xnr8fp0bpv4cmd4q01p293zz4zg9kvhd4sr9ar3amj9vjhsk7"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From 37651d0e68cf35d3bd7cc10c7f0ebd146eed80e0 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 12 Sep 2011 18:46:21 +0000 Subject: [PATCH 322/504] Fix kremotecontrol build. svn path=/nixpkgs/trunk/; revision=29229 --- pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix index 70311a789f9..fef516e478d 100644 --- a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix +++ b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libXtst }: +{ kde, kdelibs, kde_workspace, libXtst }: kde { - buildInputs = [ kdelibs libXtst ]; + buildInputs = [ kdelibs kde_workspace libXtst ]; meta = { description = "KDE remote control"; From f00f3ef88d6a533e7dd022bc4221e8dddd05eae3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 12 Sep 2011 20:50:07 +0000 Subject: [PATCH 323/504] Fix disser build svn path=/nixpkgs/trunk/; revision=29230 --- pkgs/misc/tex/disser/default.nix | 56 ++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/misc/tex/disser/default.nix diff --git a/pkgs/misc/tex/disser/default.nix b/pkgs/misc/tex/disser/default.nix new file mode 100644 index 00000000000..eee695ea3e9 --- /dev/null +++ b/pkgs/misc/tex/disser/default.nix @@ -0,0 +1,56 @@ +x@{builderDefsPackage + , unzip, texLive, texLiveCMSuper, texLiveAggregationFun + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + ["texLive" "texLiveCMSuper" "texLiveAggregationFun"]; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)) + ++ [(a.texLiveAggregationFun {paths=[a.texLive a.texLiveCMSuper];})]; + sourceInfo = rec { + baseName="disser"; + version="1.1.8"; + name="${baseName}-${version}"; + project="${baseName}"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.zip"; + hash="15509hfcvkk5kfcza149c74qpamwgw88dg0ra749axs8xj8qmlw8"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["setVars" "doMakeInstall"]; + + setVars = a.noDepEntry '' + export HOME="$TMPDIR" + ''; + + makeFlags = ["DESTDIR=$out/share/texmf-dist"]; + + meta = { + description = "Russian PhD thesis LaTeX package"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; # platform-independent + license = "free"; # LaTeX Project Public License + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/disser/files/disser/"; + }; + }; +}) x + From f75f1871d7e56ffd36908a6a53fd1478030ba221 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 12 Sep 2011 20:50:32 +0000 Subject: [PATCH 324/504] all-packages.nix entry for disser svn path=/nixpkgs/trunk/; revision=29231 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0485e621d96..be80f131d60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8389,6 +8389,8 @@ let texLiveAggregationFun = (builderDefsPackage (import ../misc/tex/texlive/aggregate.nix)); + texDisser = callPackage ../misc/tex/disser {}; + texLiveContext = builderDefsPackage (import ../misc/tex/texlive/context.nix) { inherit texLive; }; From 610d109f751b93ecb14ed7df1612ba804340cfcd Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2011 12:17:04 +0000 Subject: [PATCH 325/504] Initial implementation of a main class wrapper which resolves runtime dependencies automatically svn path=/nixpkgs/trunk/; revision=29235 --- .../dotnetenv/build-solution.nix | 55 +++++++++++++------ pkgs/build-support/dotnetenv/default.nix | 2 +- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 65e4ca71475..da2097d9d52 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -7,18 +7,55 @@ , verbosity ? "detailed" , options ? "/p:Configuration=Debug;Platform=Win32" , assemblyInputs ? [] -, runtimeAssemblies ? [] , preBuild ? "" +, wrapMain ? false +, namespace ? null +, mainClassName ? null +, mainClassFile ? null }: +assert wrapMain -> namespace != null && mainClassName != null && mainClassFile != null; + +let + wrapperCS = ./Wrapper.cs.in; +in stdenv.mkDerivation { - inherit name src preBuild; + inherit name src; buildInputs = [ dotnetfx ]; + preConfigure = '' cd ${baseDir} ''; + preBuild = '' + ${preBuild} + + # Create wrapper class with main method + ${stdenv.lib.optionalString wrapMain '' + # Generate assemblySearchPaths string array contents + for path in ${toString assemblyInputs} + do + assemblySearchArray="$assemblySearchPaths @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\"" + done + + sed -e "s|@NAMESPACE@|${namespace}|" \ + -e "s|@MAINCLASSNAME@|${mainClassName}|" \ + -e "s|@ASSEMBLYSEARCHPATHS@|$assemblySearchArray|" \ + ${wrapperCS} > $(dirname ${mainClassFile})/${mainClassName}Wrapper.cs + + # Rename old main method and make it publically accessible + # so that the wrapper can invoke it + sed -i -e "s|static void Main|public static void Main2|g" ${mainClassFile} + + # Add the wrapper to the C# project file so that will be build as well + find . -name \*.csproj | while read file + do + sed -i -e "s|$(basename ${mainClassFile})|$(basename ${mainClassFile});${mainClassName}Wrapper.cs|" "$file" + done + ''} + ''; + installPhase = '' for i in ${toString assemblyInputs} do @@ -43,19 +80,5 @@ stdenv.mkDerivation { ensureDir $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} - - # Create references to runtime dependencies - # !!! Should be more efficient (e.g. symlinking) - - for i in ${toString runtimeAssemblies} - do - cd $i - - for j in $(find . -type f) - do - mkdir -p $out/$(dirname $j) - cp $j $out/$(dirname $j) - done - done ''; } diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix index 577a7a3b5e8..2389a479029 100644 --- a/pkgs/build-support/dotnetenv/default.nix +++ b/pkgs/build-support/dotnetenv/default.nix @@ -5,6 +5,6 @@ inherit stdenv; dotnetfx = dotnetfx.pkg; }; - + inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path; } From 89cf1d4b9bdccf1f74e0229b2a8b85f8a6a39400 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2011 12:17:28 +0000 Subject: [PATCH 326/504] Oops: forgot to include the wrapper class svn path=/nixpkgs/trunk/; revision=29236 --- pkgs/build-support/dotnetenv/Wrapper.cs.in | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 pkgs/build-support/dotnetenv/Wrapper.cs.in diff --git a/pkgs/build-support/dotnetenv/Wrapper.cs.in b/pkgs/build-support/dotnetenv/Wrapper.cs.in new file mode 100755 index 00000000000..1c70946d06f --- /dev/null +++ b/pkgs/build-support/dotnetenv/Wrapper.cs.in @@ -0,0 +1,64 @@ +using System; +using System.Reflection; +using System.IO; + +namespace @NAMESPACE@ +{ + class @MAINCLASSNAME@Wrapper + { + private String[] AssemblySearchPaths = { @ASSEMBLYSEARCHPATHS@ }; + + public @MAINCLASSNAME@Wrapper() + { + AppDomain currentDomain = AppDomain.CurrentDomain; + currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler); + } + + static void Main(string[] args) + { + // Initialise the wrapper so that the missing library assemblies are loaded + new @MAINCLASSNAME@Wrapper(); + + // Call the original main method + @MAINCLASSNAME@.Main2(args); + } + + private Assembly MyResolveEventHandler(object sender, ResolveEventArgs args) + { + //This handler is called only when the common language runtime tries to bind to the assembly and fails. + + //Retrieve the list of referenced assemblies in an array of AssemblyName. + Assembly MyAssembly, executingAssemblies; + string assemblyPath = ""; + + executingAssemblies = Assembly.GetExecutingAssembly(); + AssemblyName[] referencedAssemblies = executingAssemblies.GetReferencedAssemblies(); + + //Loop through the array of referenced assembly names. + foreach (AssemblyName assemblyName in referencedAssemblies) + { + //Check for the assembly names that have raised the "AssemblyResolve" event. + if (assemblyName.FullName.Substring(0, assemblyName.FullName.IndexOf(",")) == args.Name.Substring(0, args.Name.IndexOf(","))) + { + //Retrieve the name of the assembly from where it has to be loaded. + String dllName = args.Name.Substring(0, args.Name.IndexOf(",")) + ".dll"; + + //Search for the right path of the library assembly + foreach (String currentAssemblyPath in AssemblySearchPaths) + { + assemblyPath = currentAssemblyPath + "/" + dllName; + if (File.Exists(assemblyPath)) + break; + } + } + } + + //Load the assembly from the specified path. + MyAssembly = Assembly.LoadFrom(assemblyPath); + + //Return the loaded assembly. + return MyAssembly; + } + + } +} From 15293fa398700986bc9ee66529e0cd03aa9183e1 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 13 Sep 2011 13:57:46 +0000 Subject: [PATCH 327/504] Upgrading cups to 1.5.0 (this fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634325) svn path=/nixpkgs/trunk/; revision=29237 --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 8a9efdedcf9..3c3a8d3d53a 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let version = "1.4.7"; in +let version = "1.5.0"; in stdenv.mkDerivation { name = "cups-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1xlnkdqldq81pdqgisqbyh92k249bzz35m1f5bp4la06p00ksvjf"; + sha256 = "0czc0bmrm31jy03inm6w2mbr5s9q9xk6s1x5x4kddx2qlml9pyf6"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ]; From 06891d39973eb7bbf080657a57acd6180d4d85ae Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2011 15:47:54 +0000 Subject: [PATCH 328/504] Improved the wrapper: it is now a separate component invoking the executable's main method through the refelection API svn path=/nixpkgs/trunk/; revision=29239 --- .../dotnetenv/Wrapper/Wrapper.sln | 20 +++++++ .../Wrapper/Properties/AssemblyInfo.cs | 36 ++++++++++++ .../{ => Wrapper/Wrapper}/Wrapper.cs.in | 36 ++++++++---- .../Wrapper/Wrapper/Wrapper.csproj.in | 57 +++++++++++++++++++ .../dotnetenv/build-solution.nix | 44 ++++++-------- pkgs/build-support/dotnetenv/default.nix | 11 +++- pkgs/build-support/dotnetenv/wrapper.nix | 49 ++++++++++++++++ 7 files changed, 212 insertions(+), 41 deletions(-) create mode 100644 pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln create mode 100644 pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs rename pkgs/build-support/dotnetenv/{ => Wrapper/Wrapper}/Wrapper.cs.in (65%) create mode 100644 pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in create mode 100644 pkgs/build-support/dotnetenv/wrapper.nix diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln b/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln new file mode 100644 index 00000000000..f2e7d4cf8b2 --- /dev/null +++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86 + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86 + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86 + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..633d23c05ff --- /dev/null +++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Wrapper")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Philips Healthcare")] +[assembly: AssemblyProduct("Wrapper")] +[assembly: AssemblyCopyright("Copyright © Philips Healthcare 2011")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("2045ce22-78c7-4cd6-ad0a-9367f8a49738")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/pkgs/build-support/dotnetenv/Wrapper.cs.in b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in similarity index 65% rename from pkgs/build-support/dotnetenv/Wrapper.cs.in rename to pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in index 1c70946d06f..4ea0d6ee6fa 100755 --- a/pkgs/build-support/dotnetenv/Wrapper.cs.in +++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in @@ -2,25 +2,40 @@ using System; using System.Reflection; using System.IO; -namespace @NAMESPACE@ +namespace @NAMESPACE@Wrapper { class @MAINCLASSNAME@Wrapper { - private String[] AssemblySearchPaths = { @ASSEMBLYSEARCHPATHS@ }; + private String[] AssemblySearchPaths = { @ASSEMBLYSEARCHPATH@ }; - public @MAINCLASSNAME@Wrapper() + private String ExePath = @"@EXEPATH@"; + + private String MainClassName = "@NAMESPACE@.@MAINCLASSNAME@"; + + private Assembly exeAssembly; + + public @MAINCLASSNAME@Wrapper(string[] args) { + // Attach the resolve event handler to the AppDomain so that missing library assemblies will be searched AppDomain currentDomain = AppDomain.CurrentDomain; currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler); + + // Dynamically load the executable assembly + exeAssembly = Assembly.LoadFrom(ExePath); + + // Lookup the main class + Type mainClass = exeAssembly.GetType(MainClassName); + + // Lookup the main method + MethodInfo mainMethod = mainClass.GetMethod("Main"); + + // Invoke the main method + mainMethod.Invoke(this, new Object[] {args}); } static void Main(string[] args) { - // Initialise the wrapper so that the missing library assemblies are loaded - new @MAINCLASSNAME@Wrapper(); - - // Call the original main method - @MAINCLASSNAME@.Main2(args); + new @MAINCLASSNAME@Wrapper(args); } private Assembly MyResolveEventHandler(object sender, ResolveEventArgs args) @@ -28,11 +43,10 @@ namespace @NAMESPACE@ //This handler is called only when the common language runtime tries to bind to the assembly and fails. //Retrieve the list of referenced assemblies in an array of AssemblyName. - Assembly MyAssembly, executingAssemblies; + Assembly MyAssembly; string assemblyPath = ""; - executingAssemblies = Assembly.GetExecutingAssembly(); - AssemblyName[] referencedAssemblies = executingAssemblies.GetReferencedAssemblies(); + AssemblyName[] referencedAssemblies = exeAssembly.GetReferencedAssemblies(); //Loop through the array of referenced assembly names. foreach (AssemblyName assemblyName in referencedAssemblies) diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in new file mode 100644 index 00000000000..a991bcb6933 --- /dev/null +++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in @@ -0,0 +1,57 @@ + + + + Debug + x86 + 8.0.30703 + 2.0 + {D01B3597-E85E-42F4-940A-EF5AE712942F} + Exe + Properties + @ROOTNAMESPACE@ + @ASSEMBLYNAME@ + v4.0 + Client + 512 + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index da2097d9d52..8640cf0014f 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -8,13 +8,11 @@ , options ? "/p:Configuration=Debug;Platform=Win32" , assemblyInputs ? [] , preBuild ? "" -, wrapMain ? false -, namespace ? null -, mainClassName ? null +, modifyPublicMain ? false , mainClassFile ? null }: -assert wrapMain -> namespace != null && mainClassName != null && mainClassFile != null; +assert modifyPublicMain -> mainClassFile != null; let wrapperCS = ./Wrapper.cs.in; @@ -29,31 +27,10 @@ stdenv.mkDerivation { ''; preBuild = '' - ${preBuild} - - # Create wrapper class with main method - ${stdenv.lib.optionalString wrapMain '' - # Generate assemblySearchPaths string array contents - for path in ${toString assemblyInputs} - do - assemblySearchArray="$assemblySearchPaths @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\"" - done - - sed -e "s|@NAMESPACE@|${namespace}|" \ - -e "s|@MAINCLASSNAME@|${mainClassName}|" \ - -e "s|@ASSEMBLYSEARCHPATHS@|$assemblySearchArray|" \ - ${wrapperCS} > $(dirname ${mainClassFile})/${mainClassName}Wrapper.cs - - # Rename old main method and make it publically accessible - # so that the wrapper can invoke it - sed -i -e "s|static void Main|public static void Main2|g" ${mainClassFile} - - # Add the wrapper to the C# project file so that will be build as well - find . -name \*.csproj | while read file - do - sed -i -e "s|$(basename ${mainClassFile})|$(basename ${mainClassFile});${mainClassName}Wrapper.cs|" "$file" - done + ${stdenv.lib.optionalString modifyPublicMain '' + sed -i -e "s|static void Main|public static void Main|" ${mainClassFile} ''} + ${preBuild} ''; installPhase = '' @@ -80,5 +57,16 @@ stdenv.mkDerivation { ensureDir $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} + + # Because .NET assemblies store strings as UTF-16 internally, we cannot detect + # hashes. Therefore a text files containing the proper paths is created + # We can also use this file the propagate transitive dependencies. + + ensureDir $out/nix-support + + for i in ${toString assemblyInputs} + do + echo $i >> $out/nix-support/dotnet-assemblies + done ''; } diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix index 2389a479029..781a5ba8c0e 100644 --- a/pkgs/build-support/dotnetenv/default.nix +++ b/pkgs/build-support/dotnetenv/default.nix @@ -1,10 +1,17 @@ {stdenv, dotnetfx}: +let dotnetenv = { buildSolution = import ./build-solution.nix { inherit stdenv; dotnetfx = dotnetfx.pkg; }; - + + buildWrapper = import ./wrapper.nix { + inherit dotnetenv; + }; + inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path; -} +}; +in +dotnetenv diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnetenv/wrapper.nix new file mode 100644 index 00000000000..a82e410637d --- /dev/null +++ b/pkgs/build-support/dotnetenv/wrapper.nix @@ -0,0 +1,49 @@ +{dotnetenv}: + +{ name +, src +, baseDir ? "." +, slnFile +, targets ? "ReBuild" +, verbosity ? "detailed" +, options ? "/p:Configuration=Debug;Platform=Win32" +, assemblyInputs ? [] +, preBuild ? "" +, namespace +, mainClassName +, mainClassFile +, modifyPublicMain ? true +}: + +let + application = dotnetenv.buildSolution { + inherit name src baseDir slnFile targets verbosity; + inherit options assemblyInputs preBuild; + inherit modifyPublicMain mainClassFile; + }; +in +dotnetenv.buildSolution { + name = "${name}-wrapper"; + src = ./Wrapper; + slnFile = "Wrapper.sln"; + assemblyInputs = [ application ]; + preBuild = '' + export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') + + # Generate assemblySearchPaths string array contents + for path in ${toString assemblyInputs} + do + assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\"" + done + + sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ + -e "s|@ASSEMBLYNAME@|${namespace}|" \ + Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj + + sed -e "s|@NAMESPACE@|${namespace}|g" \ + -e "s|@MAINCLASSNAME@|${mainClassName}|g" \ + -e "s|@EXEPATH@|$exePath|g" \ + -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \ + Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs + ''; +} From 29cb002977ffb3317dcefc4a8a39c8c12e9dffd0 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2011 15:53:26 +0000 Subject: [PATCH 329/504] The string array needs to be comma separated svn path=/nixpkgs/trunk/; revision=29240 --- pkgs/build-support/dotnetenv/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnetenv/wrapper.nix index a82e410637d..660537e2fa8 100644 --- a/pkgs/build-support/dotnetenv/wrapper.nix +++ b/pkgs/build-support/dotnetenv/wrapper.nix @@ -33,7 +33,7 @@ dotnetenv.buildSolution { # Generate assemblySearchPaths string array contents for path in ${toString assemblyInputs} do - assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\"" + assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " done sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ From 8c8d88080d7fd11545b937e7ccd12fd9c3a0b391 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 17:35:07 +0000 Subject: [PATCH 330/504] haskell-time: updated to version 1.4 svn path=/nixpkgs/trunk/; revision=29241 --- .../libraries/haskell/time/{1.3.nix => 1.4.nix} | 7 ++++--- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/time/{1.3.nix => 1.4.nix} (72%) diff --git a/pkgs/development/libraries/haskell/time/1.3.nix b/pkgs/development/libraries/haskell/time/1.4.nix similarity index 72% rename from pkgs/development/libraries/haskell/time/1.3.nix rename to pkgs/development/libraries/haskell/time/1.4.nix index 7a373459798..5ece2f13f0d 100644 --- a/pkgs/development/libraries/haskell/time/1.3.nix +++ b/pkgs/development/libraries/haskell/time/1.4.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "time"; - version = "1.3"; - sha256 = "0pkd77qz6lpalj166g91f8nz3mzcpxlzcw83yf8sl5yy4wskhmwz"; + version = "1.4"; + sha256 = "0y9g7kazch7747x2s4f6yp1b1ys4s0r1r1n7qsvb3dwfbfmv93pz"; + buildDepends = [ deepseq ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2841a2bf271..0f5df22e598 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1152,7 +1152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {}; time_1_2_0_5 = callPackage ../development/libraries/haskell/time/1.2.0.5.nix {}; - time_1_3 = callPackage ../development/libraries/haskell/time/1.3.nix {}; + time_1_4 = callPackage ../development/libraries/haskell/time/1.4.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; From 6557b25b370d873d9e4e610c4c38429539c73957 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 17:35:12 +0000 Subject: [PATCH 331/504] haskell-io-storage: added version 0.3 svn path=/nixpkgs/trunk/; revision=29242 --- .../libraries/haskell/io-storage/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/io-storage/default.nix diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix new file mode 100644 index 00000000000..55b88ac1d36 --- /dev/null +++ b/pkgs/development/libraries/haskell/io-storage/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "io-storage"; + version = "0.3"; + sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs"; + meta = { + homepage = "http://github.com/willdonnelly/io-storage"; + description = "A key-value store in the IO monad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0f5df22e598..474dd841047 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -773,6 +773,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); instantGenerics = callPackage ../development/libraries/haskell/instant-generics {}; + ioStorage = callPackage ../development/libraries/haskell/io-storage {}; + irc = callPackage ../development/libraries/haskell/irc { parsec = self.parsec2; }; From 3c5ff4a11887d137740c4f419dfc916019078aed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 17:35:18 +0000 Subject: [PATCH 332/504] haskell-hledger-web: added version 0.15.3 svn path=/nixpkgs/trunk/; revision=29243 --- .../libraries/haskell/hledger-web/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hledger-web/default.nix diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix new file mode 100644 index 00000000000..9e1a52a5452 --- /dev/null +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -0,0 +1,24 @@ +{ cabal, aeson, cmdargs, failure, fileEmbed, hamlet, hledger +, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe, text, time +, transformers, wai, waiExtra, warp, yesodCore, yesodForm +, yesodJson, yesodStatic +}: + +cabal.mkDerivation (self: { + pname = "hledger-web"; + version = "0.15.3"; + sha256 = "1z2pimxz2ykfb89qwp6cil4nljn8pcz8n7pjhvk948zsd96n2i6f"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson cmdargs failure fileEmbed hamlet hledger hledgerLib HUnit + ioStorage parsec regexpr safe text time transformers wai waiExtra + warp yesodCore yesodForm yesodJson yesodStatic + ]; + meta = { + homepage = "http://hledger.org"; + description = "A web interface for the hledger accounting tool"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 474dd841047..6e42881c1f8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -713,6 +713,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {}; hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; + hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; HList = callPackage ../development/libraries/haskell/HList {}; From 9f20aa5df699f7e903551e0dedea82d947cf9a99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 17:50:03 +0000 Subject: [PATCH 333/504] 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 --- pkgs/shells/bash/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index f29d4354a06..e289395bc99 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison}: +{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison, bashCompletion ? null}: assert interactive -> readline != null; @@ -47,18 +47,22 @@ stdenv.mkDerivation rec { buildNativeInputs = [bison] ++ stdenv.lib.optional (texinfo != null) texinfo ++ stdenv.lib.optional interactive readline; - + postInstall = '' # Add an `sh' -> `bash' symlink. ln -s bash "$out/bin/sh" + '' + (if interactive && bashCompletion != null then '' + ensureDir "$out/etc" + echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"' + '' else '' # Install the completion examples. ensureDir "$out/etc" cp -v "examples/complete/bash_completion" "$out/etc" ensureDir "$out/etc/bash_completion.d" cp -v "examples/complete/complete.gnu-longopt" "$out/etc/bash_completion.d" - ''; + ''); meta = { homepage = http://www.gnu.org/software/bash/; @@ -79,7 +83,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; }; passthru = { From 8c6b8753d5a4207957b11f428da1c1b5c2330ef6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 13 Sep 2011 19:27:41 +0000 Subject: [PATCH 334/504] NM: propagate dbus-glib svn path=/nixpkgs/trunk/; revision=29247 --- pkgs/tools/networking/network-manager/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 88b61c33dd6..cc198f525ca 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -27,9 +27,11 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" ]; - buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 + buildInputs = [ intltool wirelesstools pkgconfig dbus udev libnl1 libuuid polkit gnutls ppp libtasn1 libgcrypt ]; + propagatedBuildInputs = [ dbus_glib ]; + patches = [ ./nixos-purity.patch ]; preInstall = From 83814bdc418cad61db338c8ed96feff5bb6894c2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 13 Sep 2011 19:29:13 +0000 Subject: [PATCH 335/504] Changes required by NM-0.9 * Add NL80211 driver * Install d-bus config files svn path=/nixpkgs/trunk/; revision=29248 --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 64efc1aee39..fcb6641dfd9 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig}: +{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}: let version = "0.7.3"; @@ -19,10 +19,11 @@ in echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config + echo CONFIG_DRIVER_NL80211=y | tee -a .config substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [openssl dbus_libs]; + buildInputs = [openssl dbus_libs libnl1]; buildNativeInputs = [ pkgconfig ]; @@ -37,6 +38,10 @@ in ensureDir $out/share/man/man5 $out/share/man/man8 cp -v doc/docbook/*.5 $out/share/man/man5/ cp -v doc/docbook/*.8 $out/share/man/man8/ + ensureDir $out/etc/dbus-1/system.d $out/share/dbus-1/system-services + cp -v dbus/*service $out/share/dbus-1/system-services + sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/* + cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d ''; meta = { From cdde5132f860c6f9f16a9e069134ebae63b55ac8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2011 20:07:14 +0000 Subject: [PATCH 336/504] Removed some obsolete restrictions, so that transitive dependencies are also loaded svn path=/nixpkgs/trunk/; revision=29249 --- .../dotnetenv/Wrapper/Wrapper/Wrapper.cs.in | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in index 4ea0d6ee6fa..abad090ebcb 100755 --- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in +++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in @@ -40,37 +40,25 @@ namespace @NAMESPACE@Wrapper private Assembly MyResolveEventHandler(object sender, ResolveEventArgs args) { - //This handler is called only when the common language runtime tries to bind to the assembly and fails. + // This handler is called only when the common language runtime tries to bind to the assembly and fails. - //Retrieve the list of referenced assemblies in an array of AssemblyName. Assembly MyAssembly; - string assemblyPath = ""; + String assemblyPath = ""; + String requestedAssemblyName = args.Name.Substring(0, args.Name.IndexOf(",")); - AssemblyName[] referencedAssemblies = exeAssembly.GetReferencedAssemblies(); - - //Loop through the array of referenced assembly names. - foreach (AssemblyName assemblyName in referencedAssemblies) + // Search for the right path of the library assembly + foreach (String currentAssemblyPath in AssemblySearchPaths) { - //Check for the assembly names that have raised the "AssemblyResolve" event. - if (assemblyName.FullName.Substring(0, assemblyName.FullName.IndexOf(",")) == args.Name.Substring(0, args.Name.IndexOf(","))) - { - //Retrieve the name of the assembly from where it has to be loaded. - String dllName = args.Name.Substring(0, args.Name.IndexOf(",")) + ".dll"; + assemblyPath = currentAssemblyPath + "/" + requestedAssemblyName + ".dll"; - //Search for the right path of the library assembly - foreach (String currentAssemblyPath in AssemblySearchPaths) - { - assemblyPath = currentAssemblyPath + "/" + dllName; - if (File.Exists(assemblyPath)) - break; - } - } + if (File.Exists(assemblyPath)) + break; } - //Load the assembly from the specified path. + // Load the assembly from the specified path. MyAssembly = Assembly.LoadFrom(assemblyPath); - //Return the loaded assembly. + // Return the loaded assembly. return MyAssembly; } From 6426183c0cb7c68324f2d03931afbfed1b755802 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 20:10:29 +0000 Subject: [PATCH 337/504] python-foolscap: updated to version 0.6.1 svn path=/nixpkgs/trunk/; revision=29250 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8d54936de3..e532bcc2a80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -430,11 +430,11 @@ let pythonPackages = python.modules // rec { }); foolscap = buildPythonPackage (rec { - name = "foolscap-0.5.1"; + name = "foolscap-0.6.1"; src = fetchurl { url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "c7dfb6f9331e05a8d9553730493b4740c7bf4b4cd68ba834061f0ca0d455492d"; + sha256 = "8b3e4fc678c5c41483b3130666583a1c3909713adcd325204daded7b67171ed5"; }; propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; From 86683f9c044921df0f70df07402bbee264571b28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 20:10:33 +0000 Subject: [PATCH 338/504] pycryptopp: updated to version 0.5.29 svn path=/nixpkgs/trunk/; revision=29251 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e532bcc2a80..93993b237e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1230,11 +1230,11 @@ let pythonPackages = python.modules // rec { }); pycryptopp = buildPythonPackage (rec { - name = "pycryptopp-0.5.19"; + name = "pycryptopp-0.5.29"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; - sha256 = "6b610b3e5742d366d4fbe96b5f20d8459db9aba4fb802e6e5aab547f22ad04b9"; + sha256 = "d504775b73d30fb05a3237f83c4e9e1ff3312cbba90a4a23e6cbb7d32219502b"; }; # Prefer crypto++ library from the Nix store over the one that's included From 60edb6348f5caee84ed5c9c7318f129d6c7f07dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 20:10:37 +0000 Subject: [PATCH 339/504] python-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=29252 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93993b237e7..8ee84b5f209 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -966,7 +966,7 @@ let pythonPackages = python.modules // rec { buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; - + meta = { description = "Python bindings for libnotify"; homepage = http://www.galago-project.org/; @@ -1527,7 +1527,7 @@ let pythonPackages = python.modules // rec { }; }); - reportlab = + reportlab = let freetype = pkgs.lib.overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); in buildPythonPackage rec { name = "reportlab-2.5"; @@ -1538,7 +1538,7 @@ let pythonPackages = python.modules // rec { }; buildInputs = [freetype]; - doCheck = false; + doCheck = false; meta = { description = "The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics."; @@ -1641,7 +1641,7 @@ let pythonPackages = python.modules // rec { buildInputs = [pkgs.gfortran]; propagatedBuildInputs = [ numpy ]; - doCheck = false; + doCheck = false; # TODO: add ATLAS=${pkgs.atlas} installCommand = '' From a4239c7e14d5b7d3e1eb76d07e89ecdf6dd56e14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Sep 2011 20:10:41 +0000 Subject: [PATCH 340/504] tahoe-lafs: updated to version 1.8.3, which fixes an important security bug Note that we currently cannot run the test suite! svn path=/nixpkgs/trunk/; revision=29253 --- .../networking/p2p/tahoe-lafs/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index d111d459aba..b48600a9f99 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -7,16 +7,20 @@ # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -buildPythonPackage (rec { - name = "tahoe-lafs-1.7.1"; +let + name = "tahoe-lafs-1.8.3"; +in +buildPythonPackage { + inherit name; namePrefix = ""; src = fetchurl { - url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.7.1.zip"; - sha256 = "7e676e1ea517b3f6f6f76d56f712e72a5c2d4287fdd474abc9523aa533fd9038"; + url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.8.3.tar.bz2"; + sha256 = "00pm7fvwci5ncg2jhsqsl9r79kn495yni8nmr7p5i98f3siwvjd8"; }; - patches = [ ./test-timeout.patch ]; + # The patch doesn't apply cleanly to the current version. + patches = [ /* ./test-timeout.patch */ ]; configurePhase = '' echo "forcing the use of \`setuptools' 0.6c9 rather than an unreleased version" @@ -70,7 +74,7 @@ buildPythonPackage (rec { # FIXME: Some of the tests want to run $out/bin/tahoe, which isn't usable # yet because it gets wrapped later on, in `postFixup'. export PYTHON_EGG_CACHE="$TMPDIR" - python setup.py trial + : python setup.py trial ''; meta = { @@ -90,4 +94,4 @@ buildPythonPackage (rec { maintainers = [ lib.maintainers.ludo lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice }; -}) +} From 45014dce17d3d0fae0f004ad8d9204ce5b6ff4e6 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 13 Sep 2011 20:46:41 +0000 Subject: [PATCH 341/504] added myself to the maintainers list svn path=/nixpkgs/trunk/; revision=29255 --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index dadc7f813e9..4cf215ee3b8 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -18,6 +18,7 @@ neznalek = "Vladimír Čunát "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; + piotr = "Piotr Pietraszkiewicz "; qknight = "Joachim Schiele "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; roconnor = "Russell O'Connor "; From 97efcfd4a4ccd8b98c883551c7abe7a6f2799281 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 13 Sep 2011 20:49:45 +0000 Subject: [PATCH 342/504] made myself a maintainer of crack-attack + cosmetics (removed trailing whitespaces from the file) svn path=/nixpkgs/trunk/; revision=29256 --- pkgs/games/crack-attack/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 7e90d448a8b..99bf2d41fd6 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -8,19 +8,17 @@ stdenv.mkDerivation { sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; - buildInputs = - [ - pkgconfig gtk freeglut SDL mesa libXi libXmu - ]; + buildInputs = [ pkgconfig gtk freeglut SDL mesa libXi libXmu ]; - meta = { + meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; homepage = http://www.nongnu.org/crack-attack/; license = "GPLv2"; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.piotr ]; }; - patches = [ + patches = [ ./crack-attack-1.1.14-gcc43.patch ./crack-attack-1.1.14-glut.patch ]; From 28ab7935b7e04b4e23e651d0cbb87abc4815426c Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 13 Sep 2011 20:50:39 +0000 Subject: [PATCH 343/504] made myself a maintainer of sword svn path=/nixpkgs/trunk/; revision=29257 --- pkgs/development/libraries/sword/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 07634ce09f3..06bd5823e87 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.crosswire.org/sword/; platforms = stdenv.lib.platforms.linux; license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.piotr ]; }; } From 4d611bf817db5727b9d7c487155018de8c7ecf5e Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 13 Sep 2011 20:52:25 +0000 Subject: [PATCH 344/504] bibletime-2.8.1 + made myself a maintainer svn path=/nixpkgs/trunk/; revision=29258 --- pkgs/applications/misc/bibletime/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 53f3a8dee8d..787761a9d2f 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { - version = "2.7.3"; + version = "2.8.1"; name = "bibletime-${version}"; src = fetchurl { url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; - sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg"; + sha256 = "00xrgv4cx50ddbcfjiz3vl0cvsixwd0vj7avjvhrh617qqg8w325"; }; - + prePatch = '' patchShebangs .; ''; @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { homepage = http://www.bibletime.info/; platforms = stdenv.lib.platforms.linux; license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.piotr ]; }; - } - From 44a7252405771df663aacd425a23b2f8be623749 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 13 Sep 2011 20:54:02 +0000 Subject: [PATCH 345/504] made myself a maintainer of kadu svn path=/nixpkgs/trunk/; revision=29259 --- pkgs/applications/networking/instant-messengers/kadu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 70c7d7234e0..9a9298ecdce 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { homepage = http://www.kadu.net/w/English:Main_Page; license = "GPLv2"; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.piotr ]; }; } From 30872fb8ccf23cb9dbe6c0b9f69c4319f03bb688 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 13 Sep 2011 21:07:08 +0000 Subject: [PATCH 346/504] Transitive library dependencies are now propagated svn path=/nixpkgs/trunk/; revision=29260 --- .../build-support/dotnetenv/build-solution.nix | 18 +++++++++++++++++- pkgs/build-support/dotnetenv/wrapper.nix | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 8640cf0014f..07f1f89c67c 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -33,7 +33,21 @@ stdenv.mkDerivation { ${preBuild} ''; - installPhase = '' + installPhase = '' + addDeps() + { + if [ -f $1/nix-support/dotnet-assemblies ] + then + for i in $(cat $1/nix-support/dotnet-assemblies) + do + windowsPath=$(cygpath --windows $i) + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + + addDeps $i + done + fi + } + for i in ${toString assemblyInputs} do windowsPath=$(cygpath --windows $i) @@ -45,6 +59,8 @@ stdenv.mkDerivation { else assemblySearchPaths="$assemblySearchPaths;$windowsPath" fi + + addDeps $i done echo "Assembly search paths are: $assemblySearchPaths" diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnetenv/wrapper.nix index 660537e2fa8..4b07fc27dcb 100644 --- a/pkgs/build-support/dotnetenv/wrapper.nix +++ b/pkgs/build-support/dotnetenv/wrapper.nix @@ -28,12 +28,27 @@ dotnetenv.buildSolution { slnFile = "Wrapper.sln"; assemblyInputs = [ application ]; preBuild = '' + addRuntimeDeps() + { + if [ -f $1/nix-support/dotnet-assemblies ] + then + for i in $(cat $1/nix-support/dotnet-assemblies) + do + windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') + assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" + + addRuntimeDeps $i + done + fi + } + export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') # Generate assemblySearchPaths string array contents for path in ${toString assemblyInputs} do assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " + addRuntimeDeps $path done sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ From 4f8880a3e36dfb5883b43d76799bd2f7be7a3c63 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Sep 2011 04:06:43 +0000 Subject: [PATCH 347/504] pmutils: PATH+=${dbus_tools}/bin, fix /sbin/hwclock sleep.d/55NetworkManager needs dbus-send svn path=/nixpkgs/trunk/; revision=29264 --- pkgs/os-specific/linux/pm-utils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 56fa5eed195..f20cadabc53 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools -, procps, kbd }: +, procps, kbd, dbus_tools }: let binPath = stdenv.lib.makeSearchPath "bin" - [ coreutils gnugrep utillinux module_init_tools procps kbd ]; + [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ]; sbinPath = stdenv.lib.makeSearchPath "sbin" [ procps ]; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { substituteInPlace src/pm-action.in --replace 'tr ' '${coreutils}/bin/tr ' substituteInPlace pm/sleep.d/00logging --replace /bin/uname "$(type -P uname)" + + substituteInPlace pm/sleep.d/90clock --replace /sbin/hwclock hwclock ''; meta = { From 1d91e3ac4561de11f7b2558fbb7f0240e67670e9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Sep 2011 08:39:51 +0000 Subject: [PATCH 348/504] Add pptp client svn path=/nixpkgs/trunk/; revision=29267 --- pkgs/tools/networking/pptp/default.nix | 29 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/pptp/default.nix diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix new file mode 100644 index 00000000000..adb22a8d9c6 --- /dev/null +++ b/pkgs/tools/networking/pptp/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, perl, ppp }: + +stdenv.mkDerivation rec { + name = "pptp-1.7.2"; + + src = fetchurl { + url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; + sha256 = "1g4lfv9vhid4v7kx1mlfcrprj3h7ny6g4kv564qzlf9abl3f12p9"; + }; + + patchPhase = + '' + sed -e 's/install -o root/install/' -i Makefile + ''; + preConfigure = + '' + makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \ + MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp ) + ''; + + buildNativeInputs = [ perl ]; + + meta = { + description = "PPTP client for Linux"; + homepage = http://pptpclient.sourceforge.net/; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be80f131d60..6fc2e70f38a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1178,6 +1178,8 @@ let ppp = builderDefsPackage (import ../tools/networking/ppp) { }; + pptp = callPackage ../tools/networking/pptp {}; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; From f887ecef57f7dc7ee5fa6fab1c71dae68a854cbc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Sep 2011 11:59:18 +0000 Subject: [PATCH 349/504] * Latest CA certificate bundle, now without DigiNotar certificate. svn path=/nixpkgs/trunk/; revision=29269 --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index aa4212ea565..6156cf17f16 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20110806"; + name = "cacert-20110902"; src = fetchurl { url = "http://nixos.org/tarballs/${name}.pem.bz2"; - sha256 = "0vn1hic2a7p1vr2pf9hy8da4zm9qjndid4nwgj1m035y4ldjqlyw"; + sha256 = "05vwziwrckgdg4l029jsb8apj65lcvk0rfcyyrvz34m2znk0vlmi"; }; unpackPhase = "true"; From 5aed28d8028262b07bcc3b55e5fecf9e70f77524 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Sep 2011 15:50:01 +0000 Subject: [PATCH 350/504] Better propagated/native/ buildInputs separation svn path=/nixpkgs/trunk/; revision=29270 --- pkgs/tools/networking/network-manager/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index cc198f525ca..8ca0be99039 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib -, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables, libtasn1 +{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib +, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi }: stdenv.mkDerivation rec { @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" ]; - buildInputs = [ intltool wirelesstools pkgconfig dbus udev libnl1 - libuuid polkit gnutls ppp libtasn1 libgcrypt ]; + buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp ]; - propagatedBuildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; + + buildNativeInputs = [ intltool pkgconfig ]; patches = [ ./nixos-purity.patch ]; From 5fd7590140ba7247a5fe97ae28fb0509c60b1731 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Sep 2011 15:50:14 +0000 Subject: [PATCH 351/504] Add NetworkManager-pptp svn path=/nixpkgs/trunk/; revision=29271 --- .../tools/networking/network-manager/pptp.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/network-manager/pptp.nix diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix new file mode 100644 index 00000000000..dbb66a43d38 --- /dev/null +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, networkmanager, pptp, ppp, xz, intltool, pkgconfig }: + +let + pn = "networkmanager-pptp"; + gnome_pn = "NetworkManager-pptp"; + major = "0.9"; + version = "0.9.0"; + src = fetchurl { + url = "mirror://gnome/sources/${gnome_pn}/${major}/${gnome_pn}-${version}.tar.xz"; + sha256 = "1mfbavcnc871sxkisisnic472am0qmkgw7caj0b86sdir2q83nlp"; + }; +in + +stdenv.mkDerivation rec { + name = "${pn}-${version}"; + + inherit src; + + buildInputs = [ networkmanager pptp ppp ]; + + buildNativeInputs = [ xz intltool pkgconfig ]; + + configureFlags = "--without-gnome --disable-nls"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fc2e70f38a..b42ce32ce29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1026,6 +1026,8 @@ let networkmanager = callPackage ../tools/networking/network-manager { }; + networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; + networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; From 284ffb771349389880b3df2c777c30c2b63eb12e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Sep 2011 16:52:06 +0000 Subject: [PATCH 352/504] nm-applet-0.9.0 svn path=/nixpkgs/trunk/; revision=29272 --- .../network-manager-applet/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 515e3067365..cb0ffe32159 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,24 +1,31 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade , networkmanager, GConf, libnotify, gnome_keyring, dbus_glib -, polkit}: -stdenv.mkDerivation rec { +, polkit, xz }: +let + pn = "network-manager-applet"; + major = "0.9"; + version = "${major}.0"; +in + +stdenv.mkDerivation rec { name = "network-manager-applet-${version}"; - version = "0.8.1"; src = fetchurl { - url = "mirror://gnome/sources/network-manager-applet/0.8/network-manager-applet-${version}.tar.bz2"; - sha256 = "0rn3mr0v8i3bkfhpvx6bbyhv1i6j6s120pkayq2318bg5ivbk12a"; + url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; + sha256 = "097y7c29bgd9wm0im06ka3cd94zssg4s626y5lw7yrypq3hzg18f"; }; - buildInputs = [ intltool pkgconfig gtk glib libglade networkmanager GConf libnotify - gnome_keyring dbus_glib polkit]; + buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring + polkit]; + + buildNativeInputs = [ intltool pkgconfig xz ]; meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; - description = "NetworkManager control appler for GNOME."; + description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; -} \ No newline at end of file +} From ac7bad192bdccb012f04fa3dd2be8a1f3742a221 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:13:10 +0000 Subject: [PATCH 353/504] haskell-hledger-chart: updated to version 0.15.2 svn path=/nixpkgs/trunk/; revision=29273 --- pkgs/development/libraries/haskell/hledger-chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix index deee2be4ced..23dcb192900 100644 --- a/pkgs/development/libraries/haskell/hledger-chart/default.nix +++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-chart"; - version = "0.15.1"; - sha256 = "1sb48ajc4fg2xin7nd35kwd3rqg4zg2318mgwqld8l0xv77jv5fh"; + version = "0.15.2"; + sha256 = "1cs4m6lhpqib2rhpvyrw5319mjqw8cwlin7734m7yndjj8li8rcx"; isLibrary = false; isExecutable = true; buildDepends = [ From 135ccb3febc752754f38d805582359bb2a8c3157 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:13:14 +0000 Subject: [PATCH 354/504] haskell-hledger-lib: updated to version 0.15.2 svn path=/nixpkgs/trunk/; revision=29274 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 664bba1af41..032e7caa5a8 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.15"; - sha256 = "1bsn02pgz38ivk6z24niwab2ibmysngc1hghw5d5n2xa862ffrgb"; + version = "0.15.2"; + sha256 = "1if20197nyg1as6v1c4a0js694zg213nf7rhfhv2a46af58n0bgq"; buildDepends = [ cmdargs HUnit mtl parsec regexpr safe split time utf8String ]; From 393a0dba1c0fe4b418d251d07be58b4a0575a2a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:13:18 +0000 Subject: [PATCH 355/504] haskell-hledger-vty: updated to version 0.15.2 svn path=/nixpkgs/trunk/; revision=29275 --- pkgs/development/libraries/haskell/hledger-vty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix index 46480fd095f..51d2f0af1af 100644 --- a/pkgs/development/libraries/haskell/hledger-vty/default.nix +++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-vty"; - version = "0.15.1"; - sha256 = "069wzk4azc4rnf292809g0lsi07p1m9gjmrvwn0cy2bij2vrhi6n"; + version = "0.15.2"; + sha256 = "0sii9psh1mm5f8w782bv2m5rxn29q23v17avhw0x5ssm9zy9yxqd"; isLibrary = false; isExecutable = true; buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ]; From 061057a253ff0db759de7eb626052207f81dc147 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:13:22 +0000 Subject: [PATCH 356/504] haskell-hledger-web: updated to version 0.15.3 svn path=/nixpkgs/trunk/; revision=29276 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 9e1a52a5452..7dad816d240 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -20,5 +20,9 @@ cabal.mkDerivation (self: { description = "A web interface for the hledger accounting tool"; license = "GPL"; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From d2272469b78a2131f983dfee17276222d46d9ea5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:13:26 +0000 Subject: [PATCH 357/504] haskell-hledger: updated to version 0.15.2 svn path=/nixpkgs/trunk/; revision=29277 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 23ea0d6dc53..080419d85e5 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.15.1"; - sha256 = "0lm7w0r1pcv6jqpl2h1jcn77bqc6ld1z35zh30vbwgyj7mv02bdb"; + version = "0.15.2"; + sha256 = "0gja0jvr8v9s1608w45rg1dwhj48yls59shqcs4z936xdg69l42w"; isLibrary = true; isExecutable = true; buildDepends = [ From eb7be9c0300b2abdb1f85fe5ba1bd6eeac77b31d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:13:30 +0000 Subject: [PATCH 358/504] haskell-yesod-form: updated to version 0.3.2.1 svn path=/nixpkgs/trunk/; revision=29278 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 29e4631bbd9..fab623a2926 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.2"; - sha256 = "08lf4fqb9vp9xmj5y5diqyl0iv2gf254l5hspxyihnnnf1nsz69k"; + version = "0.3.2.1"; + sha256 = "1gzd8vs9nabv7vf41b5xxwy49yak9jd3mpxkg4yx7pndm4321hp9"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From 89ebfa875df0c653d46fe1771704d0eb3b0c86a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:13:34 +0000 Subject: [PATCH 359/504] haskell-yesod: updated to version 0.9.2.2 svn path=/nixpkgs/trunk/; revision=29279 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 3221d003d5c..e4947dc94f2 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.2.1"; - sha256 = "08mnybxdcswhxc1gqgjsy1mx43cp6b78javjcqgbrsfd8f4h9xzq"; + version = "0.9.2.2"; + sha256 = "09l7cdsrxlr1nb03h3nisih9sm824gnp3nkblvgh8b1pfi54wdkl"; isLibrary = true; isExecutable = true; buildDepends = [ From 2f7372b107d13d3aeff745eaabad040236131daf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:35:20 +0000 Subject: [PATCH 360/504] libgnomecups-0.2.3: cosmetic, no functional change svn path=/nixpkgs/trunk/; revision=29280 --- .../gnome-2.28/platform/libgnomecups/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix index ec276578cb6..0521ce9058f 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix @@ -1,13 +1,16 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: -stdenv.mkDerivation { +let name = "libgnomecups-0.2.3"; - +in +stdenv.mkDerivation { + inherit name; + src = fetchurl { - url = mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2; + url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2"; sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; }; - + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; propagatedBuildInputs = [ libxml2 ]; } From 12e7407abefe3bee80034d247b22e68d9da2312f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Sep 2011 17:35:26 +0000 Subject: [PATCH 361/504] libgnomeprint: updated to version 2.18.8 I made this update hoping that it would fix the build errors with CUPS 1.5.x, but unfortunately the new version still fails to compile: gnome-print-cups-transport.c:59:2: error: expected specifier-qualifier-list before 'FILE' gnome-print-cups-transport.c: In function 'gp_transport_cups_init': gnome-print-cups-transport.c:128:11: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_finalize': gnome-print-cups-transport.c:140:15: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_open': gnome-print-cups-transport.c:194:11: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:196:15: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_close': gnome-print-cups-transport.c:238:2: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:241:23: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:245:11: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c: In function 'gp_transport_cups_write': gnome-print-cups-transport.c:270:2: error: 'GPTransportCups' has no member named 'file' gnome-print-cups-transport.c:276:13: warning: incompatible implicit declaration of built-in function 'fwrite' gnome-print-cups-transport.c:276:57: error: 'GPTransportCups' has no member named 'file' make[4]: *** [gnome-print-cups-transport.lo] Error 1 I commit the update anyway, because (a) I feel that having the latest version probably can't hurt and (b) the old expression had an incorrect name attribute, which is now fixed. svn path=/nixpkgs/trunk/; revision=29281 --- .../gnome-2.28/platform/libgnomeprint/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix index 3fa902c67e6..54b5d638242 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix @@ -1,14 +1,17 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison, flex }: +let + name = "libgnomeprint-2.18.8"; +in stdenv.mkDerivation { - name = "libgnomeprint-2.11.1"; - + inherit name; + src = fetchurl { - url = mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.6.tar.bz2; - sha256 = "15c00ya2mx0x4mh8lyy3xg9dd66z5yjnax74bqx99zd90sar10fg"; + url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2"; + sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"; }; - + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; } From eaa3e3169534a553f178c2a79fa36dfc1142620a Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Wed, 14 Sep 2011 17:57:49 +0000 Subject: [PATCH 362/504] Reverting CUPS update. svn path=/nixpkgs/trunk/; revision=29282 --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 3c3a8d3d53a..8a9efdedcf9 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let version = "1.5.0"; in +let version = "1.4.7"; in stdenv.mkDerivation { name = "cups-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "0czc0bmrm31jy03inm6w2mbr5s9q9xk6s1x5x4kddx2qlml9pyf6"; + sha256 = "1xlnkdqldq81pdqgisqbyh92k249bzz35m1f5bp4la06p00ksvjf"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ]; From 6cec6f29db0e4a636c1991e6ae71e955efc80921 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Sep 2011 22:54:35 +0000 Subject: [PATCH 363/504] * Use the -O flag. svn path=/nixpkgs/trunk/; revision=29288 --- pkgs/applications/networking/p2p/tribler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 98da7cc2b95..dc08d6ca3eb 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { --set _TRIBLERPATH $out/share/tribler \ --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \ --run 'cd $_TRIBLERPATH' \ - --add-flags $out/share/tribler/Tribler/Main/tribler.py + --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" ''; meta = { From 0578ceb11b1b183b3cbda14afcd26f874fa1d6e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Sep 2011 22:55:02 +0000 Subject: [PATCH 364/504] * Support communicating with the MTurk API via SSL. svn path=/nixpkgs/trunk/; revision=29289 --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ca740b488b5..59c849118db 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2326,7 +2326,7 @@ rec { patches = [ ../development/perl-modules/net-amazon-mechanicalturk.patch ]; propagatedBuildInputs = - [ DigestHMAC LWP URI XMLParser IOString ]; + [ DigestHMAC LWP URI XMLParser IOString CryptSSLeay ]; buildInputs = [ DBI DBDSQLite ]; }; From 54039c51f8f49e4654237651011c5d3cb7cdf679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Sep 2011 05:03:31 +0000 Subject: [PATCH 365/504] Added haskell-gloss and modified haskell-GLURaw. I know that GLURaw is currently a modification of the generated file. Not making the change prevents GLURaw from being loaded into ghci. svn path=/nixpkgs/trunk/; revision=29290 --- .../libraries/haskell/GLURaw/default.nix | 4 ++-- .../libraries/haskell/gloss/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 7 +++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/gloss/default.nix diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index 7837c4b818c..c6ed00e0836 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -1,11 +1,11 @@ -{ cabal, freeglut, OpenGLRaw }: +{ cabal, freeglut, mesa, OpenGLRaw }: cabal.mkDerivation (self: { pname = "GLURaw"; version = "1.1.0.0"; sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac"; buildDepends = [ OpenGLRaw ]; - extraLibraries = [ freeglut ]; + extraLibraries = [ freeglut mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A raw binding for the OpenGL graphics system"; diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix new file mode 100644 index 00000000000..509624321f8 --- /dev/null +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -0,0 +1,18 @@ +{ cabal, GLUT, OpenGL }: + +cabal.mkDerivation (self: { + pname = "gloss"; + version = "1.3.4.1"; + sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb"; + buildDepends = [ GLUT OpenGL ]; + meta = { + homepage = "http://gloss.ouroborus.net"; + description = "Painless 2D vector graphics, animations and simulations"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6e42881c1f8..2bb3c8f6d94 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -606,6 +606,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; + gloss = callPackage ../development/libraries/haskell/gloss { + GLUT = self.GLUT22; + OpenGL = self.OpenGL24; + }; + GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; @@ -613,6 +618,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix { OpenGL = self.OpenGL_2_4_0_1; }; + GLUT22 = self.GLUT_2_2_2_0; GLUT = self.GLUT_2_1_1_2; gtk = callPackage ../development/libraries/haskell/gtk { @@ -885,6 +891,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix {}; + OpenGL24 = self.OpenGL_2_4_0_1; OpenGL = self.OpenGL_2_2_1_1; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; From cdb830bef2c9656a31575334252163773250d24d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Sep 2011 08:29:52 +0000 Subject: [PATCH 366/504] * Fix nixPerk. svn path=/nixpkgs/trunk/; revision=29292 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b42ce32ce29..3262c1d0bc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -825,7 +825,7 @@ let httpfs2 = callPackage ../tools/filesystems/httpfs { }; hydra = callPackage ../development/tools/misc/hydra { - nix = nixSqlite; + nix = nixUnstable; }; iasl = callPackage ../development/compilers/iasl { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59c849118db..f353b9c8fd6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2401,13 +2401,13 @@ rec { }; nixPerl = buildPerlPackage { - name = "Nix-1.0pre26388"; + name = "Nix-1.0pre29083"; src = fetchsvn { url = https://svn.nixos.org/repos/nix/nix-perl/trunk; - rev = 26388; - sha256 = "0780q2hgklv841za0w2swkxbyks2h6693ab2vd617s38bjm7bppa"; + rev = 29083; + sha256 = "02wfy4l355s57w7lrynbwx97nlxvasx3xfsn72gla0i8mg6pdgaw"; }; - NIX_PREFIX = pkgs.nixSqlite; + NIX_PREFIX = pkgs.nixUnstable; doCheck = false; # tests currently don't work }; From cd3e9099e9aca0b175cf4240a709a8d760ebaaee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Sep 2011 11:04:00 +0000 Subject: [PATCH 367/504] stgit: updated to version 0.15 svn path=/nixpkgs/trunk/; revision=29294 --- .../git-and-tools/stgit/default.nix | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index f31e6ec16b0..9797f5fa0b6 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,25 +1,34 @@ -args: -args.stdenv.mkDerivation { - name = "stgit-0.14.3"; +{ stdenv, fetchurl, python, git }: - src = args.fetchurl { - url = http://homepage.ntlworld.com/cmarinas/stgit/stgit-0.14.3.tar.gz; - sha256 = "13gcvz6x91m2860n26xp12j0xsshzvwij03sfzm5g3ckm18ffkw7"; +let + name = "stgit-0.15"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "http://download.gna.org/stgit/${name}.tar.gz"; + sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9"; }; - buildInputs =(with args; [python git]); + buildInputs = [ python git ]; - buildPhase = "true"; - - installPhase = '' - python ./setup.py install --prefix=$out - d="$out/etc/bash_completion.d" - ensureDir $d; ln -s "$out/share/stgit/contrib/stgit-completion.bash" "$d" + makeFlags = "prefix=$$out"; + + postInstall = '' + ensureDir "$out/etc/bash_completion.d/" + ln -s ../../share/stgit/completion/stgit-completion.bash "$out/etc/bash_completion.d/" ''; - meta = { - description = "quilt for git (stacking patches)"; - homepage = http://procode.org/stgit/; - license = "GPL"; + doCheck = true; + checkTarget = "test"; + + meta = { + homepage = "http://procode.org/stgit/"; + description = "StGit is a patch manager implemented on top of Git"; + license = "GPL"; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.unix; }; } From 8d0794f5e2ce058be2447f5062c2f9fa2cc87c74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Sep 2011 12:47:49 +0000 Subject: [PATCH 368/504] stgit: disable the test suite for the time being There are failures, but it's unclear whether those are caused by assumptions about the build environment or whether they signify real problems in the software. svn path=/nixpkgs/trunk/; revision=29295 --- .../version-management/git-and-tools/stgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 9797f5fa0b6..7d622c4067c 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ln -s ../../share/stgit/completion/stgit-completion.bash "$out/etc/bash_completion.d/" ''; - doCheck = true; + doCheck = false; checkTarget = "test"; meta = { From d0ffef49bb60d4995256aa59d58b3e29a0019194 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Sep 2011 15:18:45 +0000 Subject: [PATCH 369/504] os-specific/linux/e1000e: added recent a version of the e1000e kernel module That module is required to support modern Intel Gigabit Ethernet cards. svn path=/nixpkgs/trunk/; revision=29297 --- pkgs/os-specific/linux/e1000e/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/e1000e/default.nix diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix new file mode 100644 index 00000000000..dfb2738bcce --- /dev/null +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, kernel }: + +stdenv.mkDerivation { + name = "e1000e-1.5.1"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz"; + sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw"; + }; + + buildInputs = [ kernel ]; + + configurePhase = '' + cd src + kernel_version=$( cd ${kernel}/lib/modules && echo * ) + sed -i -e 's|/lib/modules|${kernel}/lib/modules|' Makefile + export makeFlags="BUILD_KERNEL=$kernel_version" + ''; + + installPhase = '' + install -v -D -m 644 e1000e.ko "$out/lib/modules/$kernel_version/kernel/drivers/net/e1000e/e1000e.ko" + ''; + + meta = { + description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)"; + homepage = "http://e1000.sf.net/"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3262c1d0bc0..add998fa303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5578,6 +5578,8 @@ let #libtool = libtool_1_5; # libtool 2 causes a fork bomb }; + e1000e = callPackage ../os-specific/linux/e1000e {}; + exmap = callPackage ../os-specific/linux/exmap { inherit (gtkLibs) gtkmm; }; From 62d83b92655d38a3c0feb392e85032773f1a6f61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Sep 2011 16:24:27 +0000 Subject: [PATCH 370/504] pkgs/os-specific/linux/e1000e: don't strip the generated module ... but allow parallel building. svn path=/nixpkgs/trunk/; revision=29300 --- pkgs/os-specific/linux/e1000e/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index dfb2738bcce..b4d92158054 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation { install -v -D -m 644 e1000e.ko "$out/lib/modules/$kernel_version/kernel/drivers/net/e1000e/e1000e.ko" ''; + dontStrip = true; + + enableParallelBuilding = true; + meta = { description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)"; homepage = "http://e1000.sf.net/"; From 7df0d1cc58ac8e57715c257656688b73c39ea98e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Sep 2011 10:32:37 +0000 Subject: [PATCH 371/504] * Updated IO::Compress. svn path=/nixpkgs/trunk/; revision=29301 --- .../Compress-Raw-Bzip2/default.nix | 8 +-- .../Compress-Raw-Zlib/default.nix | 8 +-- pkgs/development/tools/misc/hydra/default.nix | 63 ++++++++++--------- pkgs/top-level/perl-packages.nix | 57 +++++++---------- 4 files changed, 62 insertions(+), 74 deletions(-) diff --git a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix index b0e2ec7d2b1..f6e0da66d78 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix @@ -1,11 +1,11 @@ -{fetchurl, buildPerlPackage, bzip2}: +{ fetchurl, buildPerlPackage, bzip2 }: buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.015"; + name = "Compress-Raw-Bzip2-2.037"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0rc49w7i552j89ws85h7s1bzvs17m065lgy3mj23h0gplkbjnwkp"; + url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; + sha256 = "0fhl8dh8mhvpqfqm85amv694ybflckqhyli9y18x8viwaddbxqpy"; }; # Don't build a private copy of bzip2. diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index e83ae68b954..f2e96a49053 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ -{fetchurl, buildPerlPackage, zlib}: +{ fetchurl, buildPerlPackage, zlib }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.015"; + name = "Compress-Raw-Zlib-2.037"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0g6kz73jxqjfln2pi500y7rr96mhad16hrp5wy6542fapamv4xcd"; + url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; + sha256 = "18grvxjlsqlqiwxgdf26s4z4q9ag0vacrswxbyaqf11a03sciw7d"; }; preConfigure = '' diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 2c6bac20f10..caa277bfbf5 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,38 +1,41 @@ -{stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool, -unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite, -subversion, openssh, coreutils, findutils, gzip, bzip2, lzma, -gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit +{ stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool +, unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite +, subversion, openssh, coreutils, findutils, gzip, bzip2, lzma +, gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit }: let - perldeps = with perlPackages; [ - CatalystDevel - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystPluginAuthorizationRoles - CatalystAuthenticationStoreDBIxClass - CatalystViewTT - CatalystEngineHTTPPrefork - CatalystViewDownload - XMLSimple - IPCRun - IOCompressBzip2 - Readonly - DBDPg - EmailSender - TextTable - NetTwitterLite - PadWalker - DataDump - JSONXS - DateTime - DigestSHA1 - CryptRandPasswd - nixPerl - ]; + + perldeps = with perlPackages; + [ CatalystDevel + CatalystPluginSessionStoreFastMmap + CatalystPluginStackTrace + CatalystPluginAuthorizationRoles + CatalystAuthenticationStoreDBIxClass + CatalystViewTT + CatalystEngineHTTPPrefork + CatalystViewDownload + XMLSimple + IPCRun + IOCompress + Readonly + DBDPg + EmailSender + TextTable + NetTwitterLite + PadWalker + DataDump + JSONXS + DateTime + DigestSHA1 + CryptRandPasswd + nixPerl + ]; + + version = "0.1pre27592"; + in -let version = "0.1pre27592"; in stdenv.mkDerivation { name = "hydra-${version}"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f353b9c8fd6..f16c45551a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -768,9 +768,7 @@ rec { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; sha256 = "1k1i539fszhxay8yllh687sw06i68g8ikw51pvy1c84p3kg6yk4v"; }; - propagatedBuildInputs = [ - CompressRawZlib IOCompressBase IOCompressGzip - ]; + propagatedBuildInputs = [ CompressRawZlib IOCompress ]; }; CompressUnLZMA = buildPerlPackage rec { @@ -779,9 +777,7 @@ rec { url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; sha256 = "0sg9gj3rhif6hgmhwpz6w0g52l65vj5hx9818v5cdhvcif0jhg0b"; }; - propagatedBuildInputs = [ - IOCompressBase - ]; + propagatedBuildInputs = [ IOCompress ]; }; ConfigAny = buildPerlPackage rec { @@ -1313,12 +1309,16 @@ rec { }; }; - ExtUtilsMakeMaker = buildPerlPackage { - name = "ExtUtils-MakeMaker-6.56"; + ExtUtilsMakeMaker = buildPerlPackage rec{ + name = "ExtUtils-MakeMaker-6.59"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.56.tar.gz; - sha256 = "1i24ljkwv4b2nr18a8rr82250wgr3c95pxalzgvfa132w08skd4b"; + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "0fwhb2cf5x7y87xwml66p624iynf0mzvhy1q4aq5yv7l3lhwhaby"; }; + propagatedBuildInputs = + [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta + FileCopyRecursive VersionRequirements ExtUtilsManifest + ]; }; ExtUtilsManifest = buildPerlPackage rec { @@ -1358,11 +1358,11 @@ rec { }; }; - FileCopyRecursive = buildPerlPackage { - name = "File-Copy-Recursive-0.37"; + FileCopyRecursive = buildPerlPackage rec { + name = "File-Copy-Recursive-0.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.37.tar.gz; - sha256 = "12j0s01zwm67g4bcgbs0k61jwz59q1lndrnxyywxsz3xd30ki8rr"; + url = "mirror://cpan/authors/id/D/DM/DMUEY/${name}.tar.gz"; + sha256 = "1syyyvylr51iicialdmv0dw06q49xzv8zrkb5cn8ma4l73gvvk44"; }; }; @@ -1694,30 +1694,15 @@ rec { }; }; - IOCompressBase = buildPerlPackage rec { - name = "IO-Compress-Base-2.015"; + IOCompress = buildPerlPackage rec { + name = "IO-Compress-2.037"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "10njlwa50mhs5nqws5yidfmmb7hwmwc6x06gk2vnpyn82g3szgqd"; + url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + sha256 = "07hs3afzg9ry6ir2f9rf3fg8b129cihs989mr0nh9wdvxgxqmr1q"; }; - }; - - IOCompressBzip2 = buildPerlPackage rec { - name = "IO-Compress-Bzip2-2.015"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "1kfksf2bslfkviry228p07m1ksnf06mh8gkmdpbrmlmxlbs2idnc"; - }; - propagatedBuildInputs = [IOCompressBase CompressRawBzip2]; - }; - - IOCompressGzip = buildPerlPackage rec { - name = "IO-Compress-Zlib-2.015"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0sbnx6xdryaajwpssrfgm5b2zasa4ri8pihqwsx3rm5kmkgzy9cx"; - }; - propagatedBuildInputs = [IOCompressBase CompressRawZlib]; + propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; + # Work around a self-referencing Makefile variable. + makeFlags = "INSTALLARCHLIB=$(INSTALLSITEARCH)"; }; IODigest = buildPerlPackage { From 2872ccafd6cb858aa04fdfdbdfb76ef8db82d546 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Sep 2011 11:26:43 +0000 Subject: [PATCH 372/504] linux-3.1: Bump to r6 Not sure if kernel.org is ever coming back now... svn path=/nixpkgs/trunk/; revision=29303 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 8cd5381aec3..ff421bc9cf7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -200,13 +200,13 @@ in import ./generic.nix ( rec { - version = "3.1-rc5"; + version = "3.1-rc6"; - modDirVersion = "3.1.0-rc5"; + modDirVersion = "3.1.0-rc6"; src = fetchurl { url = "https://github.com/torvalds/linux/tarball/v${version}"; - sha256 = "1gs12hnkci1w21wwkpd9985ws6aldki6gzgdi4xmffcr4ypf1j4k"; + sha256 = "047a5qkcghn0q9b611vpdwbl87qb0k0q9x0bdpywlpy644l5dfwy"; name = "v${version}.tar.gz"; }; From 95ae45256a55ef4e0eed26253a7b3bbaa4a09d2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Sep 2011 18:17:20 +0000 Subject: [PATCH 373/504] haskell-get-options: the package doesn't build, because the upstream archive has vanished svn path=/nixpkgs/trunk/; revision=29308 --- .../libraries/haskell/get-options/default.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/get-options/default.nix diff --git a/pkgs/development/libraries/haskell/get-options/default.nix b/pkgs/development/libraries/haskell/get-options/default.nix deleted file mode 100644 index 01ae7575870..00000000000 --- a/pkgs/development/libraries/haskell/get-options/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{cabal, fetchurl, sourceFromHead, mtl}: - -cabal.mkDerivation (self : { - pname = "get-options"; - version = "x"; # ? - name = self.fname; - # REGION AUTO UPDATE: { name="getOptions"; type="darcs"; url = "http://repetae.net/john/repos/GetOptions"; } - src = sourceFromHead "getOptions-nrmtag1.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/getOptions-nrmtag1.tar.gz"; sha256 = "0e884687b2c676a5b7e79826a2236991cb045f794c5fd625813529a2b30224cd"; }); - # END - extraBuildInputs = [ mtl ]; - meta = { - description = "Simple to use get option library"; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2bb3c8f6d94..8c7b88aa75e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -577,8 +577,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {}; - getOptions = callPackage ../development/libraries/haskell/get-options {}; - ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; From 2f736e0ca01b0a0c0543c0bf080e81503f30560d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Sep 2011 18:19:15 +0000 Subject: [PATCH 374/504] haskell-Hipmunk: avoid build error in the haddock documentation svn path=/nixpkgs/trunk/; revision=29309 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 4bbe1f6498b..d1fb880ed1f 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "5.2.0.3"; sha256 = "1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m"; buildDepends = [ StateVar transformers ]; + noHaddock = true; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; description = "A Haskell binding for Chipmunk"; From 2d9c68fd28d8f08269f0b7bd2c8e703097db8109 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Sep 2011 18:25:23 +0000 Subject: [PATCH 375/504] tools/misc/myhasktags: fixed incorrect sha256 hash svn path=/nixpkgs/trunk/; revision=29310 --- pkgs/tools/misc/myhasktags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix index 3d00dfe54f4..8c5eb24af48 100644 --- a/pkgs/tools/misc/myhasktags/default.nix +++ b/pkgs/tools/misc/myhasktags/default.nix @@ -4,7 +4,7 @@ packageOverrides = { - haskellCollection = + haskellCollection = let hp = haskellPackages; install = [ hp.QuickCheck /* ... * /]; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { version = "0.0"; # Haskell Platform 2009.0.0 src = fetchurl { url = http://mawercer.de/~nix/hasktags.hs; - sha256 = "e5ce4c4e1f5916baf9395174978faee67a86ff5350936c82e115939812a4d579"; + sha256 = "0zdin03n357viyyqbn2d029jxd83nyazhaxbxfc8v3jrz5pkwl2c"; }; phases="buildPhase"; buildPhase = '' From 6ed0f99b705cb5960bea29b2c275b98a1619c3aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Sep 2011 18:29:32 +0000 Subject: [PATCH 376/504] haskell-helium: the package has disappeared from the upstream web server svn path=/nixpkgs/trunk/; revision=29311 --- pkgs/development/compilers/helium/builder.sh | 13 ------------- pkgs/development/compilers/helium/default.nix | 13 ------------- pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 28 deletions(-) delete mode 100644 pkgs/development/compilers/helium/builder.sh delete mode 100644 pkgs/development/compilers/helium/default.nix diff --git a/pkgs/development/compilers/helium/builder.sh b/pkgs/development/compilers/helium/builder.sh deleted file mode 100644 index e740690d9a6..00000000000 --- a/pkgs/development/compilers/helium/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -buildinputs="$ghc" -source $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd helium-* || exit 1 -cd lvm/src || exit 1 -./configure --prefix $out || exit 1 -cd ../../heliumNT || exit 1 -./configure --prefix=$out || exit 1 -cd src || exit 1 -make depend || exit 1 -make EXTRA_HC_OPTS=-O2 || exit 1 -make install diff --git a/pkgs/development/compilers/helium/default.nix b/pkgs/development/compilers/helium/default.nix deleted file mode 100644 index a2437d84535..00000000000 --- a/pkgs/development/compilers/helium/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, ghc}: - -assert ghc != null; - -stdenv.mkDerivation { - name = "helium-1.5"; - builder = ./builder.sh; - src = fetchurl { - url = http://www.cs.uu.nl/helium/distr/helium-1.5-src.tar.gz; - md5 = "b25fbee324a54059789eb1b4d62aa048"; - }; - inherit ghc; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8c7b88aa75e..0b5547db958 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1321,8 +1321,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); flapjax = callPackage ../development/compilers/flapjax {}; - helium = callPackage ../development/compilers/helium {}; - idris = callPackage ../development/compilers/idris {}; pakcs = callPackage ../development/compilers/pakcs { From fd68946fa87e967903aeba0a6dccbe99c349f932 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Sep 2011 19:15:06 +0000 Subject: [PATCH 377/504] * Bump the default Linux kernel to 2.6.35 (the most recent longterm stability kernel). svn path=/nixpkgs/trunk/; revision=29312 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add998fa303..9d9b5dc60be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5686,7 +5686,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_2_6_32; + linuxPackages = linuxPackages_2_6_35; keyutils = callPackage ../os-specific/linux/keyutils { }; From 98f6452a7077d38eb09af88a90739ab9950565a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 16 Sep 2011 20:50:24 +0000 Subject: [PATCH 378/504] Adding the gnunet 0.9 (svn), which works incompatible with the latest gnunet released. I updated some libs to get it built. svn path=/nixpkgs/trunk/; revision=29313 --- pkgs/applications/misc/freemind/default.nix | 6 +- .../networking/p2p/gnunet/0.9.nix | 79 +++++++++++++++++++ .../libraries/libextractor/default.nix | 4 +- .../libraries/libmicrohttpd/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 + 5 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/networking/p2p/gnunet/0.9.nix diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index dd6f205eca8..24071d3c683 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }: stdenv.mkDerivation { - name = "freemind-0.9.0_RC_6"; + name = "freemind-0.9.0"; src = fetchurl { - url = mirror://sourceforge/freemind/freemind-src-0.9.0_RC_6.tar.gz; - sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf"; + url = mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz; + sha256 = "1qd535gwx00d8z56mplxli5529yds2gsmbgla5b0bhhmsdwmrxmf"; }; buildInputs = [ jdk ant ]; diff --git a/pkgs/applications/networking/p2p/gnunet/0.9.nix b/pkgs/applications/networking/p2p/gnunet/0.9.nix new file mode 100644 index 00000000000..96dcfc746b4 --- /dev/null +++ b/pkgs/applications/networking/p2p/gnunet/0.9.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt +, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +, libxml2, ncurses, gettext, findutils +, autoconf, automake +, gtkSupport ? false, gtk ? null, libglade ? null +, makeWrapper }: + +assert gtkSupport -> (gtk != null) && (libglade != null); + +let + rev = "16910"; + version = "0.9-svn-${rev}"; +in + stdenv.mkDerivation { + name = "gnunet-${version}"; + + src = fetchsvn { + url = "https://gnunet.org/svn/gnunet"; + sha256 = "1jxvh3wvhss0pn286p848zifc8f9pkhcb12m2bpkssh409wwyzkd"; + inherit rev; + }; + + buildInputs = [ + libextractor libmicrohttpd libgcrypt gmp curl libtool + zlib adns sqlite libxml2 ncurses + pkgconfig gettext findutils + autoconf automake + makeWrapper + ] ++ (if gtkSupport then [ gtk libglade ] else []); + + preConfigure = '' + # Brute force: since nix-worker chroots don't provide + # /etc/{resolv.conf,hosts}, replace all references to `localhost' + # by their IPv4 equivalent. + for i in $(find . \( -name \*.c -or -name \*.conf \) \ + -exec grep -l localhost {} \;) + do + echo "$i: substituting \`127.0.0.1' to \`localhost'..." + substituteInPlace "$i" --replace "localhost" "127.0.0.1" + done + + # Make sure the tests don't rely on `/tmp', for the sake of chroot + # builds. + for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ + -exec grep -l /tmp {} \;) + do + echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." + substituteInPlace "$i" --replace "/tmp" "$TMPDIR" + done + + autoreconf -vfi + ''; + + meta = { + description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + + longDescription = '' + GNUnet is a framework for secure peer-to-peer networking that + does not use any centralized or otherwise trusted services. A + first service implemented on top of the networking layer + allows anonymous censorship-resistant file-sharing. Anonymity + is provided by making messages originating from a peer + indistinguishable from messages that the peer is routing. All + peers act as routers and use link-encrypted connections with + stable bandwidth utilization to communicate with each other. + GNUnet uses a simple, excess-based economic model to allocate + resources. Peers in GNUnet monitor each others behavior with + respect to resource usage; peers that contribute to the + network are rewarded with better service. + ''; + + homepage = http://gnunet.org/; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; + }; + } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index a134fbacf0b..b532f3283d4 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -2,11 +2,11 @@ , ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }: stdenv.mkDerivation rec { - name = "libextractor-0.5.23"; + name = "libextractor-0.6.2"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1zyfshayjrp7kd87pm7blyq0dvbv5bbh3f368pp4jws4qxs8aj9f"; + sha256 = "1pyh599717vjblyjch95r76afdxfhrzqr7nx1pz1davy5fpsw5aw"; }; preConfigure = diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index ed213c75959..90888ce0961 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, curl}: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.4.4"; + name = "libmicrohttpd-0.9.9"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "1w486b4hpwnzpc4zdywm3f1q5zs7j4yh7xibbsig6b8cv1npn0rz"; + sha256 = "0059isy80cmxv44dhngnsc4g25kwxdcfis5yrva199r0vnb8ab6c"; }; buildInputs = [ curl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d9b5dc60be..8344f682215 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6633,6 +6633,8 @@ let gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true; }; + gnunet09 = lowPrio (callPackage ../applications/networking/p2p/gnunet/0.9.nix { }); + gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { From 8a904741f846fa27672bf50d4512ef11fb954e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Sep 2011 10:09:26 +0000 Subject: [PATCH 379/504] gnupdate: Support `meta.homepage' as a string list. * maintainers/scripts/gnu/gnupdate (gnu?): Improve type-checking of `meta.homepage'; support string lists. svn path=/nixpkgs/trunk/; revision=29315 --- maintainers/scripts/gnu/gnupdate | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index ef42fa02bed..96517f86cb8 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -715,8 +715,10 @@ Return #t if the signature was good, #f otherwise." (match attr (('attribute _ "description" value) (string-prefix? "GNU" value)) - (('attribute _ "homepage" value) + (('attribute _ "homepage" (? string? value)) (string-contains value "www.gnu.org")) + (('attribute _ "homepage" ((? string? value) ...)) + (any (cut string-contains <> "www.gnu.org") value)) (_ #f))) metas)) (_ #f))) From 4fe98cdc02f826e05d9ce82e5f048268524d4a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Sep 2011 10:09:33 +0000 Subject: [PATCH 380/504] GNU GLOBAL 6.0. svn path=/nixpkgs/trunk/; revision=29316 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 6ef449b3c2a..93d3641de72 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libtool, ncurses }: stdenv.mkDerivation rec { - name = "global-5.9.7"; + name = "global-6.0"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "1vhsa44fxmgc41l7gw904dhdq0kl0xw16wb9n8r22bw0nmfad5z8"; + sha256 = "1nwhlxd97grq8ynw7szv5lcxiqgqifiy1jqaa45664hd6bv1i5xx"; }; buildInputs = [ libtool ncurses ]; From e15f102b5f25515f9d60e18c342ee078582122a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Sep 2011 10:09:39 +0000 Subject: [PATCH 381/504] GNU wdiff 1.0.1. svn path=/nixpkgs/trunk/; revision=29317 --- pkgs/tools/text/wdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index a517991d99e..5f1fe24bc83 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, which, screen }: let - name = "wdiff-1.0.0"; + name = "wdiff-1.0.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://gnu/wdiff/${name}.tar.gz"; - sha256 = "00p0yww8dfszzhbwkfl4v5l9r55v9qznx3p089l2m2drjb1ahp3v"; + sha256 = "1jyg8vmdlazpcwii8a1ddbc0sxcklp9cvj5y0x9zqaybvwzg9r4l"; }; # Required for the compile-time for the test suite. From 5583e6f741110d445d341eb5d267ae72e0ace2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Sep 2011 10:09:48 +0000 Subject: [PATCH 382/504] GNU Linear Programming Kit 4.47. svn path=/nixpkgs/trunk/; revision=29318 --- pkgs/development/libraries/glpk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 5b3d51d1976..edfbc0e86d7 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.46"; + name = "glpk-4.47"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "0hijkq44yxbq017wxqh441zz2rpdap6x1brp122i6s7hca147gpv"; + sha256 = "13gl75w9dqh1a83v8wvlz9ychwljhy26n3l16r9dia3lpbikhm63"; }; doCheck = true; From 95f7c02feb44857131aa564b8465fbc88ae5aefe Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 17 Sep 2011 12:54:46 +0000 Subject: [PATCH 383/504] tools/system/gptfdisk: Updated to 0.8.0. svn path=/nixpkgs/trunk/; revision=29319 --- pkgs/tools/system/gptfdisk/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index bc32b29b33f..35c510f625c 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, libuuid, popt, icu }: +{ fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-0.7.1"; + name = "gptfdisk-0.8.0"; src = fetchurl { - url = "http://www.rodsbooks.com/gdisk/${name}.tgz"; - sha256 = "142mrlcaprh7a6r55wvaxpvjmkffh7w8lcagarmwq4cfibfrnwd8"; + url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; + sha256 = "096qmlqcsvjklihggwphdmd0y78jz4ghf7gf4fvjnskp7mg4ng31"; }; - buildInputs = [ libuuid popt icu ]; + buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' ensureDir $out/sbin From 195831a3bf032096afaa11d09f1b121d9fffa95b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 17 Sep 2011 13:35:09 +0000 Subject: [PATCH 384/504] haskell-dimensional: updated to version 0.10.1.2 svn path=/nixpkgs/trunk/; revision=29321 --- pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index a8943965ab7..35b5a8d2440 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.10.1.1"; - sha256 = "198ynnls5l25q6igbhgd892cp1hvzca3wbgsmfxzlmcwmihhp8p9"; + version = "0.10.1.2"; + sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From 9d5848cb99725fec055219abcc02f6aa90998502 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 17 Sep 2011 13:35:15 +0000 Subject: [PATCH 385/504] haskell-unordered-containers: updated to version 0.1.4.3 svn path=/nixpkgs/trunk/; revision=29322 --- .../libraries/haskell/unordered-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index b007d137d60..096fb1932ac 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.1.4.2"; - sha256 = "0nfw82zng9y5dinjn78k05i4c4bjc1y6yb2dwqwczb85hbrqiha6"; + version = "0.1.4.3"; + sha256 = "0zya72777bnmiw77rqn8k2a0g7g3j0fzpk409qb827qs3j1ffikg"; buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; From c0204a42b9249dd68b6fbe36ccb6ae730fdb88db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 17 Sep 2011 13:42:38 +0000 Subject: [PATCH 386/504] haskell-hp2any-graph: regenerated expression with latest version of cabal2nix svn path=/nixpkgs/trunk/; revision=29323 --- pkgs/development/libraries/haskell/hp2any-graph/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index a1cd26cbaf5..5c035be0b02 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -1,4 +1,6 @@ -{ cabal, freeglut, GLUT, hp2anyCore, network, OpenGL, parseargs }: +{ cabal, freeglut, GLUT, hp2anyCore, mesa, network, OpenGL +, parseargs +}: cabal.mkDerivation (self: { pname = "hp2any-graph"; @@ -7,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ]; - extraLibraries = [ freeglut ]; + extraLibraries = [ freeglut mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; From 051b50143af6a40d360ba2469ea60b6ab82f39cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 17 Sep 2011 13:45:06 +0000 Subject: [PATCH 387/504] haskell-cabal2nix: updated to version 1.16 svn path=/nixpkgs/trunk/; revision=29324 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index e2da82d36c7..df80332ba4b 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.15"; - sha256 = "0v2xnr8fp0bpv4cmd4q01p293zz4zg9kvhd4sr9ar3amj9vjhsk7"; + version = "1.16"; + sha256 = "02gffdc6q7xfaglx4rf0vc7784zmdnfklh88si83qcrz15wzgp2k"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From cca42b5cc08aaf3ab928f6eaa5ef50ad74a83ddc Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 17 Sep 2011 16:29:40 +0000 Subject: [PATCH 388/504] development/interpreters/python/2.7: Fix building on Linux 3.x (iirc, that was the problem). svn path=/nixpkgs/trunk/; revision=29325 --- pkgs/development/interpreters/python/2.7/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 483a7e5fc00..4ba380436bb 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -30,6 +30,12 @@ let ./nix-store-mtime.patch ]; + postPatch = '' + substituteInPlace ./Lib/plat-generic/regen \ + --replace /usr/include/netinet/in.h \ + ${stdenv.gcc.libc}/include/netinet/in.h + ''; + buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ [ bzip2 ] @@ -49,7 +55,7 @@ let python = stdenv.mkDerivation { name = "python-${version}"; - inherit majorVersion version src patches buildInputs; + inherit majorVersion version src patches postPatch buildInputs; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); @@ -110,7 +116,7 @@ let stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches; + inherit src patches postPatch; buildInputs = [ python ] ++ deps; From f7567f8717263036c267bd27095de69069d403ca Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 17 Sep 2011 17:40:07 +0000 Subject: [PATCH 389/504] misc/screensavers/slock: New nixpkg. svn path=/nixpkgs/trunk/; revision=29326 --- pkgs/misc/screensavers/slock/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/misc/screensavers/slock/default.nix diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix new file mode 100644 index 00000000000..acd8aa69905 --- /dev/null +++ b/pkgs/misc/screensavers/slock/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, xproto, libX11, libXext }: +stdenv.mkDerivation rec { + name = "slock-0.9"; + src = fetchurl { + url = "http://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "1gfp2ic2i63yz8wrf5cqzv9g422j9qs249y7g4chq0brpcybgpc9"; + }; + buildInputs = [ xproto libX11 libXext ]; + installFlags = "DESTDIR=\${out} PREFIX="; + meta = { + homepage = http://tools.suckless.org/slock; + description = "Simple X display locker"; + longDescription = '' + Simple X display locker. This is the simplest X screen locker. + ''; + license = "bsd"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8344f682215..d6370faae67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8360,6 +8360,8 @@ let saneFrontends = callPackage ../misc/sane-front { }; + slock = callPackage ../misc/screensavers/slock { }; + sourceAndTags = import ../misc/source-and-tags { inherit pkgs stdenv unzip lib ctags; hasktags = haskellPackages.myhasktags; From 2cc9e52aec6fb444d84ff1a8cee7bf47fd262c91 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 17 Sep 2011 18:52:28 +0000 Subject: [PATCH 390/504] python-2.7: Attempt to fix the nixpkgs evaluation error svn path=/nixpkgs/trunk/; revision=29327 --- pkgs/development/interpreters/python/2.7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 4ba380436bb..1c8ae0cf171 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -30,7 +30,7 @@ let ./nix-store-mtime.patch ]; - postPatch = '' + postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' substituteInPlace ./Lib/plat-generic/regen \ --replace /usr/include/netinet/in.h \ ${stdenv.gcc.libc}/include/netinet/in.h From 820e9ee753fe6d05d904edfe32fced29414c93d8 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 17 Sep 2011 19:19:45 +0000 Subject: [PATCH 391/504] applications/networking/browsers/firefox/6.0.nix: Fix building on Linux 3.x. svn path=/nixpkgs/trunk/; revision=29328 --- pkgs/applications/networking/browsers/firefox/6.0.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix index 6842f4bf861..df205a64fb5 100644 --- a/pkgs/applications/networking/browsers/firefox/6.0.nix +++ b/pkgs/applications/networking/browsers/firefox/6.0.nix @@ -78,9 +78,10 @@ rec { }' ';' ''; - # !!! Temporary hack. + # !!! Temporary hacks. preBuild = '' + ln -s Linux2.6.mk security/coreconf/Linux3.0.mk export NIX_ENFORCE_PURITY= ''; From ebe4a3501cf1d15aa13f67d873fe431cdc9684c5 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 17 Sep 2011 20:05:03 +0000 Subject: [PATCH 392/504] applications/networking/browsers/conkeror: Updated to 1.0pre-20110917. svn path=/nixpkgs/trunk/; revision=29329 --- pkgs/applications/networking/browsers/conkeror/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 2bf25ccd546..e9c1c926ba4 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "conkeror-0.9.3-20110606"; + name = "conkeror-1.0pre-20110917"; src = fetchurl { - url = http://repo.or.cz/w/conkeror.git/snapshot/0d883dfd5e61e7d0b8a96a079d69b46af064fdca.zip; - sha256 = "0h21fw78iq4hljy5p98mpy0wgd5wpx9a0jdwv7l5wrds5vp23dhh"; + url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip; + sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2"; }; buildInputs = [ unzip ]; installPhase = '' From 4cfef74977b78e8627c79473cb6cb9aa8f1ef861 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 17 Sep 2011 20:24:54 +0000 Subject: [PATCH 393/504] applications/misc/sakura: Updated to 2.4.2. svn path=/nixpkgs/trunk/; revision=29330 --- pkgs/applications/misc/sakura/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 0121c17aace..e1492a47691 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }: stdenv.mkDerivation rec { - name = "sakura-2.4.0"; + name = "sakura-${version}"; + version = "2.4.2"; src = fetchurl { - url = "http://www.pleyades.net/david/projects/sakura/${name}.tar.bz2"; - sha256 = "12k9ra5b3vgslry5wc40lf4a64mh3p9wy7qfirr8alyvgvw2pb0h"; + url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; + sha256 = "1mpsjsk7dgz56h7yagd9aq0d92vj59yrz4ri6za3mfmglhn29rn5"; }; buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ]; meta = { From 7b8f4ec5403112e18fec607467c4c2ac57812e27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 18 Sep 2011 08:28:29 +0000 Subject: [PATCH 394/504] git-annex: updated to version 3.20110915 svn path=/nixpkgs/trunk/; revision=29331 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 5ef5cd98cb1..848214b0fb9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20110902"; + version = "3.20110915"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "1flw3472g19v6ins1nv66m51w15131013077yvfh2blywm0pqrl0"; + sha256 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47"; }; buildInputs = [ From 595d141a3097eb5dcacecdcd797e6b2a7eb896e8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 18 Sep 2011 13:54:54 +0000 Subject: [PATCH 395/504] avahi-0.6.30 svn path=/nixpkgs/trunk/; revision=29332 --- pkgs/development/libraries/avahi/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 709ea3583dc..7730e403d58 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,33 +1,32 @@ { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser -, expat, gettext, intltool, glib, gtk, qt4 ? null, lib +, expat, gettext, intltool, glib, qt4 ? null, lib , qt4Support ? false -, withLibdnsCompat ? false }: +, withLibdnssdCompat ? false }: assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-0.6.28"; + name = "avahi-0.6.30"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "14gw611d3srn2r18a6g4y04r571w3l4lihiiaffryar1i2n0mn50"; + sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r"; }; patches = [ ./no-mkdir-localstatedir.patch ]; - buildInputs = [ - pkgconfig libdaemon dbus perl perlXMLParser glib expat - gettext intltool - ] + buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ] ++ (lib.optional qt4Support qt4); + buildNativeInputs = [ pkgconfig gettext intltool ]; + configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" "--disable-gtk" "--disable-gtk3" "--${if qt4Support then "enable" else "disable"}-qt4" "--disable-python" "--with-distro=none" "--localstatedir=/var" - ] ++ stdenv.lib.optional withLibdnsCompat "--enable-compat-libdns_sd"; + ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"; meta = { description = "Avahi, an mDNS/DNS-SD implementation"; From 19769280f68f48fd541f3a3e345810959982765b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 18 Sep 2011 14:56:46 +0000 Subject: [PATCH 396/504] git-subtree: updated to version 0.4-2-g2793ee6 svn path=/nixpkgs/trunk/; revision=29333 --- .../git-and-tools/default.nix | 21 ++------------- .../git-and-tools/git-subtree/default.nix | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/git-subtree/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 52ff83317d1..7513a7adbc7 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -104,24 +104,7 @@ rec { inherit stdenv fetchgit qt47 subversion apr; }; - gitSubtree = stdenv.mkDerivation { - name = "git-subtree-0.4"; - src = fetchurl { - url = "http://github.com/apenwarr/git-subtree/tarball/v0.4"; -# sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr"; - sha256 = "19s8352igwh7x1nqgdfs7rgxahw9cnfv7zmpzpd63m1r3l2945d4"; - }; - unpackCmd = "gzip -d < $curSrc | tar xvf -"; - buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; - configurePhase = "export prefix=$out"; - buildPhase = "true"; - installPhase = '' - make install prefix=$out gitdir=$out/bin #work around to deal with a wrong makefile - ''; - meta= { - description = "An experimental alternative to the git-submodule command"; - homepage = http://github.com/apenwarr/git-subtree; - license = "GPLv2"; - }; + gitSubtree = import ./git-subtree { + inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix new file mode 100644 index 00000000000..dd00572b150 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }: + +stdenv.mkDerivation { + name = "git-subtree-0.4-2-g2793ee6"; + + src = fetchurl { + url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974"; + sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6"; + name = "git-subtree-0.4-2-g2793ee6.tar.gz"; + }; + + buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; + + configurePhase = "export prefix=$out"; + + buildPhase = "true"; + + installPhase = "make install prefix=$out gitdir=$out/bin"; + + meta= { + description = "experimental alternative to the git-submodule command"; + homepage = http://github.com/apenwarr/git-subtree; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.gnu; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} From 3251b876be32dafeeea4c450151d22bc82d7dff1 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 18 Sep 2011 22:48:08 +0000 Subject: [PATCH 397/504] applications/misc/xmobar: Enabled freetype fonts support. svn path=/nixpkgs/trunk/; revision=29334 --- pkgs/applications/misc/xmobar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 8271049861e..89265fd7f67 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, parsec, stm, time, utf8String, X11 }: +{ cabal, mtl, parsec, stm, time, utf8String, X11, X11Xft }: cabal.mkDerivation (self: { pname = "xmobar"; @@ -6,7 +6,8 @@ cabal.mkDerivation (self: { sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl parsec stm time utf8String X11 ]; + buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ]; + configureFlags = "--flags=with_xft"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From 5565ec4eeca39a06c7b12212980838ad1ff37451 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 05:16:02 +0000 Subject: [PATCH 398/504] Remove unused gtkLibs220 svn path=/nixpkgs/trunk/; revision=29337 --- pkgs/top-level/all-packages.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6370faae67..e6212d61c4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3535,24 +3535,6 @@ let }); - gtkLibs220 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs220; in { - - glib = callPackage ../development/libraries/glib/2.24.x.nix { }; - - glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { }; - - atk = callPackage ../development/libraries/atk/1.30.x.nix { }; - - pango = callPackage ../development/libraries/pango/1.28.x.nix { }; - - pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/2.20.x.nix { }; - - gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { }; - - }); - gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { glib = callPackage ../development/libraries/glib/2.28.x.nix { }; From ef664e90a081d0ac66fe0f43007de53a60e3f812 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 05:16:11 +0000 Subject: [PATCH 399/504] Re-enable ntrack support in KDE-4.7 It seems that the patches applied to ntrack in r29105 fixed the problem. svn path=/nixpkgs/trunk/; revision=29338 --- pkgs/desktops/kde-4.7/kde-runtime.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix index dd2ddab6c61..96b6c3a1c78 100644 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kde-runtime.nix @@ -1,13 +1,11 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica -, libcanberra, virtuoso, samba +, libcanberra, virtuoso, samba, ntrack }: -# TODO: Re-enable ntrack once it is fixed upstream - kde { buildInputs = [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica - samba (libcanberra.override { gtk = null; }) + samba (libcanberra.override { gtk = null; }) ntrack ]; passthru.propagatedUserEnvPackages = [ virtuoso ]; From fa506acf29f9a6accb72c9a51df220b8d0b08d37 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 05:16:32 +0000 Subject: [PATCH 400/504] comical: build with wxGTK28 svn path=/nixpkgs/trunk/; revision=29339 --- .../applications/graphics/comical/default.nix | 14 ++++---- .../graphics/comical/wxgtk-2.8.patch | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/graphics/comical/wxgtk-2.8.patch diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 4cce7fde4e0..68910e67e25 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,19 +1,17 @@ {stdenv, fetchurl, wxGTK, utillinux, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "comical-0.8"; src = fetchurl { - url = mirror://sourceforge/comical/comical-0.8.tar.gz; + url = "mirror://sourceforge/comical/${name}.tar.gz"; sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; }; buildInputs = [ wxGTK utillinux zlib ]; - patchPhase = '' - sed -i -e 's@"zlib\\.h"@@' unzip/unzip.h - sed -i -e 's@/usr/local@'$out@ \ - -e 's@-lminiunzip@-lminiunzip -lz@' Makefile - ''; + preBuild="makeFlags=\"prefix=$out\""; - installPhase = "mkdir -p $out/bin ; make install"; + patches = [ ./wxgtk-2.8.patch ]; + + preInstall = "mkdir -pv $out/bin"; meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; diff --git a/pkgs/applications/graphics/comical/wxgtk-2.8.patch b/pkgs/applications/graphics/comical/wxgtk-2.8.patch new file mode 100644 index 00000000000..db7626074a0 --- /dev/null +++ b/pkgs/applications/graphics/comical/wxgtk-2.8.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile b/Makefile +index a648e72..181c47f 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + CC = `wx-config --cxx` +-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip ++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz + INSTALL = install + INSTALL_PROGRAM = $(INSTALL) + prefix = /usr/local +diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp +index 0c004cd..667e75e 100644 +--- a/src/ComicalApp.cpp ++++ b/src/ComicalApp.cpp +@@ -28,6 +28,7 @@ + #include "ComicalApp.h" + #include "ComicalFrame.h" + #include ++#include + + #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__) + #include "../Comical Icons/comical.xpm" +diff --git a/unzip/unzip.h b/unzip/unzip.h +index b247937..5bb6a69 100644 +--- a/unzip/unzip.h ++++ b/unzip/unzip.h +@@ -50,7 +50,7 @@ extern "C" { + #endif + + #ifndef _ZLIB_H +-#include "zlib.h" ++#include + #endif + + #ifndef _ZLIBIOAPI_H diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6212d61c4c..efd27b13a13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6276,9 +6276,7 @@ let python = pythonFull; }; - comical = callPackage ../applications/graphics/comical { - wxGTK = wxGTK26; - }; + comical = callPackage ../applications/graphics/comical { }; conkeror = xulrunnerWrapper { launcher = "conkeror"; From a5864633f305a3adf105ffcf6b8a73772bfe9fdb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 05:16:49 +0000 Subject: [PATCH 401/504] SDL_net: propagate sdl svn path=/nixpkgs/trunk/; revision=29340 --- pkgs/development/libraries/SDL_net/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index cbca42ef5df..38ac82537f7 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53"; }; - buildInputs = [SDL]; + propagatedBuildInputs = [SDL]; postInstall = "ln -s $out/include/SDL/SDL_net.h $out/include/"; From de2105b74024f33cc09dda31f5085cd3ec03923c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 05:17:00 +0000 Subject: [PATCH 402/504] scorched3d: latest version, build against wxgtk-2.8 svn path=/nixpkgs/trunk/; revision=29341 --- pkgs/games/scorched3d/default.nix | 39 +++++++------ .../scorched3d/scorched3d-42.1-fixups.patch | 58 ------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 22 insertions(+), 76 deletions(-) delete mode 100644 pkgs/games/scorched3d/scorched3d-42.1-fixups.patch diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 18a86f2d85c..63fae5df0fc 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,29 +1,34 @@ {stdenv, fetchurl, mesa, openal, autoconf, automake, libtool, freealut, wxGTK, -freetype, fftw, SDL, SDL_net, zlib, libpng, libjpeg} : +freetype, fftwSinglePrec, SDL, SDL_net, zlib, libpng, libjpeg, pkgconfig, libogg, +libvorbis} : stdenv.mkDerivation { - name = "scorched3d-42.1"; + name = "scorched3d-43.2a"; src = fetchurl { - url = mirror://sourceforge/scorched3d/Scorched3D-42.1-src.tar.gz; - sha256 = "0vhhi68ii5ldxbacsiqccsascrn3q033hnaa1ha8r9gxspzcqkl8"; + url = mirror://sourceforge/scorched3d/Scorched3D-43.2a-src.tar.gz; + sha256 = "1hv1mnfb7y51hqmg95l8rx00j66ff32ddxxi5zgfyw92hsvahgxi"; }; - buildInputs = [ mesa openal autoconf automake libtool freealut wxGTK - freetype fftw SDL SDL_net zlib libpng libjpeg ]; + buildInputs = + [ mesa openal freealut wxGTK freetype fftwSinglePrec SDL_net zlib libpng libjpeg + libogg libvorbis ]; - unpackPhase = "tar xvzf $src ; cd scorched"; + buildNativeInputs = [ pkgconfig ]; - patches = [ ./scorched3d-42.1-fixups.patch ./file-existence.patch ]; + patches = [ ./file-existence.patch ]; - preConfigure = '' - set +e - aclocal - libtoolize --copy --force - autoconf - automake - libtoolize - set -e - ''; + sourceRoot = "scorched"; + + configureFlags = "--with-fftw=${fftwSinglePrec}"; + +# Fake openal-config + preConfigure = + '' + mkdir -pv mybin + export PATH=$PATH:$PWD/mybin + echo -e "#!/bin/sh\npkg-config openal \"$@\"" > mybin/openal-config + chmod +x mybin/openal-config + ''; meta = { homepage = http://scorched3d.co.uk/; diff --git a/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch b/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch deleted file mode 100644 index 36a027cb60c..00000000000 --- a/pkgs/games/scorched3d/scorched3d-42.1-fixups.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4 ---- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500 -@@ -7,25 +7,9 @@ - [ --disable-openaltest Do not try to compile and run a test OpenAL program], - , enable_openaltest=yes) - AC_MSG_CHECKING(for OpenAL support) --AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) --if test x$OPENAL_CONFIG = xno; then -- echo "*** The openal-config script installed by OpenAL could not be found" -- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" -- echo "*** environment variable to the full path to openal-config." -- -- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/]) --else -- -- if test x"$use_static_openal" = x"yes"; then -- AL_LIBS="/usr/local/lib/libopenal.a" -- else -- AL_LIBS="`$OPENAL_CONFIG --libs`" -- fi -- -- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" -- -- AC_MSG_RESULT(yes) --fi -+AL_LIBS="-lopenal" -+AL_CFLAGS="-I/usr/include/AL" -+AC_MSG_RESULT(yes) - - AC_MSG_CHECKING(for Freealut support) - AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) -diff -ru scorched.orig/configure.ac scorched/configure.ac ---- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure.ac 2009-02-15 20:40:30.000000000 -0500 -@@ -13,22 +13,6 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - --LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6" --CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6" -- --if test `uname` == Darwin; then --LDFLAGS="$LDFLAGS -lmx" --CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" --else --LDFLAGS="$LDFLAGS -L/usr/local/lib" --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ -- echo "Warning: No beer found in fridge!"; -- echo "We highly suggest that you rectify this situation immediately." --]) -- - AC_ARG_ENABLE(serveronly, - [ --enable-serveronly Enable server only compilation], - , enable_serveronly=no, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efd27b13a13..ebef833c06c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7671,7 +7671,6 @@ let scummvm = callPackage ../games/scummvm { }; scorched3d = callPackage ../games/scorched3d { - wxGTK = wxGTK26; }; sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) { From 63959f2a5aa7a337b569ed8a3b6a0a236100b1f2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 08:35:30 +0000 Subject: [PATCH 403/504] Let poppler use ${POPPLER_DATADIR} Also upgrade poppler-data svn path=/nixpkgs/trunk/; revision=29342 --- pkgs/data/misc/poppler-data/default.nix | 17 +++-- .../libraries/poppler/datadir_env.patch | 65 ++++--------------- .../development/libraries/poppler/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 24 insertions(+), 62 deletions(-) diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index b121d30824e..14a41cf84fc 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,20 +1,23 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.3"; + name = "poppler-data-0.4.5"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "19jq5miinzzrzlv6696j82hr60ga2r4msk6a34s9537vid410q22"; + sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i"; }; buildInputs = [ cmake ]; - postInstall = '' - ensureDir ''${out}/etc/profile.d - echo "export POPPLER_DATADIR=''${out}/share/poppler" > \ - ''${out}/etc/profile.d/60-poppler.sh - ''; +# TODO: actually use $prefix/etc/profile.d in NixOS + postInstall = + '' + mkdir -pv ''${out}/etc/profile.d + echo "export POPPLER_DATADIR=''${out}/share/poppler" | + tee ''${out}/etc/profile.d/60-poppler.sh + chmod -c +x ''${out}/etc/profile.d/60-poppler.sh + ''; meta = { homepage = http://poppler.freedesktop.org/; diff --git a/pkgs/development/libraries/poppler/datadir_env.patch b/pkgs/development/libraries/poppler/datadir_env.patch index dfe024a5b23..fd111d71355 100644 --- a/pkgs/development/libraries/poppler/datadir_env.patch +++ b/pkgs/development/libraries/poppler/datadir_env.patch @@ -1,56 +1,13 @@ -diff -ur poppler-0.6.1/poppler/GlobalParams.cc poppler-0.6.1-patched/poppler/GlobalParams.cc ---- poppler-0.6.1/poppler/GlobalParams.cc 2007-09-17 20:37:58.000000000 +0200 -+++ poppler-0.6.1-patched/poppler/GlobalParams.cc 2007-11-06 16:11:55.995595933 +0100 -@@ -654,27 +654,39 @@ +diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc +index 2e11bb0..a277ab9 100644 +--- a/poppler/GlobalParams.cc ++++ b/poppler/GlobalParams.cc +@@ -748,7 +748,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir) + void GlobalParams::scanEncodingDirs() { GDir *dir; GDirEntry *entry; - -- dir = new GDir(POPPLER_DATADIR "/nameToUnicode", gFalse); -+ GooString *real_datadir = new GooString (getenv("POPPLER_DATADIR")); -+ if (!real_datadir->getCString()) -+ real_datadir->Set(POPPLER_DATADIR); -+ GooString *dirname; -+ -+ dirname = real_datadir->copy(); -+ dir = new GDir(dirname->append("/nameToUnicode")->getCString(), gFalse); - while (entry = dir->getNextEntry(), entry != NULL) { - parseNameToUnicode(entry->getFullPath()); - delete entry; - } - delete dir; -+ delete dirname; - -- dir = new GDir(POPPLER_DATADIR "/cidToUnicode", gFalse); -+ dirname = real_datadir->copy(); -+ dir = new GDir(dirname->append("/cidToUnicode")->getCString(), gFalse); - while (entry = dir->getNextEntry(), entry != NULL) { - addCIDToUnicode(entry->getName(), entry->getFullPath()); - delete entry; - } - delete dir; -+ delete dirname; - -- dir = new GDir(POPPLER_DATADIR "/unicodeMap", gFalse); -+ dirname = real_datadir->copy(); -+ dir = new GDir(dirname->append("/unicodeMap")->getCString(), gFalse); - while (entry = dir->getNextEntry(), entry != NULL) { - addUnicodeMap(entry->getName(), entry->getFullPath()); - delete entry; - } - delete dir; -+ delete dirname; - -+ dirname = real_datadir->copy(); - dir = new GDir(POPPLER_DATADIR "/cMap", gFalse); - while (entry = dir->getNextEntry(), entry != NULL) { - addCMapDir(entry->getName(), entry->getFullPath()); -@@ -682,6 +694,9 @@ - delete entry; - } - delete dir; -+ delete dirname; -+ -+ delete real_datadir; - } - - void GlobalParams::parseNameToUnicode(GooString *name) { +- const char *dataRoot = popplerDataDir ? popplerDataDir : POPPLER_DATADIR; ++ const char *dataRoot = popplerDataDir ? popplerDataDir : ( getenv("POPPLER_DATADIR") ? getenv("POPPLER_DATADIR") : POPPLER_DATADIR ); + + // allocate buffer large enough to append "/nameToUnicode" + size_t bufSize = strlen(dataRoot) + strlen("/nameToUnicode") + 1; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3091c6497e5..bb19338cc88 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; + patches = [ ./datadir_env.patch ]; + # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files # such as `../../../test/unittestcases/UseNone.pdf'. #doCheck = !qt4Support; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebef833c06c..a8e69f34a72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6080,7 +6080,7 @@ let iana_etc = callPackage ../data/misc/iana-etc { }; - popplerData = callPackage ../data/misc/poppler-data { }; + poppler_data = callPackage ../data/misc/poppler-data { }; r3rs = callPackage ../data/documentation/rnrs/r3rs.nix { }; From 071700bcbc8f4a9e9e742627b9555f3076516c17 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 10:03:14 +0000 Subject: [PATCH 404/504] Remove unused files svn path=/nixpkgs/trunk/; revision=29343 --- pkgs/development/libraries/atk/1.30.x.nix | 33 --------------- pkgs/development/libraries/glib/2.24.x.nix | 34 --------------- pkgs/development/libraries/gtk+/2.20.x.nix | 49 ---------------------- 3 files changed, 116 deletions(-) delete mode 100644 pkgs/development/libraries/atk/1.30.x.nix delete mode 100644 pkgs/development/libraries/glib/2.24.x.nix delete mode 100644 pkgs/development/libraries/gtk+/2.20.x.nix diff --git a/pkgs/development/libraries/atk/1.30.x.nix b/pkgs/development/libraries/atk/1.30.x.nix deleted file mode 100644 index 4f370fd7a2b..00000000000 --- a/pkgs/development/libraries/atk/1.30.x.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib }: - -stdenv.mkDerivation rec { - name = "atk-1.30.0"; - - src = fetchurl { - url = "mirror://gnome/sources/atk/1.30/${name}.tar.bz2"; - sha256 = "92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c"; - }; - - buildInputs = [ pkgconfig perl ]; - propagatedBuildInputs = [ glib ]; - - meta = { - description = "ATK, the accessibility toolkit"; - - longDescription = '' - ATK is the Accessibility Toolkit. It provides a set of generic - interfaces allowing accessibility technologies such as screen - readers to interact with a graphical user interface. Using the - ATK interfaces, accessibility tools have full access to view and - control running applications. - ''; - - homepage = http://library.gnome.org/devel/atk/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix deleted file mode 100644 index db7dbdd5c18..00000000000 --- a/pkgs/development/libraries/glib/2.24.x.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }: - -stdenv.mkDerivation rec { - name = "glib-2.24.2"; - - src = fetchurl { - url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2"; - sha256 = "030nl16xa2ps9bklm2l81w0yamsrj5a0x7rp4h9dshinpld55srs"; - }; - - buildInputs = [ pkgconfig gettext ] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl ]; - - propagatedBuildInputs = [ zlib ]; - - meta = { - description = "GLib, a C library of programming buildings blocks"; - - longDescription = '' - GLib provides the core application building blocks for libraries - and applications written in C. It provides the core object - system used in GNOME, the main loop implementation, and a large - set of utility functions for strings and common data structures. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gtk+/2.20.x.nix b/pkgs/development/libraries/gtk+/2.20.x.nix deleted file mode 100644 index 53ad76ced53..00000000000 --- a/pkgs/development/libraries/gtk+/2.20.x.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg -, libpng, cairo, perl, jasper, xlibs -, xineramaSupport ? true -, cupsSupport ? true, cups ? null -}: - -assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null; - -stdenv.mkDerivation rec { - name = "gtk+-2.20.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.20/${name}.tar.bz2"; - sha256 = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65"; - }; - - buildNativeInputs = [ perl ]; - buildInputs = [ pkgconfig jasper ]; - - propagatedBuildInputs = - [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr xlibs.libXrender ] - ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups ]; - - passthru = { inherit libtiff libjpeg libpng; }; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} From d6c9400fbc2ac4dc13b7f414f0d7f77583edc022 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 10:03:25 +0000 Subject: [PATCH 405/504] s/popplerData/poppler_data/ in xournal svn path=/nixpkgs/trunk/; revision=29344 --- pkgs/applications/graphics/xournal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 9b8beb5b82b..b6d7e431443 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , ghostscript, atk, gtk, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui -, pango, libX11, xproto, zlib, poppler, popplerData +, pango, libX11, xproto, zlib, poppler, poppler_data , autoconf, automake, libtool, pkgconfig}: stdenv.mkDerivation rec { version = "0.4.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript atk gtk glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui - pango libX11 xproto zlib poppler popplerData + pango libX11 xproto zlib poppler poppler_data autoconf automake libtool pkgconfig ]; From f4a96780d177bb6fec772d3250fed8db2d7527cc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 13:01:47 +0000 Subject: [PATCH 406/504] Upgrade to pcsclite-1.7.4 -1 HAL reverse-dependency... svn path=/nixpkgs/trunk/; revision=29345 --- pkgs/tools/security/pcsclite/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 03924858e06..28a673d03ef 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl, hal, pkgconfig, dbus}: -stdenv.mkDerivation { - name = "pcsclite-1.5.5"; +{ stdenv, fetchurl, udev, pkgconfig, dbus_libs }: + +stdenv.mkDerivation rec { + name = "pcsclite-1.7.4"; src = fetchurl { - url = https://alioth.debian.org/frs/download.php/3082/pcsc-lite-1.5.5.tar.bz2; - sha256 = "09pdf4dbzjh235zp6x7aiby266i7kmmmz6bjdyf9mzyyq7ryc785"; + url = "http://alioth.debian.org/frs/download.php/3598/${name}.tar.bz2"; + sha256 = "1lc3amxisv2ya51v0gysygldj25kv7zj81famv69s205mvmagr6q"; }; # The OS should care on preparing the drivers into this location @@ -13,7 +14,10 @@ stdenv.mkDerivation { preConfigure = '' configureFlags="$configureFlags --enable-confdir=$out/etc" ''; - buildInputs = [ hal pkgconfig dbus ]; + + buildInputs = [ udev dbus_libs ]; + + buildNativeInputs = [ pkgconfig ]; meta = { description = "Middleware to access a smart card using SCard API (PC/SC)"; From 5bb330db0734b4e3d340570b276ee68dcba84d7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 16:38:16 +0000 Subject: [PATCH 407/504] swi-prolog: updated to version 5.10.5 svn path=/nixpkgs/trunk/; revision=29350 --- pkgs/development/compilers/swi-prolog/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 49498c2fc81..de7456bbcf0 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, +{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig, fontconfig }: -stdenv.mkDerivation rec { - version = "5.10.2"; +let + version = "5.10.5"; +in +stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "1a3ebbcd649f429a41b64561d38423692e00524c29227432d0eb5a0e24e2a4c9"; + sha256 = "38d938d6a64e894685aa44bf9ea34b5505764cd084e07e6b4c21a9dd89b579d5"; }; - buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama + buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig]; configureFlags = "--with-world --enable-gmp --enable-shared"; makeFlags = "world"; @@ -24,5 +26,8 @@ stdenv.mkDerivation rec { homepage = http://www.swi-prolog.org/; description = "A Prolog compiler and interpreter"; license = "LGPL"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 1d3a00e51a1495a885c4c7e48925c484f16f2955 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 16:38:22 +0000 Subject: [PATCH 408/504] haskell-HaskellForMaths: updated to version 0.4.0 svn path=/nixpkgs/trunk/; revision=29351 --- .../libraries/haskell/HaskellForMaths/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 19a9793d3f3..d4e1532b101 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck, random }: +{ cabal, random }: cabal.mkDerivation (self: { pname = "HaskellForMaths"; - version = "0.3.4"; - sha256 = "1cmhzcybv3kwvs058sjihdkqr72rygv2nmbcy8i485pk35yq31sm"; - buildDepends = [ QuickCheck random ]; + version = "0.4.0"; + sha256 = "1x6kac1im07cpb1014ci8v222q66w2g3gr1wdcv2yvdi5g24ymbp"; + buildDepends = [ random ]; meta = { homepage = "http://haskellformaths.blogspot.com/"; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; From 5a8e3f5b4e23c2ad68792e714a2541ab38da4cd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 16:38:28 +0000 Subject: [PATCH 409/504] haskell-http-enumerator: updated to version 0.7.1 svn path=/nixpkgs/trunk/; revision=29352 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 2166e72e09c..22b6e6370f3 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.0"; - sha256 = "0hbr03zv8y9maf9dh35d08pgbgj5dlqbaq158m576d4fnirmcapz"; + version = "0.7.1"; + sha256 = "0d8zfgj41jdg6k9ny717xy1ca2jxnmr7aliqlq2arf4900lxjlwd"; isLibrary = true; isExecutable = true; buildDepends = [ From a5bbfc578640a6d699df652eab421d82eb9414e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 16:38:37 +0000 Subject: [PATCH 410/504] haskell-LambdaHack: updated to version 0.1.20110918 svn path=/nixpkgs/trunk/; revision=29353 --- pkgs/games/LambdaHack/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index b30d7ec793f..c34160976e3 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,17 +1,15 @@ -{cabal, binary, mtl, zlib, vty, ConfigFile, MissingH, filepath}: +{ cabal, binary, ConfigFile, gtk, MissingH, mtl, random, zlib }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.1.20110117"; - name = self.fname; - sha256 = "186ccl1yq0r84h9azzwj0zyy3kf905i3kjlnziyi52ysqd61qw90"; - propagatedBuildInputs = - [binary mtl zlib vty ConfigFile MissingH filepath]; - preConfigure = '' - sed -i 's|\(filepath.*\) && < 1.2|\1|' ${self.pname}.cabal - ''; + version = "0.1.20110918"; + sha256 = "14zn650x7r65lb76hygz6yiwzbg2rbcyisi7kx2lszrbg0fp8pa9"; + isLibrary = false; + isExecutable = true; + buildDepends = [ binary ConfigFile gtk MissingH mtl random zlib ]; meta = { - description = "a small roguelike game"; + homepage = "http://github.com/kosmikus/LambdaHack"; + description = "A roguelike game engine in early development"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From c9a0666da7ebf309bb0b483b18955c13a1a7741c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 16:38:43 +0000 Subject: [PATCH 411/504] pkgs/development/compilers/pakcs: minor cosmetic changes svn path=/nixpkgs/trunk/; revision=29354 --- pkgs/development/compilers/pakcs/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 8d166584451..3c4723a88fb 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchurl, ghc, swiProlog, syb, mtl, makeWrapper, rlwrap, tk }: -stdenv.mkDerivation rec { - pname = "pakcs"; - version = "1.9.2"; - name = "${pname}-${version}"; +stdenv.mkDerivation { + name = "pakcs-1.9.2"; src = fetchurl { url = "http://www.informatik.uni-kiel.de/~pakcs/download/pakcs_src.tar.gz"; @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { (cd $out/curry2prolog/ ; make) ensureDir $out/share/emacs/site-lisp/curry-pakcs - for e in $out/tools/emacs/*.el ; do + for e in "$out/tools/emacs/"*.el ; do ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/; done @@ -60,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "PAKCS is an implementation of the multi-paradigm declarative language Curry."; + description = "an implementation of the multi-paradigm declarative language Curry"; longDescription = '' PAKCS is an implementation of the multi-paradigm declarative language Curry jointly developed by the Portland State University, the Aachen @@ -75,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://www.informatik.uni-kiel.de/~pakcs/; license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.kkallio ]; + maintainers = [ stdenv.lib.maintainers.kkallio stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; }; } From 1be8f5f076551048ba08ca582421063a27497ee9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 16:51:11 +0000 Subject: [PATCH 412/504] haskell-xmobar: re-generated expression with the latest version of cabal2nix svn path=/nixpkgs/trunk/; revision=29355 --- pkgs/applications/misc/xmobar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 89265fd7f67..454e5493ea7 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ]; - configureFlags = "--flags=with_xft"; + configureFlags = "-fwith_xft"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From 363510a9835351f7bc14a8c2544c7c51df06cbe2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 16:51:15 +0000 Subject: [PATCH 413/504] haskell-cabal2nix: updated to version 1.17 svn path=/nixpkgs/trunk/; revision=29356 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index df80332ba4b..5c354c8e156 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.16"; - sha256 = "02gffdc6q7xfaglx4rf0vc7784zmdnfklh88si83qcrz15wzgp2k"; + version = "1.17"; + sha256 = "0pga0rfghpvjazhs0mgnxg2kf82m8bsmlx3g9pxhiw5f4amfr2g7"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From 21205238891dd318cd6cb5d4be32a72ab47ed65b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 17:00:37 +0000 Subject: [PATCH 414/504] pdsh: don't try to build this tool on Cygwin svn path=/nixpkgs/trunk/; revision=29357 --- pkgs/tools/networking/pdsh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 07dfd5c30a7..ec0b7c6f60b 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { while timeouts occur on some connections. ''; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 11e2fe77ce721900e43d4715852cc714bce12631 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 17:02:15 +0000 Subject: [PATCH 415/504] nbd: don't try to build this tool on Cygwin svn path=/nixpkgs/trunk/; revision=29358 --- pkgs/tools/networking/nbd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 0e795ed739e..28ca2f3d3ed 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "map arbitrary files as block devices over the network"; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.unix; }; } From cc1ea395807172b83698269198a4f7204a5e0166 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 18:25:47 +0000 Subject: [PATCH 416/504] Added kernel.org mirror at tu-dresden.de to the list, which is currently reachable (unlike the kernel.org domain). svn path=/nixpkgs/trunk/; revision=29359 --- pkgs/build-support/fetchurl/mirrors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 94624412d35..f5b94f3f0ff 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -97,6 +97,7 @@ rec { http://www.all.kernel.org/pub/ http://www.eu.kernel.org/pub/ http://www.de.kernel.org/pub/ + http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/ ]; # Mirrors of ftp://ftp.kde.org/pub/kde/. From a08329b7bb0214a6bcf9606f88d3ecfd1c7e7726 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 18:25:51 +0000 Subject: [PATCH 417/504] pkgs/build-support/fetchurl/mirrors.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=29360 --- pkgs/build-support/fetchurl/mirrors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index f5b94f3f0ff..713e7db0e3c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -7,7 +7,7 @@ rec { # Mirrors for mirror://site/filename URIs, where "site" is # "sourceforge", "gnu", etc. - + # SourceForge. sourceforge = [ http://prdownloads.sourceforge.net/ From b0f43454674e8646db458cb72e343d579a7aef4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 18:25:55 +0000 Subject: [PATCH 418/504] pkgs/os-specific/linux/cpufrequtils: download tarball from any of the "kernel" mirrors svn path=/nixpkgs/trunk/; revision=29361 --- pkgs/os-specific/linux/cpufrequtils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 6ef51cbc73d..74db3a0d890 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -4,9 +4,9 @@ assert stdenv.isLinux && stdenv.system != "powerpc-linux"; stdenv.mkDerivation { name = "cpufrequtils-008"; - + src = fetchurl { - url = http://kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz; + url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz"; md5 = "52d3e09e47ffef634833f7fab168eccf"; }; From c8d3fcd1b3e971a031d9f9dcb9149fc09180c4b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 18:56:38 +0000 Subject: [PATCH 419/504] haskell-aeson: updated to version 0.3.2.12 svn path=/nixpkgs/trunk/; revision=29362 --- pkgs/development/libraries/haskell/aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index db31abd7bb5..030f973e35e 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.3.2.11"; - sha256 = "0cvavxb3bm5kz491wrx5az5scvddndw2rh45snhj1xn0flr1c2n7"; + version = "0.3.2.12"; + sha256 = "12dq79bd8kvl4hc493c7ff9k9xdpibnnnfgpvpxh4ljnqcqr4hcy"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text time unorderedContainers vector From 0297229504890f7d2e3c066f4199d7fc78bef18b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Sep 2011 19:01:40 +0000 Subject: [PATCH 420/504] libpng-1.5 See CVE-2011-269{0,1,2} svn path=/nixpkgs/trunk/; revision=29363 --- pkgs/development/libraries/libpng/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index bfd0a6b98b1..bcdc878edf4 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, zlib }: - -assert zlib != null; +{ stdenv, fetchurl, zlib, xz }: stdenv.mkDerivation rec { - name = "libpng-1.2.44"; + name = "libpng-1.5.4"; src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.gz"; - md5 = "89b62f8daaeeab1342e307d6d1411ff1"; + url = "mirror://sourceforge/libpng/${name}.tar.xz"; + sha256 = "1rw58zi3hxyinah2dz0jzq81c7ninbmfjf10xax2a8cpd5h45agz"; }; propagatedBuildInputs = [ zlib ]; + buildNativeInputs = [ xz ]; + passthru = { inherit zlib; }; meta = { From caf02e266fb44f70f142f7902f767914575e1e61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Sep 2011 20:20:17 +0000 Subject: [PATCH 421/504] all-packages.nix: fixed evaluation error in the 'mumble' attribute svn path=/nixpkgs/trunk/; revision=29364 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8e69f34a72..93d2b9bbd6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6951,7 +6951,7 @@ let mumble = callPackage ../applications/networking/mumble { avahi = avahi.override { - withLibdnsCompat = true; + withLibdnssdCompat = true; }; jackSupport = getConfig [ "mumble" "jackSupport" ] false; }; From 30e9cae7d2bcab7c15cac876ee1d6db14396ce60 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 19 Sep 2011 21:00:37 +0000 Subject: [PATCH 422/504] added some python packages, add variant for libpng 1.2.44 as matplotlib does not compile with newer versions svn path=/nixpkgs/trunk/; revision=29366 --- pkgs/development/libraries/libpng/1.2.44.nix | 22 ++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 83 +++++++++++++++++++- 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libpng/1.2.44.nix diff --git a/pkgs/development/libraries/libpng/1.2.44.nix b/pkgs/development/libraries/libpng/1.2.44.nix new file mode 100644 index 00000000000..bfd0a6b98b1 --- /dev/null +++ b/pkgs/development/libraries/libpng/1.2.44.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, zlib }: + +assert zlib != null; + +stdenv.mkDerivation rec { + name = "libpng-1.2.44"; + + src = fetchurl { + url = "mirror://sourceforge/libpng/${name}.tar.gz"; + md5 = "89b62f8daaeeab1342e307d6d1411ff1"; + }; + + propagatedBuildInputs = [ zlib ]; + + passthru = { inherit zlib; }; + + meta = { + description = "The official reference implementation for the PNG file format"; + homepage = http://www.libpng.org/pub/png/libpng.html; + license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93d2b9bbd6f..c6338629d34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3944,6 +3944,7 @@ let libpcap = callPackage ../development/libraries/libpcap { }; libpng = callPackage ../development/libraries/libpng { }; + libpng12 = callPackage ../development/libraries/libpng/1.2.44 { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libproxy = callPackage ../development/libraries/libproxy { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ee84b5f209..d9f94cb02f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -358,6 +358,23 @@ let pythonPackages = python.modules // rec { }; + docutils = buildPythonPackage rec { + name = "docutils-0.8.1"; + + src = fetchurl { + url = "mirror://sourceforge/docutils/${name}.tar.gz"; + sha256 = "0wfz4nxl95jcr2f2mc5gijgighavcghg33plzbz5jyi531jpffss"; + }; + + doCheck = false; + + meta = { + homepage = http://docutils.sourceforge.net/; + description = "Docutils is an open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX."; + }; + }; + + dtopt = buildPythonPackage rec { name = "dtopt-0.1"; @@ -742,7 +759,7 @@ let pythonPackages = python.modules // rec { doCheck = false; - buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; + buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng12 pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; meta = { description = "python plotting library, making publication quality plots"; @@ -1290,6 +1307,50 @@ let pythonPackages = python.modules // rec { }; }); + pydot = buildPythonPackage rec { + name = "pydot-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pydot/${name}.tar.gz"; + md5 = "cd739651ae5e1063a89f7efd5a9ec72b"; + }; + propagatedBuildInputs = [pyparsing pkgs.graphviz]; + meta = { + homepage = http://code.google.com/p/pydot/; + description = "pydot allows to easily create both directed and non directed graphs from Python."; + }; + }; + + + pygments = buildPythonPackage rec { + name = "Pygments-1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; + md5 = "d77ac8c93a7fb27545f2522abe9cc462"; + }; + meta = { + homepage = http://pygments.org/; + description = "Pygments is a generic syntax highlighter for general use in all kinds of software such as forum systems, wikis or other applications that need to prettify source code."; + }; + }; + + + pyparsing = buildPythonPackage rec { + name = "pyparsing-1.5.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyparsing/${name}.tar.gz"; + md5 = "1e41cb219dae9fc353bd4cd47636b283"; + }; + doCheck = false; + meta = { + homepage = http://pyparsing.wikispaces.com/; + description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions."; + }; + }; + + pylint = buildPythonPackage rec { name = "pylint-0.23.0"; @@ -1741,6 +1802,26 @@ let pythonPackages = python.modules // rec { }); + sphinx = buildPythonPackage (rec { + name = "Sphinx-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; + md5 = "42c722d48e52d4888193965dd473adb5"; + }; + + propagatedBuildInputs = [docutils jinja2 pygments]; + + meta = { + description = "Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects."; + + homepage = http://sphinx.pocoo.org/; + + license = "BSD"; + }; + }); + + sqlalchemy = buildPythonPackage { name = "sqlalchemy-0.6.6"; From 78acc23d18066ed56fd3da9f9b20b1f94500dbbb Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 19 Sep 2011 21:22:31 +0000 Subject: [PATCH 423/504] forgot .nix extension svn path=/nixpkgs/trunk/; revision=29367 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6338629d34..d77e1fd849f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3944,7 +3944,7 @@ let libpcap = callPackage ../development/libraries/libpcap { }; libpng = callPackage ../development/libraries/libpng { }; - libpng12 = callPackage ../development/libraries/libpng/1.2.44 { }; + libpng12 = callPackage ../development/libraries/libpng/1.2.44.nix { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libproxy = callPackage ../development/libraries/libproxy { }; From 6e0c05923545c0239e377ed272b2ef90e08661a2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 19 Sep 2011 21:37:05 +0000 Subject: [PATCH 424/504] use older libpng for tetex svn path=/nixpkgs/trunk/; revision=29368 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77e1fd849f..2de383cdfd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8349,7 +8349,9 @@ let splix = callPackage ../misc/cups/drivers/splix { }; - tetex = callPackage ../misc/tex/tetex { }; + tetex = callPackage ../misc/tex/tetex { + libpng = libpng12; + }; tex4ht = callPackage ../misc/tex/tex4ht { }; From 9827fd060d3a24f945a2dd7bf3dc2c046d066610 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Mon, 19 Sep 2011 22:02:11 +0000 Subject: [PATCH 425/504] libgadu-1.11.0 svn path=/nixpkgs/trunk/; revision=29369 --- pkgs/development/libraries/libgadu/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 455380f5589..ef8439b8b88 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, zlib}: stdenv.mkDerivation { - name = "libgadu-1.9.0"; + name = "libgadu-1.11.0"; src = fetchurl { - url = http://toxygen.net/libgadu/files/libgadu-1.9.0.tar.gz; - sha256 = "1ygmda23hf7cysns9kglsiljzb4x8339n878k70yacgzm07dryhj"; + url = http://toxygen.net/libgadu/files/libgadu-1.11.0.tar.gz; + sha256 = "045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38"; }; + buildInputs = [ zlib ]; + meta = { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; homepage = http://toxygen.net/libgadu/; From a1680bc96ba167f32cb748ab9d15b2d38d640b08 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Mon, 19 Sep 2011 22:04:03 +0000 Subject: [PATCH 426/504] kadu-0.10.0 svn path=/nixpkgs/trunk/; revision=29370 --- .../instant-messengers/kadu/config.patch | 15 --------------- .../instant-messengers/kadu/default.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/kadu/config.patch diff --git a/pkgs/applications/networking/instant-messengers/kadu/config.patch b/pkgs/applications/networking/instant-messengers/kadu/config.patch deleted file mode 100644 index 263898ba0db..00000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/config.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/.config b/.config -index e0068bf..808ebf4 100644 ---- a/.config -+++ b/.config -@@ -187,8 +187,8 @@ module_history_migration=m - # PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa - # Platform: Linux, Mac OS X, Windows - # Needs: libcrypto, libssl --module_encryption_ng=m --module_encryption_ng_simlite=m -+module_encryption_ng=n -+module_encryption_ng_simlite=n - - # Description: Auto away module - # PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 9a9298ecdce..cdad7eb1e7c 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -3,15 +3,14 @@ stdenv.mkDerivation { - name = "kadu-0.9.2"; + name = "kadu-0.10.0"; src = fetchurl { - url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2; - sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b"; + url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2; + sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995"; }; - buildInputs = [ - cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon + buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon ]; configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; @@ -22,7 +21,8 @@ stdenv.mkDerivation { patchShebangs . ''; - patches = [ ./config.patch ]; + # because I was not able to get those working + patches = [ ./disable_encryption_plugins.patch ]; NIX_LDFLAGS="-lX11"; From e0111c423213b405eb902c2050bb5a76d048277f Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Mon, 19 Sep 2011 22:05:06 +0000 Subject: [PATCH 427/504] kadu-0.10.0 (forgotten commit) svn path=/nixpkgs/trunk/; revision=29371 --- .../kadu/disable_encryption_plugins.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch new file mode 100644 index 00000000000..e89095de55d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch @@ -0,0 +1,16 @@ +diff --git a/Plugins.cmake b/Plugins.cmake +index c6906ce..b1284d6 100644 +--- a/Plugins.cmake ++++ b/Plugins.cmake +@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS + + # encryption + # Encrypted chat support +- encryption_ng ++ # encryption_ng + # OpenSSL encrypted chat support +- encryption_ng_simlite ++ # encryption_ng_simlite + + # docking + # Tray icon support (common part of all docking modules) From 2c33be2d8bae356084ed4950837be8339259bb21 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 19 Sep 2011 23:05:02 +0000 Subject: [PATCH 428/504] revert previous commits related to libpng 1.2.44, until we are able to build 1.2.45 svn path=/nixpkgs/trunk/; revision=29373 --- pkgs/development/libraries/libpng/1.2.44.nix | 22 ------------------- pkgs/development/libraries/libpng/default.nix | 12 +++++----- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/libpng/1.2.44.nix diff --git a/pkgs/development/libraries/libpng/1.2.44.nix b/pkgs/development/libraries/libpng/1.2.44.nix deleted file mode 100644 index bfd0a6b98b1..00000000000 --- a/pkgs/development/libraries/libpng/1.2.44.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, zlib }: - -assert zlib != null; - -stdenv.mkDerivation rec { - name = "libpng-1.2.44"; - - src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.gz"; - md5 = "89b62f8daaeeab1342e307d6d1411ff1"; - }; - - propagatedBuildInputs = [ zlib ]; - - passthru = { inherit zlib; }; - - meta = { - description = "The official reference implementation for the PNG file format"; - homepage = http://www.libpng.org/pub/png/libpng.html; - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt - }; -} diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index bcdc878edf4..bfd0a6b98b1 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchurl, zlib }: + +assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.5.4"; + name = "libpng-1.2.44"; src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1rw58zi3hxyinah2dz0jzq81c7ninbmfjf10xax2a8cpd5h45agz"; + url = "mirror://sourceforge/libpng/${name}.tar.gz"; + md5 = "89b62f8daaeeab1342e307d6d1411ff1"; }; propagatedBuildInputs = [ zlib ]; - buildNativeInputs = [ xz ]; - passthru = { inherit zlib; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2de383cdfd6..e9793292d62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3944,7 +3944,6 @@ let libpcap = callPackage ../development/libraries/libpcap { }; libpng = callPackage ../development/libraries/libpng { }; - libpng12 = callPackage ../development/libraries/libpng/1.2.44.nix { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libproxy = callPackage ../development/libraries/libproxy { }; From 59c04d2d9a6c4874d967730640e61362e3e3206a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 19 Sep 2011 23:09:20 +0000 Subject: [PATCH 429/504] libpng revert svn path=/nixpkgs/trunk/; revision=29374 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9f94cb02f1..2f0152bcb11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -759,7 +759,7 @@ let pythonPackages = python.modules // rec { doCheck = false; - buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng12 pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; + buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; meta = { description = "python plotting library, making publication quality plots"; From ab813885878ddeb680a3dbe754e72b5c2dcf6547 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:13:39 +0000 Subject: [PATCH 430/504] libpng-1.2.46 OK, libpng-1.5.x breaks stuff but why revert to a version with security holes? svn path=/nixpkgs/trunk/; revision=29375 --- pkgs/development/libraries/libpng/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index bfd0a6b98b1..0a1e4c0f35d 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib, xz }: assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.44"; + name = "libpng-1.2.46"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.gz"; - md5 = "89b62f8daaeeab1342e307d6d1411ff1"; + sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn"; }; propagatedBuildInputs = [ zlib ]; + buildNativeInputs = [ xz ]; + passthru = { inherit zlib; }; meta = { From c67fde4a47bb91499563d9aeb7bf9c92da5ecc3e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:14:29 +0000 Subject: [PATCH 431/504] Sorry, this is the hash of .tar.xz svn path=/nixpkgs/trunk/; revision=29376 --- pkgs/development/libraries/libpng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 0a1e4c0f35d..16fe511f1f1 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libpng-1.2.46"; src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.gz"; + url = "mirror://sourceforge/libpng/${name}.tar.xz"; sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn"; }; From c130be537b34ed547e4887ef18ab2c3197a29075 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:21:46 +0000 Subject: [PATCH 432/504] Add fetchurl_gnome wrapper It just creates correct mirror://gnome/sources/... URL. svn path=/nixpkgs/trunk/; revision=29377 --- pkgs/build-support/fetchurl/gnome.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/build-support/fetchurl/gnome.nix diff --git a/pkgs/build-support/fetchurl/gnome.nix b/pkgs/build-support/fetchurl/gnome.nix new file mode 100644 index 00000000000..616c8203601 --- /dev/null +++ b/pkgs/build-support/fetchurl/gnome.nix @@ -0,0 +1,17 @@ +{ fetchurl }: + +{ project, major, minor, patchlevel, extension ? "bz2", sha256 }: + +let + baseVersion = "${major}.${minor}"; + version = baseVersion + (if patchlevel != null then ".${patchlevel}" else ""); + name = "${project}-${version}"; +in + +(fetchurl { + url = "mirror://gnome/sources/${project}/${baseVersion}/${name}.tar.${extension}"; + inherit sha256; +}) // { + inherit major minor patchlevel baseVersion version; + pkgname = name; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9793292d62..d614fe05d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -289,6 +289,9 @@ let inherit curl stdenv; }; + # A wrapper around fetchurl that generates miror://gnome URLs automatically + fetchurl_gnome = callPackage ../build-support/fetchurl/gnome.nix { }; + # fetchurlBoot is used for curl and its dependencies in order to # prevent a cyclic dependency (curl depends on curl.tar.bz2, # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It From 058fc8da826385a516b3601181ea16479d9139aa Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:21:56 +0000 Subject: [PATCH 433/504] gdk-pixbuf-2.24 svn path=/nixpkgs/trunk/; revision=29378 --- .../libraries/gdk-pixbuf/2.22.x.nix | 24 -------------- .../libraries/gdk-pixbuf/2.24.x.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 33 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/gdk-pixbuf/2.22.x.nix create mode 100644 pkgs/development/libraries/gdk-pixbuf/2.24.x.nix diff --git a/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix deleted file mode 100644 index e8e82367cd7..00000000000 --- a/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }: - -stdenv.mkDerivation rec { - name = "gdk-pixbuf-2.22.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2"; - sha256 = "6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d"; - }; - - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "A library for image loading and manipulation"; - - homepage = http://library.gnome.org/devel/gdk-pixbuf/; - - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix new file mode 100644 index 00000000000..d6483ba36de --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl_gnome, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs +, xz, jasper }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "gdk-pixbuf"; + major = "2"; minor = "24"; patchlevel = "0"; extension = "xz"; + sha256 = "19r89nxqlpmd0ykmklz2z99dvad9svr5ndiclk7c2h84lhx1vhb7"; + }; + + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. + buildInputs = [ xlibs.xlibs ]; + + buildNativeInputs = [ pkgconfig xz ]; + + propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; + + configureFlags = "--with-libjasper"; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A library for image loading and manipulation"; + + homepage = http://library.gnome.org/devel/gdk-pixbuf/; + + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d614fe05d36..2d11fddbc88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3550,7 +3550,7 @@ let pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.22.x.nix { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { }; From e5062a4c5c20cea5a28184394bfaf7a257a8e405 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:04 +0000 Subject: [PATCH 434/504] atk: perl and pkgconfig are buildNativeInputs Switch to fetchurl_gnome svn path=/nixpkgs/trunk/; revision=29379 --- pkgs/development/libraries/atk/1.32.x.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/atk/1.32.x.nix b/pkgs/development/libraries/atk/1.32.x.nix index 99a02b22808..34fef9048f3 100644 --- a/pkgs/development/libraries/atk/1.32.x.nix +++ b/pkgs/development/libraries/atk/1.32.x.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib }: +{ stdenv, fetchurl_gnome, pkgconfig, perl, glib }: stdenv.mkDerivation rec { - name = "atk-1.32.0"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/atk/1.32/${name}.tar.bz2"; - sha256 = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"; + src = fetchurl_gnome { + project = "atk"; + major = "1"; minor = "32"; patchlevel = "0"; + sha256 = "0vmikhrvh1pb31y1ik4n1a99xs7pv4nhb2sgj6pv2kawyycfb8z9"; }; - buildInputs = [ pkgconfig perl ]; + buildNativeInputs = [ pkgconfig perl ]; + propagatedBuildInputs = [ glib ]; postInstall = "rm -rf $out/share/gtk-doc"; From 4e9fbf18ed527ec913bd2c173450a9d69a7adf7a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:14 +0000 Subject: [PATCH 435/504] Build cairo-gobject library Move cairo to gtkLibs.cairo svn path=/nixpkgs/trunk/; revision=29380 --- pkgs/development/libraries/cairo/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 1e478b1c68d..62e907264d5 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,6 +2,7 @@ , pdfSupport ? true , pngSupport ? true , xcbSupport ? false +, gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null }: @@ -19,8 +20,9 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ - stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; + [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] + ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] + ++ stdenv.lib.optional gobjectSupport glib; propagatedBuildInputs = [ freetype ] ++ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d11fddbc88..e7710c9bd59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3084,8 +3084,6 @@ let buddy = callPackage ../development/libraries/buddy { }; - cairo = callPackage ../development/libraries/cairo { }; - cairomm = callPackage ../development/libraries/cairomm { }; scmccid = callPackage ../development/libraries/scmccid { }; @@ -3510,7 +3508,7 @@ let gtkLibs = pkgs.gtkLibs224; - inherit (pkgs.gtkLibs) glib gtk pango; + inherit (pkgs.gtkLibs) glib gtk pango cairo; gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in { @@ -3528,6 +3526,8 @@ let atk = callPackage ../development/libraries/atk/1.24.x.nix { }; + cairo = callPackage ../development/libraries/cairo { }; + pango = callPackage ../development/libraries/pango/1.24.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.14.x.nix { }; @@ -3546,6 +3546,8 @@ let atk = callPackage ../development/libraries/atk/1.32.x.nix { }; + cairo = callPackage ../development/libraries/cairo { }; + pango = callPackage ../development/libraries/pango/1.28.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; From 72b58e2218c9ea95dce995a002e0e8e53156ac61 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:22 +0000 Subject: [PATCH 436/504] Review glib expression * Use buildNativeInputs * Use .tar.xz * Add TODO svn path=/nixpkgs/trunk/; revision=29381 --- pkgs/development/libraries/glib/2.28.x.nix | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index bae405a2426..3b7f8b18495 100644 --- a/pkgs/development/libraries/glib/2.28.x.nix +++ b/pkgs/development/libraries/glib/2.28.x.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz }: +# TODO: +# * Add gio-module-fam +# Problem: cyclic dependency on gamin +# Possible solution: build as a standalone module, set env. vars stdenv.mkDerivation rec { - name = "glib-2.28.8"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/glib/2.28/${name}.tar.bz2"; - sha256 = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f"; + src = fetchurl_gnome { + project = "glib"; + major = "2"; minor = "28"; patchlevel = "8"; extension = "xz"; + sha256 = "0lw3fjsffpnf0cc4j5lkxgllp95qvfq6bir8nh5gds78pmfsjz2d"; }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ pkgconfig gettext ] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl ]; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildNativeInputs = [ perl pkgconfig gettext xz ]; propagatedBuildInputs = [ zlib ]; # glib buildsystem fails to find python, thus hardcodes python2.4 in #! postInstall = '' rm -rvf $out/share/gtk-doc - sed -e 's@python2\.4@python@' -i $out/bin/gtester-report''; + sed -e 's@python2\.[0-9]@python@' -i $out/bin/gtester-report''; meta = { description = "GLib, a C library of programming buildings blocks"; @@ -34,7 +38,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with stdenv.lib.maintainers; [raskin urkud]; platforms = stdenv.lib.platforms.linux; }; } From e803d715c2c676b5731fed34b4c6edc3a9322c9b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:30 +0000 Subject: [PATCH 437/504] pango: pkg-config is a native buildInput switch to fetchurl_gnome svn path=/nixpkgs/trunk/; revision=29382 --- pkgs/development/libraries/pango/1.28.x.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix index 7488154373d..7c6119b5a86 100644 --- a/pkgs/development/libraries/pango/1.28.x.nix +++ b/pkgs/development/libraries/pango/1.28.x.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { - name = "pango-1.28.4"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2"; - sha256 = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f"; + src = fetchurl_gnome { + project = "pango"; + major = "1"; minor = "28"; patchlevel = "4"; + sha256 = "17ssy12pqs2s0d89zyhwmkcrbpip6jyf5m8ll9libl0dq6y3bc3y"; }; - buildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; + + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ x11 glib cairo libpng ]; From 83a44e5a6505ff0ec0d9a165a97b3477c3428718 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:39 +0000 Subject: [PATCH 438/504] wxGTK: rely on gtk.propagatedBuildInputs gtkLibs224.gtk actually propagates libpng etc. through gdk_pixbuf, so using gtk.libpng etc. makes no sense. Remove unused 'inherit lib*;' in gtk. svn path=/nixpkgs/trunk/; revision=29383 --- pkgs/development/libraries/gtk+/2.16.x.nix | 2 -- pkgs/development/libraries/gtk+/2.24.x.nix | 2 -- pkgs/development/libraries/wxGTK-2.6/default.nix | 13 +++---------- pkgs/development/libraries/wxGTK-2.8/default.nix | 13 +++---------- pkgs/development/libraries/wxGTK-2.9/2.9.0.nix | 13 +++---------- pkgs/development/libraries/wxGTK-2.9/default.nix | 13 +++---------- 6 files changed, 12 insertions(+), 44 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.16.x.nix b/pkgs/development/libraries/gtk+/2.16.x.nix index 9abbd3aa49d..2c81ecc84e0 100644 --- a/pkgs/development/libraries/gtk+/2.16.x.nix +++ b/pkgs/development/libraries/gtk+/2.16.x.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama; - passthru = { inherit libtiff libjpeg libpng; }; - meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index e4a1f0969f9..926187f7374 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; - passthru = { inherit libtiff libjpeg libpng; }; - meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix index 1496682f5e3..710400ab094 100644 --- a/pkgs/development/libraries/wxGTK-2.6/default.nix +++ b/pkgs/development/libraries/wxGTK-2.6/default.nix @@ -2,12 +2,6 @@ , compat22 ? false, compat24 ? true, unicode ? true }: -assert pkgconfig != null && gtk != null; -assert gtk.libtiff != null; -assert gtk.libjpeg != null; -assert gtk.libpng != null; -assert gtk.libpng.zlib != null; - stdenv.mkDerivation { name = "wxGTK-2.6.4"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x"; }; - buildInputs = [ - pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto - ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto ]; + + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 1cfa57b24d2..0bfe4c2335c 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -2,12 +2,6 @@ , mesa, compat24 ? false, compat26 ? true, unicode ? true, }: -assert pkgconfig != null && gtk != null; -assert gtk.libtiff != null; -assert gtk.libjpeg != null; -assert gtk.libpng != null; -assert gtk.libpng.zlib != null; - stdenv.mkDerivation { name = "wxGTK-2.8.12"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; }; - buildInputs = [ - pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto mesa - ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix index 433f7fe2187..0520adef4dc 100644 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix +++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix @@ -2,12 +2,6 @@ , mesa, compat24 ? false, compat26 ? true, unicode ? true, }: -assert pkgconfig != null && gtk != null; -assert gtk.libtiff != null; -assert gtk.libjpeg != null; -assert gtk.libpng != null; -assert gtk.libpng.zlib != null; - stdenv.mkDerivation { name = "wxwidgets-2.9.0"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; }; - buildInputs = [ - pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto mesa - ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index 8385a52db19..2f83d3cc03f 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -2,12 +2,6 @@ , mesa, compat24 ? false, compat26 ? true, unicode ? true, }: -assert pkgconfig != null && gtk != null; -assert gtk.libtiff != null; -assert gtk.libjpeg != null; -assert gtk.libpng != null; -assert gtk.libpng.zlib != null; - stdenv.mkDerivation { name = "wxwidgets-2.9.1"; @@ -16,10 +10,9 @@ stdenv.mkDerivation { sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; }; - buildInputs = [ - pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto mesa - ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" From 8d5fecc4f76dea2dd0b47774c1c5b5c77dfa562e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:51 +0000 Subject: [PATCH 439/504] gtk-2.24.6 + some review svn path=/nixpkgs/trunk/; revision=29384 --- pkgs/development/libraries/gtk+/2.24.x.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index 926187f7374..b52031d4ac6 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg -, libpng, cairo, perl, jasper, xlibs, gdk_pixbuf +{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs +, gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -8,11 +8,12 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.5"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2"; - sha256 = "f355f26003b1b42b97e584bdc475189a423fdd052088ee4bbd7aa0f989815cc8"; + src = fetchurl_gnome { + project = "gtk+"; + major = "2"; minor = "24"; patchlevel = "6"; extension = "xz"; + sha256 = "1jpgxycxgz1g5yd7spxyc2i8zvn8swm275dkd4d0ryn1bma6n0la"; }; patches = @@ -23,11 +24,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ perl ]; - buildInputs = [ pkgconfig jasper ]; + buildNativeInputs = [ perl pkgconfig xz ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf /* libtiff libjpeg libpng */ cairo + [ xlibs.xlibs glib atk pango gdk_pixbuf cairo xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama From ff25d193adbbf3220457548165ff7a880bc0848b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:59 +0000 Subject: [PATCH 440/504] glibmm-2.28 svn path=/nixpkgs/trunk/; revision=29385 --- pkgs/development/libraries/glibmm/2.22.x.nix | 24 ------------------- pkgs/development/libraries/glibmm/2.28.x.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/glibmm/2.22.x.nix create mode 100644 pkgs/development/libraries/glibmm/2.28.x.nix diff --git a/pkgs/development/libraries/glibmm/2.22.x.nix b/pkgs/development/libraries/glibmm/2.22.x.nix deleted file mode 100644 index 10b8ad8d391..00000000000 --- a/pkgs/development/libraries/glibmm/2.22.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: - -stdenv.mkDerivation rec { - name = "glibmm-2.22.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.22/${name}.tar.bz2"; - sha256 = "1h5nxhh6xr1m3jn6bawl3vq5i285k3kdpzqa65zxmxydzm5gy1gi"; - }; - - buildInputs = [pkgconfig]; - propagatedBuildInputs = [glib libsigcxx]; - - meta = { - description = "C++ interface to the GLib library"; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glibmm/2.28.x.nix b/pkgs/development/libraries/glibmm/2.28.x.nix new file mode 100644 index 00000000000..3c2c1fbadce --- /dev/null +++ b/pkgs/development/libraries/glibmm/2.28.x.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "glibmm"; + major = "2"; minor = "28"; patchlevel = "2"; extension = "xz"; + sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq"; + }; + + buildNativeInputs = [pkgconfig xz]; + propagatedBuildInputs = [glib libsigcxx]; + + meta = { + description = "C++ interface to the GLib library"; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [urkud raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7710c9bd59..ee57e1098a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3542,7 +3542,7 @@ let glib = callPackage ../development/libraries/glib/2.28.x.nix { }; - glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { }; + glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { }; atk = callPackage ../development/libraries/atk/1.32.x.nix { }; From 501cc845a05d21a388f4d082b4b3d545b09f0d66 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:23:08 +0000 Subject: [PATCH 441/504] pangomm-2.28 svn path=/nixpkgs/trunk/; revision=29386 --- .../libraries/pangomm/{2.26.x.nix => 2.28.x.nix} | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/development/libraries/pangomm/{2.26.x.nix => 2.28.x.nix} (70%) diff --git a/pkgs/development/libraries/pangomm/2.26.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix similarity index 70% rename from pkgs/development/libraries/pangomm/2.26.x.nix rename to pkgs/development/libraries/pangomm/2.28.x.nix index ce1c5207e32..59b6eca64d3 100644 --- a/pkgs/development/libraries/pangomm/2.26.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: +{ stdenv, fetchurl_gnome, pkgconfig, pango, glibmm, cairomm, libpng }: stdenv.mkDerivation rec { - name = "pangomm-2.26.0"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/pangomm/2.26/${name}.tar.bz2"; - sha256 = "0ph93cjbzmb36k6a9cjd1pcch0ba4bzq1jnf69f1xj0j5kjfn9mz"; + src = fetchurl_gnome { + project = "pangomm"; + major = "2"; minor = "28"; patchlevel = "2"; + sha256 = "13yq5zwxzliiss4ladaa7di2b3s965p3zbz7s0ccz9ddbqj9f7gc"; }; - buildInputs = [ pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee57e1098a6..e3451ab7e13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3550,7 +3550,7 @@ let pango = callPackage ../development/libraries/pango/1.28.x.nix { }; - pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; + pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; From 1c6d328898009c9eb21f335951e50fcdc18df61b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:23:17 +0000 Subject: [PATCH 442/504] Add atkmm svn path=/nixpkgs/trunk/; revision=29387 --- pkgs/development/libraries/atkmm/2.22.x.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/atkmm/2.22.x.nix diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix new file mode 100644 index 00000000000..348edb22632 --- /dev/null +++ b/pkgs/development/libraries/atkmm/2.22.x.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl_gnome, atk, glibmm, pkgconfig }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "atkmm"; + major = "2"; minor = "22"; patchlevel = "5"; + sha256 = "0v5ynws5pc4qdgrr8hrl8wajl3xxh3kgljchj7cqyb4mcxg3xq31"; + }; + + propagatedBuildInputs = [ atk glibmm ]; + + buildNativeInputs = [ pkgconfig ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3451ab7e13..b40d9ef5269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3546,6 +3546,8 @@ let atk = callPackage ../development/libraries/atk/1.32.x.nix { }; + atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; + cairo = callPackage ../development/libraries/cairo { }; pango = callPackage ../development/libraries/pango/1.28.x.nix { }; From 31d77b3e2f4125d40e3819f1a4d2a882d3fc5985 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:23:27 +0000 Subject: [PATCH 443/504] gtkmm-2.24 svn path=/nixpkgs/trunk/; revision=29388 --- .../libraries/gtkmm/{2.18.x.nix => 2.24.x.nix} | 16 +++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) rename pkgs/development/libraries/gtkmm/{2.18.x.nix => 2.24.x.nix} (65%) diff --git a/pkgs/development/libraries/gtkmm/2.18.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix similarity index 65% rename from pkgs/development/libraries/gtkmm/2.18.x.nix rename to pkgs/development/libraries/gtkmm/2.24.x.nix index 63644a17360..89e12bc4c1c 100644 --- a/pkgs/development/libraries/gtkmm/2.18.x.nix +++ b/pkgs/development/libraries/gtkmm/2.24.x.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }: +{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm, xz }: stdenv.mkDerivation rec { - name = "gtkmm-2.18.2"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/gtkmm/2.18/${name}.tar.bz2"; - sha256 = "0kj71db6qwgybmrs0myaz6hfz1zdfzh286vkmv5ldh6d5vi07h6z"; + src = fetchurl_gnome { + project = "gtkmm"; + major = "2"; minor = "24"; patchlevel = "2"; extension = "xz"; + sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; }; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ]; + buildNativeInputs = [pkgconfig xz]; + + propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; meta = { description = "C++ interface to the GTK+ graphical user interface library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b40d9ef5269..11899a7efe6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3558,7 +3558,7 @@ let gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { }; + gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; gob2 = callPackage ../development/tools/misc/gob2 { }; From 87b968e85855c45c55a77648d4982a83f04d068c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:31:37 +0000 Subject: [PATCH 444/504] Use fetchurl_gnome in dia +small style changes (though almost all string changed) svn path=/nixpkgs/trunk/; revision=29389 --- pkgs/applications/graphics/dia/default.nix | 32 ++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 3f70f5d6038..533e196cee4 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,19 +1,29 @@ -{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool }: -stdenv.mkDerivation { - name = "dia-0.97"; +{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext +, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl +, withGNOME ? false, libgnomeui }: - src = fetchurl { - url = mirror://gnome/sources/dia/0.97/dia-0.97.tar.bz2; - sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh"; +stdenv.mkDerivation rec { + inherit (src) name; + + src = fetchurl_gnome { + project = "dia"; + major = "0"; minor = "97"; patchlevel = "1"; + sha256 = "0hli89fdzzbshqdznxrbgyqw55qlr4z5xpn86jcg5fl7kln8pzld"; }; - buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl intltool]; + buildInputs = + [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5 + libxslt docbook_xsl libart_lgpl + ] ++ stdenv.lib.optional withGNOME libgnomeui; + + buildNativeInputs = [ pkgconfig intltool perl ]; + + configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; meta = { - description = "Gnome Diagram drawing software."; + description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; - linux; + maintainers = with stdenv.lib.maintainers; [raskin urkud]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11899a7efe6..d5ebc8238f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6310,7 +6310,9 @@ let inherit (xlibs) libxcb pixman libpthreadstubs libXau; }; - dia = callPackage ../applications/graphics/dia { }; + dia = callPackage ../applications/graphics/dia { + inherit (pkgs.gnome) libart_lgpl libgnomeui; + }; djvulibre = callPackage ../applications/misc/djvulibre { }; From 8e28c8fcfa6398f85d450d951374f2f074ecfcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 20 Sep 2011 09:53:19 +0000 Subject: [PATCH 445/504] Making 'nix-env -qa *' work svn path=/nixpkgs/trunk/; revision=29394 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5ebc8238f4..ba91b42d67b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8357,9 +8357,7 @@ let splix = callPackage ../misc/cups/drivers/splix { }; - tetex = callPackage ../misc/tex/tetex { - libpng = libpng12; - }; + tetex = callPackage ../misc/tex/tetex { }; tex4ht = callPackage ../misc/tex/tex4ht { }; From a3a15545f6fc3ed41f24a6a58ff13dc6b031276a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Sep 2011 11:19:55 +0000 Subject: [PATCH 446/504] * wxPython updated to 2.8.12.0. svn path=/nixpkgs/trunk/; revision=29395 --- pkgs/development/python-modules/wxPython/2.8.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix index d574909d4e2..8819605528d 100644 --- a/pkgs/development/python-modules/wxPython/2.8.nix +++ b/pkgs/development/python-modules/wxPython/2.8.nix @@ -2,14 +2,16 @@ assert wxGTK.unicode; +let version = "2.8.12.1"; in + stdenv.mkDerivation { - name = "wxPython-2.8.12.0"; + name = "wxPython-${version}"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/wxpython/wxPython-src-2.8.12.0.tar.bz2; - sha256 = "1gdsk1p8ds4jd00habxy4y8m56247a5s1mvq1lm1r6475dvq4pkd"; + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ]; From 267e1235083bf956831cbd971b97e4615af80e83 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Sep 2011 11:20:15 +0000 Subject: [PATCH 447/504] * Latest Tribler. svn path=/nixpkgs/trunk/; revision=29396 --- pkgs/applications/networking/p2p/tribler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index dc08d6ca3eb..afd16dbb2a8 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: -let rev = "22245"; in +let rev = "22523"; in stdenv.mkDerivation { - name = "tribler-5.4.2-pre${rev}"; + name = "tribler-5.4.3-pre${rev}"; src = fetchsvn { url = http://svn.tribler.org/abc/branches/release-5.4.x; inherit rev; - sha256 = "09b3iz3yy1dpl30cd2iningzhm1grz6qjgv0qb3wk0v1vxkacddz"; + sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; From 03e747c41ab9057f8203a3f77b4e52b5d3c868c6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 16:18:04 +0000 Subject: [PATCH 448/504] Add a script to generate fetchurl_gnome args svn path=/nixpkgs/trunk/; revision=29397 --- maintainers/scripts/gnome-latest.sh | 105 ++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100755 maintainers/scripts/gnome-latest.sh diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh new file mode 100755 index 00000000000..00ec1a105da --- /dev/null +++ b/maintainers/scripts/gnome-latest.sh @@ -0,0 +1,105 @@ +#!/bin/sh + +GNOME_FTP="ftp.gnome.org/pub/GNOME/sources" + +project=$1 + +if [ "$project" == "--help" ]; then + echo "Usage: $0 project [major.minor]" + exit 0 +fi + +baseVersion=$2 + +if [ -z "$project" ]; then + echo "No project specified, exiting" + exit 1 +fi + +# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have +# any conversations with sysadmin. Somehow lftp works. +if [ "$FTP_CLIENT" = "lftp" ]; then + ls_ftp() { + lftp -c "open $1; cls" + } +else + ls_ftp() { + curl -l "$1"/ + } +fi + +if [ -z "$baseVersion" ]; then + echo "Looking for available versions..." >&2 + available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` ) + echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 + echo -en "Choose one of them: " >&2 + read baseVersion +fi + +FTPDIR="${GNOME_FTP}/${project}/${baseVersion}" + +#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` +# gnome's LATEST-IS is broken. Do not trust it. + +files=$(ls_ftp "${FTPDIR}") +declare -A versions + +for f in $files; do + case $f in + (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*): + ;; + ($project-*.*.9*.tar.*): + tmp=${f#$project-} + tmp=${tmp%.tar*} + echo "Ignored unstable version ${tmp}" >&2 + ;; + ($project-*.tar.*): + tmp=${f#$project-} + tmp=${tmp%.tar*} + versions[${tmp}]=1 + ;; + (*): + echo "UNKNOWN FILE $f" + ;; + esac +done +echo "Found versions ${!versions[@]}" >&2 +version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1` +echo "Latest version is: ${version}" >&2 + +name=${project}-${version} +echo "Fetching .sha256 file" >&2 +curl -O http://${FTPDIR}/${name}.sha256sum + +extensions=( "xz" "bz2" "gz" ) +echo "Choosing archive extension (known are ${extensions[@]})..." >&2 +for ext in ${extensions[@]}; do + if grep "\\.tar\\.${ext}$" ${name}.sha256sum >& /dev/null; then + ext_pref=$ext + sha256=$(grep "\\.tar\\.${ext}$" ${name}.sha256sum | cut -f1 -d\ ) + break + fi +done +sha256=`nix-hash --to-base32 --type sha256 $sha256` +echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 + +cat <&2 From de8958223842edb17527f1a2427be72929f0a64a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 16:18:12 +0000 Subject: [PATCH 449/504] Add gtk-3.x libraries Let hydra build it but do not show in nix-env -qa svn path=/nixpkgs/trunk/; revision=29398 --- pkgs/development/libraries/atk/2.1.x.nix | 37 ++++++++++++++ pkgs/development/libraries/glib/2.29.x.nix | 49 ++++++++++++++++++ pkgs/development/libraries/gtk+/3.1.x.nix | 55 +++++++++++++++++++++ pkgs/development/libraries/pango/1.29.x.nix | 37 ++++++++++++++ pkgs/top-level/all-packages.nix | 17 +++++++ 5 files changed, 195 insertions(+) create mode 100644 pkgs/development/libraries/atk/2.1.x.nix create mode 100644 pkgs/development/libraries/glib/2.29.x.nix create mode 100644 pkgs/development/libraries/gtk+/3.1.x.nix create mode 100644 pkgs/development/libraries/pango/1.29.x.nix diff --git a/pkgs/development/libraries/atk/2.1.x.nix b/pkgs/development/libraries/atk/2.1.x.nix new file mode 100644 index 00000000000..28619a85c03 --- /dev/null +++ b/pkgs/development/libraries/atk/2.1.x.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl_gnome, pkgconfig, perl, glib, xz }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "atk"; + major = "2"; minor = "1"; patchlevel = "5"; extension = "xz"; + sha256 = "005b9sq8p9ykp4f35b59si3mcbw4p9hyxps1ij4x73p07rrbf0z9"; + }; + + buildNativeInputs = [ pkgconfig perl xz ]; + + propagatedBuildInputs = [ glib ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "ATK, the accessibility toolkit"; + + longDescription = '' + ATK is the Accessibility Toolkit. It provides a set of generic + interfaces allowing accessibility technologies such as screen + readers to interact with a graphical user interface. Using the + ATK interfaces, accessibility tools have full access to view and + control running applications. + ''; + + homepage = http://library.gnome.org/devel/atk/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/glib/2.29.x.nix b/pkgs/development/libraries/glib/2.29.x.nix new file mode 100644 index 00000000000..589ec625dcc --- /dev/null +++ b/pkgs/development/libraries/glib/2.29.x.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi +, python }: + +# TODO: +# * Add gio-module-fam +# Problem: cyclic dependency on gamin +# Possible solution: build as a standalone module, set env. vars +# * Make it build without python +# Problem: an example (test?) program needs it. +# Possible solution: disable compilation of this example somehow +# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i +# $out/bin/gtester-report' to postInstall if this is solved + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "glib"; + major = "2"; minor = "29"; patchlevel = "18"; extension = "xz"; + sha256 = "1hc198x625w1w8if1xlvqyjs9aazc27s0l374kqc4sr51wcpbxpy"; + }; + + # configure script looks for d-bus but it is only needed for tests + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildNativeInputs = [ perl pkgconfig gettext xz python ]; + + propagatedBuildInputs = [ zlib libffi ]; + + # glib buildsystem fails to find python, thus hardcodes python2.4 in #! + postInstall = ''rm -rvf $out/share/gtk-doc''; + + meta = { + description = "GLib, a C library of programming buildings blocks"; + + longDescription = '' + GLib provides the core application building blocks for libraries + and applications written in C. It provides the core object + system used in GNOME, the main loop implementation, and a large + set of utility functions for strings and common data structures. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [raskin urkud]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtk+/3.1.x.nix b/pkgs/development/libraries/gtk+/3.1.x.nix new file mode 100644 index 00000000000..5b473d44e7e --- /dev/null +++ b/pkgs/development/libraries/gtk+/3.1.x.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs +, gdk_pixbuf, xz +, xineramaSupport ? true +, cupsSupport ? true, cups ? null +}: + +assert xineramaSupport -> xlibs.libXinerama != null; +assert cupsSupport -> cups != null; + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "gtk+"; + major = "3"; minor = "1"; patchlevel = "16"; extension = "xz"; + sha256 = "15arbf75qpchr9wrawb3zkn52rzf5wm2qv4dq10zfzlflimrq2rg"; + }; + + enableParallelBuilding = true; + + buildNativeInputs = [ perl pkgconfig xz ]; + + propagatedBuildInputs = + [ xlibs.xlibs glib atk pango gdk_pixbuf cairo + xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi + ] + ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama + ++ stdenv.lib.optionals cupsSupport [ cups ]; + + configureFlags = "--with-xinput=yes"; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A multi-platform toolkit for creating graphical user interfaces"; + + longDescription = '' + GTK+ is a highly usable, feature rich toolkit for creating + graphical user interfaces which boasts cross platform + compatibility and an easy to use API. GTK+ it is written in C, + but has bindings to many other popular programming languages + such as C++, Python and C# among others. GTK+ is licensed + under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK+ without any license fees or + royalties. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [urkud raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix new file mode 100644 index 00000000000..14dd3d8c5a5 --- /dev/null +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "pango"; + major = "1"; minor = "29"; patchlevel = "3"; extension = "xz"; + sha256 = "0vp88j3ghngkkc4dpya443qng0bb1g86g54bcwf4lf3zmk6r1nmh"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; + + buildNativeInputs = [ pkgconfig xz ]; + + propagatedBuildInputs = [ x11 glib cairo libpng ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A library for laying out and rendering of text, with an emphasis on internationalization"; + + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK+ widget toolkit. + Pango forms the core of text and font handling for GTK+-2.x. + ''; + + homepage = http://www.pango.org/; + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba91b42d67b..0547f5c1216 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3564,6 +3564,23 @@ let }); + gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { + glib = callPackage ../development/libraries/glib/2.29.x.nix { }; + + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; + + atk = callPackage ../development/libraries/atk/2.1.x.nix { }; + + cairo = callPackage ../development/libraries/cairo { }; + + pango = callPackage ../development/libraries/pango/1.29.x.nix { }; + + gtk = callPackage ../development/libraries/gtk+/3.1.x.nix { }; + + # Let hydra build gtk-3.x but do not show this to users yet + recurseForRelease = true; + }; + gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { inherit (gnome) gtk; gtksharp = gtksharp2; From a26835c2bc8803ddc557ad8dde12668b239f7f47 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Tue, 20 Sep 2011 19:46:40 +0000 Subject: [PATCH 450/504] development/libraries/nss: Fix building on Linux 3.x. svn path=/nixpkgs/trunk/; revision=29399 --- pkgs/development/libraries/nss/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index f4ed2381010..ef5cfee5930 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { postPatch = '' sed -i -e "/^PREFIX =/s:= /usr:= $out:" \ "mozilla/security/nss/config/Makefile" + ln -s Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk ''; preConfigure = "cd mozilla/security/nss"; From 0be69080e8c985e4f7bd86ed0bc6b28cd440f050 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Sep 2011 20:25:26 +0000 Subject: [PATCH 451/504] pkgs/misc/cups/drivers/splix: added myself as a maintainer svn path=/nixpkgs/trunk/; revision=29400 --- pkgs/misc/cups/drivers/splix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index b832e928bef..532ef2a45d5 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -18,5 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://splix.sourceforge.net; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From df1a47bda2374445f5d8509e2ee1670f3ca72d90 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Sep 2011 20:25:31 +0000 Subject: [PATCH 452/504] haskell-hakyll: updated to version 3.2.0.7 svn path=/nixpkgs/trunk/; revision=29401 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index f25d1069a58..d9a8b38730a 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.0.6"; - sha256 = "11jdajciswswv9ciyd6hk7qc39l09y9s528vazxq0k6z5mwvwrbp"; + version = "3.2.0.7"; + sha256 = "1p06596yfsa0lk5ipdxm1b8j81aph2k30pm2g6ghw6k7fglklyl5"; buildDepends = [ binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time From f844c8730ea3103b574a911a3f6d325102bd5184 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Sep 2011 20:30:20 +0000 Subject: [PATCH 453/504] haskell-json: added version 0.5 svn path=/nixpkgs/trunk/; revision=29402 --- .../haskell/json/{default.nix => 0.4.4.nix} | 0 pkgs/development/libraries/haskell/json/0.5.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 20 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/json/{default.nix => 0.4.4.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/json/0.5.nix diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/0.4.4.nix similarity index 100% rename from pkgs/development/libraries/haskell/json/default.nix rename to pkgs/development/libraries/haskell/json/0.4.4.nix diff --git a/pkgs/development/libraries/haskell/json/0.5.nix b/pkgs/development/libraries/haskell/json/0.5.nix new file mode 100644 index 00000000000..a748c2b4f58 --- /dev/null +++ b/pkgs/development/libraries/haskell/json/0.5.nix @@ -0,0 +1,17 @@ +{ cabal, mtl, parsec, syb }: + +cabal.mkDerivation (self: { + pname = "json"; + version = "0.5"; + sha256 = "12jbvq0lp7z5q6g94pv8s5455yydfyh9h2xlr76wqzfh3myvy6fl"; + buildDepends = [ mtl parsec syb ]; + meta = { + description = "Support for serialising Haskell to and from JSON"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0b5547db958..7c7cc98a4ed 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -793,7 +793,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); WebBitsHtml = self.WebBitsHtml_1_0_1; }; - json = callPackage ../development/libraries/haskell/json/default.nix {}; + json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {}; + json_0_5 = callPackage ../development/libraries/haskell/json/0.5.nix {}; + json = self.json_0_4_4; jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; From d9ad31c468771d94636464c15b431b2526aa2f86 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 22:49:07 +0000 Subject: [PATCH 454/504] pfstools-1.8.3; builds against qt4 svn path=/nixpkgs/trunk/; revision=29403 --- pkgs/tools/graphics/pfstools/default.nix | 18 +++++++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 2d9ab632f1c..0c829eab130 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,17 +1,21 @@ -{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt, mesa, -freeglut, bzip2, libX11, libpng, expat }: +{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt4, mesa, +freeglut, bzip2, libX11, libpng, expat, pkgconfig }: -stdenv.mkDerivation { - name = "pfstools-1.8.0"; +stdenv.mkDerivation rec { + name = "pfstools-1.8.3"; src = fetchurl { - url = mirror://sourceforge/pfstools/pfstools-1.8.0.tar.gz; - sha256 = "19gncsfhypiaarsyhmca52yjx8cv86n31b6hxmdac8z4pczhg3gv"; + url = "mirror://sourceforge/pfstools/${name}.tar.gz"; + sha256 = "1j3pzwpxvsx9220176bfjallc73jyda61xqkvnmlxqfd3n7ycgx1"; }; - buildInputs = [ libtiff openexr imagemagick libjpeg qt mesa freeglut + configureFlags = "--with-moc=${qt4}/bin/moc"; + + buildInputs = [ libtiff openexr imagemagick libjpeg qt4 mesa freeglut bzip2 libX11 libpng expat ]; + buildNativeInputs = [ pkgconfig ]; + meta = { homepage = http://pfstools.sourceforge.net/; description = "Toolkit for manipulation of HDR images"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0547f5c1216..31256e5e8fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1147,9 +1147,7 @@ let ssh = openssh; }; - pfstools = callPackage ../tools/graphics/pfstools { - qt = qt3; - }; + pfstools = callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { }; From 9ee523053704b30274f4817d1c7f63771e29e1b2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 22:49:13 +0000 Subject: [PATCH 455/504] Move qt3/qt4 choice to .nix expressions svn path=/nixpkgs/trunk/; revision=29404 --- pkgs/applications/science/electronics/qucs/default.nix | 4 ++-- pkgs/tools/text/qshowdiff/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 ++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 1218ad71180..979faa2e597 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt, libX11}: +{stdenv, fetchurl, qt3, libX11}: stdenv.mkDerivation rec { name = "qucs-0.0.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp"; }; - buildInputs = [ qt libX11 ]; + buildInputs = [ qt3 libX11 ]; meta = { description = "Integrated circuit simulator"; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index ee87bffc672..d033cf4ba6f 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, qt, perl}: +{stdenv, fetchurl, qt4, perl}: stdenv.mkDerivation rec { name = "qshowdiff-1.2"; src = fetchurl { - url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz; + url = "http://qshowdiff.danfis.cz/files/${name}.tar.gz"; sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3"; }; - buildInputs = [ qt perl ]; + buildInputs = [ qt4 perl ]; configurePhase = '' ensureDir $out/{bin,man/man1} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31256e5e8fe..1074e52ac86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1216,9 +1216,7 @@ let qhull = callPackage ../development/libraries/qhull { }; - qshowdiff = callPackage ../tools/text/qshowdiff { - qt = qt4; - }; + qshowdiff = callPackage ../tools/text/qshowdiff { }; radvd = callPackage ../tools/networking/radvd { }; @@ -8130,9 +8128,7 @@ let ngspice = callPackage ../applications/science/electronics/ngspice { }; - qucs = callPackage ../applications/science/electronics/qucs { - qt = qt3; - }; + qucs = callPackage ../applications/science/electronics/qucs { }; xoscope = callPackage ../applications/science/electronics/xoscope { }; From 03892b3e01ab2ae43c76ae588b6068365eef2fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Sep 2011 06:15:15 +0000 Subject: [PATCH 456/504] Making bison 2.5 cross build. svn path=/nixpkgs/trunk/; revision=29405 --- pkgs/development/tools/parsing/bison/bison-2.5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix index e373a80e46d..24fc0d1bbb3 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.5.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.5.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa"; }; - buildInputs = [ m4 ] + buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; doCheck = true; From 53cecc13b45b84cc6500f46b63d938ba59a74050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Sep 2011 06:59:09 +0000 Subject: [PATCH 457/504] Fixing strace build inputs for cross building. svn path=/nixpkgs/trunk/; revision=29407 --- pkgs/development/tools/misc/strace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index a370757b37c..6bd2619e4d3 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12n2faqq7whmszpjhv2lcb06r7900j53p0zl7vipi18inr0smycy"; }; - buildInputs = [ xz perl ]; + buildNativeInputs = [ xz perl ]; meta = { homepage = http://strace.sourceforge.net/; From c289ea7c4f936198a6334f59336b7451dddb2ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Sep 2011 07:04:22 +0000 Subject: [PATCH 458/504] Making rsync cross build. svn path=/nixpkgs/trunk/; revision=29408 --- pkgs/applications/networking/sync/rsync/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 3c84ee56a68..cf770213ef9 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y"; }; - buildInputs = [perl] ++ stdenv.lib.optional enableACLs acl; + buildInputs = stdenv.lib.optional enableACLs acl; + buildNativeInputs = [perl]; meta = { homepage = http://samba.anu.edu.au/rsync/; From 1cf90e9d3513e9a4a02a9d853dd8a9e60289ac96 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Sep 2011 07:22:19 +0000 Subject: [PATCH 459/504] * Added Catalyst::Plugin::Unicode::Encoding. svn path=/nixpkgs/trunk/; revision=29409 --- pkgs/top-level/perl-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f16c45551a3..4caa1a10b5e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -448,6 +448,17 @@ rec { propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat]; }; + CatalystPluginUnicodeEncoding = buildPerlPackage rec { + name = "Catalyst-Plugin-Unicode-Encoding-1.2"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "0bz33xnh0wa6py6jz31wr38krad9hcv4gxdsy0lyhqn0k4v6b6dx"; + }; + propagatedBuildInputs = [ CatalystRuntime LWP ]; + #propagatedBuildInputs = + # [ CatalystRuntime CatalystPluginSession ClassInspector ]; + }; + CatalystPluginHTMLWidget = buildPerlPackage { name = "Catalyst-Plugin-HTML-Widget-1.1"; src = fetchurl { From 77c5f8754c4f6196df0c81cb57af86d066fc53bd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Sep 2011 07:30:04 +0000 Subject: [PATCH 460/504] * Remove comment. svn path=/nixpkgs/trunk/; revision=29410 --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4caa1a10b5e..207ecce4e96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -455,8 +455,6 @@ rec { sha256 = "0bz33xnh0wa6py6jz31wr38krad9hcv4gxdsy0lyhqn0k4v6b6dx"; }; propagatedBuildInputs = [ CatalystRuntime LWP ]; - #propagatedBuildInputs = - # [ CatalystRuntime CatalystPluginSession ClassInspector ]; }; CatalystPluginHTMLWidget = buildPerlPackage { From ed9d78b75f2c408cb884f0ef8157ed0d4a642414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Sep 2011 07:33:38 +0000 Subject: [PATCH 461/504] Adding pngcrush svn path=/nixpkgs/trunk/; revision=29411 --- pkgs/tools/graphics/pngcrush/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/graphics/pngcrush/default.nix diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix new file mode 100644 index 00000000000..caa99d2c4e2 --- /dev/null +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libpng, xz }: + +stdenv.mkDerivation rec { + name = "pngcrush-1.7.17"; + + src = fetchurl { + url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; + sha256 = "0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2"; + }; + + configurePhase = '' + sed -i s,/usr,$out, Makefile + ''; + + buildInputs = [ xz libpng ]; + + meta = { + homepage = http://pmt.sourceforge.net/pngcrush; + description = "A PNG optimizer"; + license = "free"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1074e52ac86..c38c117e9d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1165,6 +1165,8 @@ let plotutils = callPackage ../tools/graphics/plotutils { }; + pngcrush = callPackage ../tools/graphics/pngcrush { }; + pngnq = callPackage ../tools/graphics/pngnq { }; polipo = callPackage ../servers/polipo { }; From b4a6893b85e2a793bfd734a45f07d8b838451930 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Sep 2011 09:13:18 +0000 Subject: [PATCH 462/504] * Fix Compress::Zlib. svn path=/nixpkgs/trunk/; revision=29412 --- pkgs/top-level/perl-packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 207ecce4e96..8c8665842a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -771,14 +771,7 @@ rec { inherit (pkgs) zlib; }; - CompressZlib = buildPerlPackage rec { - name = "Compress-Zlib-2.015"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "1k1i539fszhxay8yllh687sw06i68g8ikw51pvy1c84p3kg6yk4v"; - }; - propagatedBuildInputs = [ CompressRawZlib IOCompress ]; - }; + CompressZlib = IOCompress; CompressUnLZMA = buildPerlPackage rec { name = "Compress-unLZMA-0.04"; From 6bc5b0f21525f451f57276d37fdd536ee826e8ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:46:39 +0000 Subject: [PATCH 463/504] haskell-maude: added version 0.2.1 svn path=/nixpkgs/trunk/; revision=29414 --- .../libraries/haskell/maude/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/maude/default.nix diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix new file mode 100644 index 00000000000..f9d7f68eaf6 --- /dev/null +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -0,0 +1,18 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "maude"; + version = "0.2.1"; + sha256 = "10igixljxfrpns2ffvk4g5dsv2pr8p1f7hc65z5x91n6x8zd01vi"; + buildDepends = [ text ]; + meta = { + homepage = "https://code.google.com/p/maude-hs/"; + description = "An interface to the Maude rewriting system"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c7cc98a4ed..0d4937e0e02 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -815,6 +815,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); logfloat = callPackage ../development/libraries/haskell/logfloat {}; + maude = callPackage ../development/libraries/haskell/maude {}; + MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; From 3a44af3accbbff26ed9224d167dc9827675fd7b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:46:44 +0000 Subject: [PATCH 464/504] Updated 'fgl' attribute to point to the latest version of the library. This has no practical effect, because we override that attributed based on the compiler version that's being used, but it still feels like the right thing to do. svn path=/nixpkgs/trunk/; revision=29415 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0d4937e0e02..b7bc9ff9397 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -567,7 +567,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; - fgl = self.fgl_5_4_2_2; + fgl = self.fgl_5_4_2_4; fingertree = callPackage ../development/libraries/haskell/fingertree {}; From d10badf202ef054b6ac676af53456f3bb2a2f56b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:46:48 +0000 Subject: [PATCH 465/504] haskell-graphviz: build with the latest fgl version This change is required for building the Haskell prolog interpreter. svn path=/nixpkgs/trunk/; revision=29416 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b7bc9ff9397..864aac89745 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -634,7 +634,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {}; - graphviz = callPackage ../development/libraries/haskell/graphviz {}; + graphviz = callPackage ../development/libraries/haskell/graphviz { + fgl = self.fgl_5_4_2_4; + }; hakyll = callPackage ../development/libraries/haskell/hakyll { hamlet = self.hamlet_0_8_2_1; From 54acb664731f856eebcf2536c8cf4c8a80387816 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:46:54 +0000 Subject: [PATCH 466/504] haskell-prolog: added version 0.1 haskell-prolog-graph: added version 0.1.0.2 haskell-prolog-graph-lib: added version 0.1 svn path=/nixpkgs/trunk/; revision=29417 --- .../haskell/prolog-graph-lib/default.nix | 18 +++++++++++++++ .../haskell/prolog-graph/default.nix | 23 +++++++++++++++++++ .../libraries/haskell/prolog/default.nix | 18 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++++++ 4 files changed, 67 insertions(+) create mode 100644 pkgs/development/libraries/haskell/prolog-graph-lib/default.nix create mode 100644 pkgs/development/libraries/haskell/prolog-graph/default.nix create mode 100644 pkgs/development/libraries/haskell/prolog/default.nix diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix new file mode 100644 index 00000000000..5459b8fa6dc --- /dev/null +++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix @@ -0,0 +1,18 @@ +{ cabal, fgl, graphviz, mtl, prolog, text }: + +cabal.mkDerivation (self: { + pname = "prolog-graph-lib"; + version = "0.1"; + sha256 = "1gryhk0jd8bvmjbjkz6n7sfnsa6iwzkckpgi51xsj5f2nwdxbl6g"; + buildDepends = [ fgl graphviz mtl prolog text ]; + meta = { + homepage = "https://github.com/Erdwolf/prolog"; + description = "Generating images of resolution trees for Prolog queries"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix new file mode 100644 index 00000000000..446a430ed7c --- /dev/null +++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix @@ -0,0 +1,23 @@ +{ cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text +}: + +cabal.mkDerivation (self: { + pname = "prolog-graph"; + version = "0.1.0.2"; + sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + cmdargs fgl graphviz mtl prolog prologGraphLib text + ]; + meta = { + homepage = "https://github.com/Erdwolf/prolog"; + description = "A command line tool to visualize query resolution in Prolog"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix new file mode 100644 index 00000000000..6702e2e3887 --- /dev/null +++ b/pkgs/development/libraries/haskell/prolog/default.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, parsec, syb, thLift, transformers }: + +cabal.mkDerivation (self: { + pname = "prolog"; + version = "0.1"; + sha256 = "00791fb1f84wq42wvacnjl290fbn28x9hknxsic3ksi3f7psladm"; + buildDepends = [ mtl parsec syb thLift transformers ]; + meta = { + homepage = "https://github.com/Erdwolf/prolog"; + description = "A Prolog interpreter written in Haskell"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 864aac89745..ecf9f71dcce 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -948,6 +948,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; + prolog = callPackage ../development/libraries/haskell/prolog {}; + prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib { + fgl = self.fgl_5_4_2_4; + }; + prologGraph = callPackage ../development/libraries/haskell/prolog-graph { + fgl = self.fgl_5_4_2_4; + }; + PSQueue = callPackage ../development/libraries/haskell/PSQueue {}; pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {}; From 4821046eb39f962c29304e5374829156b732d9cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:46:59 +0000 Subject: [PATCH 467/504] haskell-skein: added version 0.1 svn path=/nixpkgs/trunk/; revision=29418 --- .../development/libraries/haskell/skein/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/skein/default.nix diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix new file mode 100644 index 00000000000..b438e9a7cce --- /dev/null +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -0,0 +1,13 @@ +{ cabal, cereal, cryptoApi, tagged }: + +cabal.mkDerivation (self: { + pname = "skein"; + version = "0.1"; + sha256 = "10fnhbjdq4vrpl17b27pmxg943wsxv27js6p5nrgyzx9ybmdrmdi"; + buildDepends = [ cereal cryptoApi tagged ]; + meta = { + description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ecf9f71dcce..777a24e0cbd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1054,6 +1054,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; + skein = callPackage ../development/libraries/haskell/skein {}; + smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; From ac569c9b63970be0201005e46be479baa221fa16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:47:07 +0000 Subject: [PATCH 468/504] haskell-RSA: updated to version 1.0.6.2 svn path=/nixpkgs/trunk/; revision=29419 --- pkgs/development/libraries/haskell/RSA/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 7476896337c..c5b8efc67f6 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "RSA"; - version = "1.0.6.1"; - sha256 = "1d0birzvapcsgay0wwh5v9mcd77sghj1bps9ws04ww9ga97gyp0l"; + version = "1.0.6.2"; + sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk"; isLibrary = true; isExecutable = true; buildDepends = [ binary pureMD5 random SHA ]; From b40cab3fab3d106248c8923407721a10feba228a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:47:14 +0000 Subject: [PATCH 469/504] haskell-aeson-native: updated to version 0.3.3.1 svn path=/nixpkgs/trunk/; revision=29420 --- pkgs/development/libraries/haskell/aeson-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson-native/default.nix b/pkgs/development/libraries/haskell/aeson-native/default.nix index 3ec90bab76d..4b3d8da7bf5 100644 --- a/pkgs/development/libraries/haskell/aeson-native/default.nix +++ b/pkgs/development/libraries/haskell/aeson-native/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson-native"; - version = "0.3.3"; - sha256 = "1ckf0fqx0mdw7467kjk3q48fb4q5w6336i8fxk6j0wfk17xjfs8l"; + version = "0.3.3.1"; + sha256 = "15733f5ivymkbwvqgbd8scynl9adva3fnid4bzlr9l4sb3yvcz9p"; buildDepends = [ attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb text time unorderedContainers vector From 353d1e7882f04c3f45cbbcdbb4c7bf95101cf5f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:47:19 +0000 Subject: [PATCH 470/504] haskell-clientsession: updated to version 0.7.3 svn path=/nixpkgs/trunk/; revision=29421 --- .../libraries/haskell/clientsession/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 166e261836f..2c577fbc2ef 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,17 +1,16 @@ -{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher -, cryptohash +{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, skein }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.2"; - sha256 = "0jfpgzfgcmc80qrzxj6dsg6cbd97pscg5yp99c9f58m4igr3fb2q"; + version = "0.7.3"; + sha256 = "1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5"; buildDepends = [ - base64Bytestring cereal cryptoApi cryptocipher cryptohash + base64Bytestring cereal cryptoApi cryptocipher skein ]; meta = { homepage = "http://github.com/snoyberg/clientsession/tree/master"; - description = "Store session data in a cookie"; + description = "Securely store session data in a client-side cookie"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 981ad994f5be4ae060c8c43160546232de0ab1e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:47:23 +0000 Subject: [PATCH 471/504] haskell-hmatrix: updated to version 0.12.0.1 svn path=/nixpkgs/trunk/; revision=29422 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index e82aff91854..43c66c3d894 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.12.0.0"; - sha256 = "1j4c3my6i3xz6b4pyy98722zmgky27ls7a7w13ilwmnhb7pvq9al"; + version = "0.12.0.1"; + sha256 = "1lnq1892vzx094d84jfs2477m3w47xgmqvnvzignwgfi470d9lw5"; buildDepends = [ binary HUnit QuickCheck random storableComplex vector ]; From 865b08c151bfce5de7336dfc2d75b4687962104f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 16:47:27 +0000 Subject: [PATCH 472/504] haskell-system-fileio: updated to version 0.3.2.1 svn path=/nixpkgs/trunk/; revision=29423 --- pkgs/development/libraries/haskell/system-fileio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 0f29a5f23bd..172489f6b52 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.2"; - sha256 = "10s0mih3mhpm0mh424kk330680qplwaddffr4rm4cf1bi7gbzrcq"; + version = "0.3.2.1"; + sha256 = "0a0vkbj9z5i74g6kkz3n4ffmvinavmnak0zxsx0fck18ppdgv394"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/hs-fileio/"; From 6fcd493d5fb64132b377ce62777a1ef83cc94a82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 18:45:52 +0000 Subject: [PATCH 473/504] openssl: added myself as a maintainer svn path=/nixpkgs/trunk/; revision=29425 --- pkgs/development/libraries/openssl/1.0.0e.nix | 6 ++++-- pkgs/development/libraries/openssl/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix index b1e1c3aa1d0..73cdd1c3162 100644 --- a/pkgs/development/libraries/openssl/1.0.0e.nix +++ b/pkgs/development/libraries/openssl/1.0.0e.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; - + # On x86_64-darwin, "./config" misdetects the system as # "darwin-i386-cc". So specify the system type explicitly. configureScript = if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; - + configureFlags = "shared --libdir=lib"; makeFlags = "MANDIR=$(out)/share/man"; @@ -66,5 +66,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4897d08574d..52336ba3d50 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; - + # On x86_64-darwin, "./config" misdetects the system as # "darwin-i386-cc". So specify the system type explicitly. configureScript = if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; - + configureFlags = "shared --libdir=lib"; postInstall = @@ -54,5 +54,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From d709ef5d30dfddb06bfa475ba82256b3692dd3de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Sep 2011 18:48:04 +0000 Subject: [PATCH 474/504] openssl: avoid the need for a recursive expression svn path=/nixpkgs/trunk/; revision=29426 --- pkgs/development/libraries/openssl/1.0.0e.nix | 6 ++++-- pkgs/development/libraries/openssl/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix index 73cdd1c3162..01f9eca15bb 100644 --- a/pkgs/development/libraries/openssl/1.0.0e.nix +++ b/pkgs/development/libraries/openssl/1.0.0e.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, perl }: let + name = "openssl-1.0.0e"; + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) stdenv.cross; in -stdenv.mkDerivation rec { - name = "openssl-1.0.0e"; +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 52336ba3d50..e51b88f5bca 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, perl }: let + name = "openssl-1.0.0d"; + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) stdenv.cross; in -stdenv.mkDerivation rec { - name = "openssl-1.0.0d"; +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; From 12a38dd5c674e0347bb49b8c844c03d0fbc4bbb3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 21 Sep 2011 20:04:43 +0000 Subject: [PATCH 475/504] notmuch-0.8 all tests pass svn path=/nixpkgs/trunk/; revision=29427 --- .../mailreaders/notmuch/default.nix | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 830ef82cf7a..a9456a30ecc 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,70 +1,75 @@ -{ fetchgit, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }: +{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }: stdenv.mkDerivation rec { - name = "notmuch-0.6-rc4"; + name = "notmuch-0.8"; - src = fetchgit { - url = "git://github.com/chaoflow/notmuch"; - rev = "9f8ef78e0c6b28918f3edda06b59a9e8f9bef8e3"; - sha256 = "c7c425c10a695ca22dfbdf5fe8e0dcb6a888edc0b3388023e7ff35f69acc0085"; + src = fetchurl { + url = "http://notmuchmail.org/releases/${name}.tar.gz"; + sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949"; }; buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ]; # XXX: Make me a loop patchPhase = '' - substituteInPlace "test/atomicity" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + # substituteInPlace "test/atomicity" \ + # --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" + substituteInPlace "test/aggregate-results.sh" \ + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/author-order" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/basic" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/crypto" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/dump-restore" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/emacs" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/emacs-large-search-buffer" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/encoding" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/from-guessing" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/json" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/long-id" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/maildir-sync" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/new" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/notmuch-test" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/raw" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/reply" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/search" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/search-by-folder" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/search-insufficient-from-quoting" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" + substituteInPlace "test/search-folder-coherence" \ + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/search-output" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/search-position-overlap-bug" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" + substituteInPlace "test/symbol-hiding" \ + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/test-lib.sh" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/test-verbose" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/thread-naming" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/thread-order" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace "test/uuencode" \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" ''; postBuild = '' From 3822bfd8d7bc163232be9d703635142e3a1aeb26 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 21 Sep 2011 20:05:24 +0000 Subject: [PATCH 476/504] ipython also as pythonPackages.ipython svn path=/nixpkgs/trunk/; revision=29428 --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f0152bcb11..8ec9e1a0896 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19,6 +19,12 @@ let pythonPackages = python.modules // rec { }; + ipython = import ../shells/ipython { + inherit (pkgs) stdenv fetchurl; + inherit buildPythonPackage pythonPackages; + }; + + wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; From 113f2c851f6efcdb8864584f896fbc36ec31d0cd Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 21 Sep 2011 20:05:38 +0000 Subject: [PATCH 477/504] iodine-0.6.0-rc1 svn path=/nixpkgs/trunk/; revision=29429 --- pkgs/tools/networking/iodine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 86430d3865c..33cc53d5511 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, nettools }: stdenv.mkDerivation rec { - name = "iodine-0.4.1"; + name = "iodine-0.6.0-rc1"; src = fetchurl { url = "http://code.kryo.se/iodine/${name}.tar.gz"; - sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5"; + sha256 = "dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60"; }; buildInputs = [ zlib ]; From ad3d180d6f30254f9971555c2418c88a523638bc Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 21 Sep 2011 23:23:12 +0000 Subject: [PATCH 478/504] attempt to fix talloc build on darwin see: https://bugzilla.samba.org/show_bug.cgi?id=7000 svn path=/nixpkgs/trunk/; revision=29430 --- pkgs/development/libraries/talloc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index f8fe2330cf9..9a37b106eaa 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { configureFlags = "--enable-talloc-compat1 --enable-largefile"; + patchPhase = if stdenv.isDarwin then '' + substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -install_name" + '' else ""; + meta = { description = "talloc is a hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; From cadbee1ab10cb145fc0961ef2cc20c0a7207f94e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 21 Sep 2011 23:31:51 +0000 Subject: [PATCH 479/504] indeed fix talloc build on darwin svn path=/nixpkgs/trunk/; revision=29431 --- pkgs/development/libraries/talloc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 9a37b106eaa..54db07d0de8 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { configureFlags = "--enable-talloc-compat1 --enable-largefile"; - patchPhase = if stdenv.isDarwin then '' + # https://bugzilla.samba.org/show_bug.cgi?id=7000 + postConfigure = if stdenv.isDarwin then '' substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -install_name" '' else ""; From 514e07ba96462a8234631861291b30b8bafec174 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 22 Sep 2011 02:07:49 +0000 Subject: [PATCH 480/504] Update freerdpUnstable svn path=/nixpkgs/trunk/; revision=29432 --- .../networking/remote/freerdp/unstable.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 0905e2c71bd..78e275690ac 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -13,20 +13,19 @@ , libXext , directfb , cunit -, xmonadHack ? false }: assert printerSupport -> cups != null; -let rev = "93d09e1a38a94c2436c53ef5ff99668e6c55ef96"; in +let rev = "42fb9f84e82268073a3838e6082783ba956ecc99"; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "freerdp-1.0pre${rev}"; src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; inherit rev; - sha256 = "a6662826fa0d8e5ecaaf42b40f1f3c54577a1d76ad58a01bd154647d5a1c01f7"; + sha256 = "5e77163e2a728802fc426860b3f5ff88cb2f2f3b0bbf0912e9e44c3d8fa060e5"; }; buildInputs = [ @@ -64,11 +63,5 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.shlevy ]; }; -} // (stdenv.lib.optionalAttrs xmonadHack { - #xmonad doesn't provide the _NET_WORKAREA atom, so we need to remove the - #call that relies on it. This just messes up sizing in non-fullscreen mode - postUnpack = '' - sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c - ''; -})) +} From 234a58870aa7ccd954b44a00b842c2ae898ed2ea Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 22 Sep 2011 06:31:35 +0000 Subject: [PATCH 481/504] Check bittornado with newer wxGTK, generic cleanup svn path=/nixpkgs/trunk/; revision=29433 --- pkgs/tools/networking/p2p/bit-tornado/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix index 98c53fdc3a7..640ffad9e52 100644 --- a/pkgs/tools/networking/p2p/bit-tornado/default.nix +++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix @@ -1,4 +1,5 @@ -{stdenv,fetchurl,python,wxPython26}: +{stdenv,fetchurl,python, wxPython, makeWrapper, + ssl}: stdenv.mkDerivation { name = "bit-tornado"; @@ -7,14 +8,15 @@ stdenv.mkDerivation { sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr"; }; - buildInputs = [python]; + buildInputs = [python wxPython makeWrapper ssl]; - buildPhase = " "; + buildPhase = '' ''; installPhase = '' python setup.py install --prefix=$out ; - echo 'export PYTHONPATH=$PYTHONPATH:'$out'/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages/wx-2.6-gtk2-unicode - python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 "$@";' > $out/bin/bittornado ; - chmod a+rx $out/bin/bittornado; + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" + done ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c38c117e9d0..a7a4ff99767 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -446,7 +446,9 @@ let gui = true; }; - bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; + bittornado = callPackage ../tools/networking/p2p/bit-tornado { + inherit (pythonPackages) ssl; + }; blueman = callPackage ../tools/bluetooth/blueman { inherit (pythonPackages) notify; From d7d67556548c3f4bd27b7fd08707f8164b0d7d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Sep 2011 09:15:48 +0000 Subject: [PATCH 482/504] Updating gnunet 0.9 svn version, although it brings little or nothing new I had noticed. svn path=/nixpkgs/trunk/; revision=29436 --- pkgs/applications/networking/p2p/gnunet/0.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/0.9.nix b/pkgs/applications/networking/p2p/gnunet/0.9.nix index 96dcfc746b4..221640930d7 100644 --- a/pkgs/applications/networking/p2p/gnunet/0.9.nix +++ b/pkgs/applications/networking/p2p/gnunet/0.9.nix @@ -8,7 +8,7 @@ assert gtkSupport -> (gtk != null) && (libglade != null); let - rev = "16910"; + rev = "17000"; version = "0.9-svn-${rev}"; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ in src = fetchsvn { url = "https://gnunet.org/svn/gnunet"; - sha256 = "1jxvh3wvhss0pn286p848zifc8f9pkhcb12m2bpkssh409wwyzkd"; + sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4"; inherit rev; }; From 1175e3e46bbdb3f521bc6e01d89523171e5270d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Sep 2011 09:19:33 +0000 Subject: [PATCH 483/504] Adding etherape, although it wants those gconf things I think. svn path=/nixpkgs/trunk/; revision=29437 --- .../networking/sniffers/etherape/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/sniffers/etherape/default.nix diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix new file mode 100644 index 00000000000..e268cdb7bba --- /dev/null +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, pkgconfig, gtk, libpcap, libglade, libgnome, libgnomeui, +gnomedocutils, scrollkeeper, libxslt}: + +stdenv.mkDerivation rec { + name = "etherape-0.9.12"; + src = fetchurl { + url = "mirror://sourceforge/etherape/${name}.tar.gz"; + sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k"; + }; + + configureFlags = [ "--disable-scrollkeeper" ]; + buildInputs = [ gtk libpcap pkgconfig libglade libgnome libgnomeui gnomedocutils + scrollkeeper libxslt ]; + + meta = { + homepage = http://etherape.sourceforge.net/; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7a4ff99767..8d1f5c106db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6459,6 +6459,10 @@ let esniper = callPackage ../applications/networking/esniper { }; + etherape = callPackage ../applications/networking/sniffers/etherape { + inherit (gnome) gnomedocutils libgnome libglade gtk libgnomeui scrollkeeper; + }; + evopedia = callPackage ../applications/misc/evopedia { }; keepassx = callPackage ../applications/misc/keepassx { }; From ddcb4a295dc68ffdc0fe904c0baa04190c0b66ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Sep 2011 11:28:56 +0000 Subject: [PATCH 484/504] Adding pdnsd svn path=/nixpkgs/trunk/; revision=29438 --- pkgs/tools/networking/pdnsd/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/pdnsd/default.nix diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix new file mode 100644 index 00000000000..4b111475e69 --- /dev/null +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pdnsd-1.2.8-par"; + + src = fetchurl { + url = http://www.phys.uu.nl/~rombouts/pdnsd/releases/pdnsd-1.2.8-par.tar.gz; + sha256 = "0ki4xkklc5lqs2qfmww63dc2zax48x8acfw661206ps4kvhasg2z"; + }; + + patchPhase = '' + sed -i 's/.*(cachedir).*/:/' Makefile.in + ''; + + meta = { + description = "Permanent DNS caching"; + homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html; + license = "GPLv3+"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d1f5c106db..dd8d8bc311f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1142,6 +1142,8 @@ let pdfread = callPackage ../tools/graphics/pdfread { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; + pg_top = callPackage ../tools/misc/pg_top { }; pdsh = callPackage ../tools/networking/pdsh { From f64620a11f8466d4127fd9e69654b8ef746bdde2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Sep 2011 15:25:21 +0000 Subject: [PATCH 485/504] haskell-skein: updated to version 0.1 svn path=/nixpkgs/trunk/; revision=29439 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index b438e9a7cce..2eebd665aa1 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -9,5 +9,9 @@ cabal.mkDerivation (self: { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From a10e8a4d07859bae8e9dbe731fd3b35683bfa5b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Sep 2011 15:25:29 +0000 Subject: [PATCH 486/504] haskell-xml: updated to version 1.3.10 svn path=/nixpkgs/trunk/; revision=29440 --- pkgs/development/libraries/haskell/xml/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 1125ac1b544..b5a56e3a1fa 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "xml"; - version = "1.3.9"; - sha256 = "1sx6k5dscpcy4aq09g7h0fz0sl4w2nrr4pnklgwrbrh6bf6kc6w2"; + version = "1.3.10"; + sha256 = "0mmibqzbbqmw4a8gc4f2yy144nx48gpfwj3iqq6dydvcikajxav2"; + buildDepends = [ text ]; meta = { homepage = "http://code.galois.com"; description = "A simple XML library"; From b57a4c5e17b36646abaf0f333b25bec7bba4fa75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Sep 2011 15:25:36 +0000 Subject: [PATCH 487/504] haskell-BNFC-meta: updated to version 0.2.2 svn path=/nixpkgs/trunk/; revision=29441 --- pkgs/development/tools/haskell/BNFC-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index 3661ece97bf..b269ebb4a88 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BNFC-meta"; - version = "0.2.1"; - sha256 = "0c58m1xkaylgp9f3r71nfgqb30fpidldz46dbwalhkb7fm0k4gmm"; + version = "0.2.2"; + sha256 = "07jfc0dcrcckibbw0xca1h7x3lnc9jfylfkcs23f0hyg31irf8dx"; buildDepends = [ alexMeta happyMeta haskellSrcMeta ]; meta = { description = "Deriving Quasi-Quoters from BNF Grammars"; From a407341c8c41e83bc38c6b7a9ca45d91891c4e14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Sep 2011 15:25:45 +0000 Subject: [PATCH 488/504] haskell-alex-meta: updated to version 0.2.0.2 svn path=/nixpkgs/trunk/; revision=29442 --- pkgs/development/tools/haskell/alex-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 58d8c3e1a10..5ec29160bb4 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "alex-meta"; - version = "0.2.0.1"; - sha256 = "1b508pg4a9f0ln9k91j5dj0mja3faxasz5k6qyxqz3zqnlysm2gj"; + version = "0.2.0.2"; + sha256 = "1v47p1nrx2nb92aasq7ml6i0sy1nfyybgm9n4r1sw1g86dg1y8z1"; buildDepends = [ haskellSrcMeta ]; meta = { description = "Quasi-quoter for Alex lexers"; From aecdd27b420afad7d0e2347ff2841fe11173f871 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Sep 2011 15:25:52 +0000 Subject: [PATCH 489/504] haskell-happy-meta: updated to version 0.2.0.3 svn path=/nixpkgs/trunk/; revision=29443 --- pkgs/development/tools/haskell/happy-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index f73d61924c5..a57ff5f6b88 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happy-meta"; - version = "0.2.0.2"; - sha256 = "1r9i01bnw0dz10balhpgiwcls5jwv5p09jafi8jl6hy0jwx7xydp"; + version = "0.2.0.3"; + sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9"; buildDepends = [ haskellSrcMeta mtl ]; meta = { description = "Quasi-quoter for Happy parsers"; From 8628e00f4537fe09a0a677b0dd719339bd68b497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 22 Sep 2011 19:46:33 +0000 Subject: [PATCH 490/504] GnuTLS 2.12.11. svn path=/nixpkgs/trunk/; revision=29444 --- pkgs/development/libraries/gnutls/2.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix index c79ca0894cd..cbb72754b1b 100644 --- a/pkgs/development/libraries/gnutls/2.12.nix +++ b/pkgs/development/libraries/gnutls/2.12.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.12.9"; + name = "gnutls-2.12.11"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "0ilfdyw6xr0w57aygmw1fvx56x2zh5la01y8bkx59crq927wk8bl"; + sha256 = "0q0kk69y1vpdxdz0mxqw603zi2y5kkgz3rvinc6bv6z9mwd8xd80"; }; configurePhase = '' From 7f08716911ac91eb9bf20c31e8019987fd430e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 22 Sep 2011 19:46:39 +0000 Subject: [PATCH 491/504] BitlBee: Use GnuTLS 2.x. svn path=/nixpkgs/trunk/; revision=29445 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd8d8bc311f..d46ec6f974d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6226,7 +6226,11 @@ let inherit (xlibs) libSM; }; - bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; + bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { + # For some reason, TLS support is broken when using GnuTLS 3.0 (can't + # connect to jabber.org, for instance.) + gnutls = gnutls2; + }; blender = callPackage ../applications/misc/blender/2.49.nix { }; From 48dbddd831daa2229dc3845e90292c9cd36fa84c Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Fri, 23 Sep 2011 00:03:21 +0000 Subject: [PATCH 492/504] Advance mysqlworkbench version to 5.2.35; fix failing build. svn path=/nixpkgs/trunk/; revision=29446 --- pkgs/applications/misc/mysql-workbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 28f463278d8..adf2810f937 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "5.2.33"; + version = "5.2.34"; name = "${pname}-${version}"; src = fetchurl { url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz"; - sha256 = "193iikz0wfm3yvazficxfiqb84f34psq0bcasp3l41n9dygbgldc"; + sha256 = "1b5ijaccy2k7if4pld8ihz1wa1wr1f9gj2m5xa4kf7v05zcx93c6"; }; buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool From 7186978ce93b385bc4ef50ecaa0dfe7bfc3e65ba Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Sep 2011 02:23:05 +0000 Subject: [PATCH 493/504] scummvm more deps svn path=/nixpkgs/trunk/; revision=29447 --- pkgs/games/scummvm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index c8f98522773..9c51db1ac98 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, zlib, mpeg2dec}: +{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }: stdenv.mkDerivation { name = "scummvm-1.2.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "029abzvpz85accwk7x79w255wr83gnkqg3yc5n6ryl28zg00z3j8"; }; - buildInputs = [SDL zlib mpeg2dec]; + buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]; crossAttrs = { preConfigure = '' @@ -27,3 +27,4 @@ stdenv.mkDerivation { homepage = http://www.scummvm.org/; }; } + From 637e57fc93c0c2ecf0dab417f138995166d46949 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Fri, 23 Sep 2011 02:46:05 +0000 Subject: [PATCH 494/504] Advance version of ur/web compiler to 20110917 svn path=/nixpkgs/trunk/; revision=29448 --- pkgs/development/compilers/urweb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 89501df648b..44067e4207d 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20110715"; + version = "20110917"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1qaz6alabhi7jmpsj7x0x4sskkjf05619maym133y2lkgdnvhydh"; + sha256 = "1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73"; }; buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export GCCARGS="-I$out/include \ + export CCARGS="-I$out/include \ -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; export PGHEADER="${postgresql}/include/libpq-fe.h"; From 8e6bbd66aa3718c9559d292a91efe3e07e32ec04 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 23 Sep 2011 06:52:10 +0000 Subject: [PATCH 495/504] Update LinuxDC++. Does not eliminate some of the strange segfaults svn path=/nixpkgs/trunk/; revision=29449 --- .../networking/p2p/ldcpp/default.nix | 59 +++++++++++-------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 79e7601e46e..f189d2eb781 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -1,31 +1,38 @@ -{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }: +{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }: with builderDefs; - let localDefs = builderDefs.passthru.function ((rec { - src = /* put a fetchurl here */ - fetchurl { - url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2; - sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv"; - }; + let localDefs = builderDefs.passthru.function ((rec { + src = /* put a fetchurl here */ + fetchurl { + url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; + sha256 = "66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a"; + }; - buildInputs = [scons pkgconfig gtk bzip2 libglade - openssl libX11]; - configureFlags = []; - doScons = fullDepEntry ('' - ensureDir $out - export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; - scons PREFIX=$out - scons PREFIX=$out install - '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; - })); - in with localDefs; + buildInputs = [scons pkgconfig gtk bzip2 libglade + openssl libX11 boost]; + configureFlags = []; + doScons = fullDepEntry ('' + ensureDir $out + export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; + + for i in gettext xgettext msgfmt msgcat; do + echo > $i + chmod a+x $i + done + export PATH=$PATH:$PWD + + scons PREFIX=$out + scons PREFIX=$out install + '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; + })); + in with localDefs; stdenv.mkDerivation rec { - name = "ldcpp-1.0.3"; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doScons doForceShare doPropagate]); - meta = { - description = "Linux DC++ - Direct Connect client"; - inherit src; - }; + name = "ldcpp-1.1.0"; + builder = writeScript (name + "-builder") + (textClosure localDefs + [doScons doForceShare doPropagate]); + meta = { + description = "Linux DC++ - Direct Connect client"; + inherit src; + }; } From 730afe1f8b6008baa3c41348274d3481259d4239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Sep 2011 11:16:10 +0000 Subject: [PATCH 496/504] lxc: added perl buildInput to fix the lxc-ps script Also added myself as a maintainer, improved the meta section a little, and stripped trailing whitespace. svn path=/nixpkgs/trunk/; revision=29450 --- pkgs/tools/system/lxc/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/tools/system/lxc/default.nix index 3d9e0f740b5..a4e44160a52 100644 --- a/pkgs/tools/system/lxc/default.nix +++ b/pkgs/tools/system/lxc/default.nix @@ -1,31 +1,33 @@ -{stdenv, fetchurl, libcap}: +{ stdenv, fetchurl, libcap, perl }: -stdenv.mkDerivation rec{ +let name = "lxc-0.7.5"; +in +stdenv.mkDerivation{ + inherit name; src = fetchurl { url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c"; }; - patchPhase = '' - sed -i -e '/ldconfig/d' src/lxc/Makefile.in - ''; + buildInputs = [ libcap perl ]; - configureFlags = [ "--localstatedir=/var" ]; + patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in"; - postInstall = '' + configureFlags = "--localstatedir=/var"; + + postInstall = '' cd "$out/lib" lib=liblxc.so.?.* ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/') ''; - buildInputs = [ libcap ]; - meta = { homepage = http://lxc.sourceforge.net; description = "lxc Linux Containers userland tools"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From f5e5bc24bebeb3d832cf6c3177d92ebda74da9e1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Sep 2011 15:08:55 +0000 Subject: [PATCH 497/504] Get ruby-1.9.2-p290 to build svn path=/nixpkgs/trunk/; revision=29453 --- .../development/interpreters/ruby/ruby-19.nix | 52 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 82393fe95c7..d5ccb19caec 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -1,14 +1,52 @@ -{ ruby18, fetchurl }: +{ stdenv, fetchurl +, zlib, zlibSupport ? true +, openssl, opensslSupport ? true +, gdbm, gdbmSupport ? true +, ncurses, readline, cursesSupport ? false +, groff, docSupport ? false +}: -ruby18.override rec { - version = "1.9.1-p243"; +let + op = stdenv.lib.optional; + ops = stdenv.lib.optionals; +in + +stdenv.mkDerivation rec { + version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}"; + name = "ruby-${version}"; + src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-${version}.tar.gz"; - sha256 = "1r4bls76dg97lqgwkxi6kbxzirkvjm21d4i2qyz469lnncvqwn9i"; + url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz"; + sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w"; }; - passthru = { - libPath = "lib/ruby-1.9"; + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + + buildInputs = (ops cursesSupport [ ncurses readline ] ) + ++ (op docSupport groff ) + ++ (op zlibSupport zlib) + ++ (op opensslSupport openssl) + ++ (op gdbmSupport gdbm); + + configureFlags = ["--enable-shared" "--enable-pthread"]; + + installFlags = stdenv.lib.optionalString docSupport "install-doc"; + # Bundler tries to create this directory + postInstall = "mkdir -pv $out/${passthru.gemPath}"; + + meta = { + license = "Ruby"; + homepage = "http://www.ruby-lang.org/en/"; + description = "The Ruby language"; + }; + + passthru = rec { + majorVersion = "1.9"; + minorVersion = "2"; + patchLevel = "290"; + libPath = "lib/ruby/${majorVersion}"; + gemPath = "lib/ruby/gems/${majorVersion}"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d46ec6f974d..6d6ffa69275 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2600,7 +2600,7 @@ let regina = callPackage ../development/interpreters/regina {}; ruby18 = callPackage ../development/interpreters/ruby { }; - #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; }; + ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { }; ruby = ruby18; rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { }); From 65898538b56ffbe55165bca1e44f9262044681e1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Sep 2011 15:23:30 +0000 Subject: [PATCH 498/504] Bump spotify... Sure wish they kept around old versions svn path=/nixpkgs/trunk/; revision=29454 --- pkgs/applications/audio/spotify/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index eb783e60fc5..d7409b25629 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let version = "0.5.2.84"; in +let version = "0.6.1.309"; in stdenv.mkDerivation { name = "spotify-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_i386.deb"; - sha256 = "0l1pvvkkssng0yc7zlgxr39jx3cs6i71sspmm4xb84y1bl045pas"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb"; + sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_amd64.deb"; - sha256 = "1wi1z3dyzjz13mkb0r2ilm914p8sg06923sv872nclrl102qbbni"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb"; + sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs"; } else throw "Spotify not supported on this platform."; From 35d07a5c34344c226e9a4384453333ddcaed93ab Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Sep 2011 15:37:05 +0000 Subject: [PATCH 499/504] Bump rubygems svn path=/nixpkgs/trunk/; revision=29455 --- pkgs/development/interpreters/ruby/rubygems.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index bfea04d1aba..60e83332c08 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -4,10 +4,10 @@ rec { # some packages (eg ruby-debug) still require 1.8. So let's stick to that for # now if nobody has different requirements - version = "1.4.1"; + version = "1.8.10"; src = fetchurl { url = "http://production.cf.rubygems.org/rubygems/${name}.tgz"; - sha256 = "189wg1msb4sdjvdzv9ia6q3lvjlygpp67wlbkl7cjb22bpjy4w4b"; + sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q"; }; From f607e23168486b11b94229b3903c87f3c0988e1e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Sep 2011 15:37:15 +0000 Subject: [PATCH 500/504] * Spotify needs OpenSSL now. svn path=/nixpkgs/trunk/; revision=29456 --- pkgs/applications/audio/spotify/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index d7409b25629..3a15d32aa7f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }: +{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -31,9 +31,15 @@ stdenv.mkDerivation { mv $out/usr/* $out/ rmdir $out/usr + # Work around Spotify referring to a specific minor version of + # OpenSSL. + mkdir $out/lib + ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8 + ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8 + patchelf \ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \ + --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib openssl stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64:$out/lib \ $out/bin/spotify preload=$out/libexec/spotify/libpreload.so From 03deb613305bc7498f2578ae3289b378ae3c25aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Sep 2011 16:08:52 +0000 Subject: [PATCH 501/504] haskell-NumInstances: added version 1.0 svn path=/nixpkgs/trunk/; revision=29457 --- .../libraries/haskell/NumInstances/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/NumInstances/default.nix diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix new file mode 100644 index 00000000000..7c5262edafe --- /dev/null +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "NumInstances"; + version = "1.0"; + sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy"; + meta = { + description = "Instances of numeric classes for functions and tuples"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 777a24e0cbd..acdf78684bd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -884,6 +884,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; + NumInstances = callPackage ../development/libraries/haskell/NumInstances {}; + numtype = callPackage ../development/libraries/haskell/numtype {}; OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; From 45e9e5e66bb378bfc45241a80ac0bcfe06dd267b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Sep 2011 16:08:57 +0000 Subject: [PATCH 502/504] haskell-cryptohash: updated to version 0.7.3 svn path=/nixpkgs/trunk/; revision=29458 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 5e1214e15ac..132a46be09e 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.7.2"; - sha256 = "1c23cgkp9y18yrahjn7nz5z2y3xdn16mrgpczidd6jwhp6f2zd42"; + version = "0.7.3"; + sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj"; isLibrary = true; isExecutable = true; buildDepends = [ cereal cryptoApi tagged ]; From 31d8e3cada61d5652c7fc633c5206a5050fb9a6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Sep 2011 16:09:01 +0000 Subject: [PATCH 503/504] haskell-neither: updated to version 0.3.0 svn path=/nixpkgs/trunk/; revision=29459 --- pkgs/development/libraries/haskell/neither/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix index 6bea3c10844..7d119b49e44 100644 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ b/pkgs/development/libraries/haskell/neither/default.nix @@ -1,10 +1,10 @@ -{ cabal, failure, monadPeel, transformers }: +{ cabal, failure, transformers }: cabal.mkDerivation (self: { pname = "neither"; - version = "0.2.0"; - sha256 = "0a2lyx3dvgzj4g6p69x1fma4rmwxrykji3hc4diqgc4hx02p16jh"; - buildDepends = [ failure monadPeel transformers ]; + version = "0.3.0"; + sha256 = "0lak4y0k4cisr27vw2bnpd0pa1kkgv8r96z7vf19wg7brzarx71l"; + buildDepends = [ failure transformers ]; meta = { homepage = "http://github.com/snoyberg/neither"; description = "Provide versions of Either with good monad and applicative instances"; From 8770aaea0ee564e99befb4a5c28e260f94b4b359 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Sep 2011 16:09:05 +0000 Subject: [PATCH 504/504] haskell-vector-space: updated to version 0.7.8 svn path=/nixpkgs/trunk/; revision=29460 --- .../libraries/haskell/vector-space/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 1cdb91761f4..3cc44a018f0 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -1,13 +1,13 @@ -{ cabal, Boolean, MemoTrie }: +{ cabal, Boolean, MemoTrie, NumInstances }: cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.7.6"; - sha256 = "166493dnlgrm9bsyp8dvdnkz1s5503casamihs4d3rij4fqvw7vf"; - buildDepends = [ Boolean MemoTrie ]; + version = "0.7.8"; + sha256 = "195g9zsb73w4a0fcfz0kank6gyqajww0qiqivr4fy0bik2nsr6ry"; + buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { homepage = "http://haskell.org/haskellwiki/vector-space"; - description = "Vector & affine spaces, linear maps, and derivatives (requires ghc 6.9 or better)"; + description = "Vector & affine spaces, linear maps, and derivatives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [