diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-13 12:35:26 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-13 12:35:26 +0000 |
| commit | 133b0bc637ff937940c3283b7d3f25820e194d20 (patch) | |
| tree | 1360c8fb76ff4ebc06d24d6c4890d665e413a3da /pkgs/development/libraries/openssl | |
| parent | 89686a22529cdb4ecee0569713f1798e645e120f (diff) | |
| download | nixlib-133b0bc637ff937940c3283b7d3f25820e194d20.tar nixlib-133b0bc637ff937940c3283b7d3f25820e194d20.tar.gz nixlib-133b0bc637ff937940c3283b7d3f25820e194d20.tar.bz2 nixlib-133b0bc637ff937940c3283b7d3f25820e194d20.tar.lz nixlib-133b0bc637ff937940c3283b7d3f25820e194d20.tar.xz nixlib-133b0bc637ff937940c3283b7d3f25820e194d20.tar.zst nixlib-133b0bc637ff937940c3283b7d3f25820e194d20.zip | |
* Go back to OpenSSL 0.9.7. Too much pain.
svn path=/nixpkgs/trunk/; revision=3333
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/dylib.patch | 30 |
2 files changed, 3 insertions, 37 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 44778a98128d..4740fefeb7ab 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,13 +1,9 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation { - name = "openssl-0.9.8"; + name = "openssl-0.9.7g"; builder = ./builder.sh; src = fetchurl { - url = http://www.openssl.org/source/openssl-0.9.8.tar.gz; - md5 = "9da21071596a124acde6080552deac16"; + url = http://www.openssl.org/source/openssl-0.9.7g.tar.gz; + md5 = "991615f73338a571b6a1be7d74906934"; }; buildInputs = [perl]; - - # Quick fix for a Makefile bug in openssl-0.9.8 (`make install' - # tries to copy .so files, instead of .dylib files). - patches = if stdenv.system == "powerpc-darwin" then [./dylib.patch] else []; } diff --git a/pkgs/development/libraries/openssl/dylib.patch b/pkgs/development/libraries/openssl/dylib.patch deleted file mode 100644 index ee3e31d4571b..000000000000 --- a/pkgs/development/libraries/openssl/dylib.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rc openssl-0.9.8-orig/engines/Makefile openssl-0.9.8/engines/Makefile -*** openssl-0.9.8-orig/engines/Makefile 2005-06-28 11:10:18.000000000 +0200 ---- openssl-0.9.8/engines/Makefile 2005-07-13 13:19:09.000000000 +0200 -*************** -*** 91,102 **** - for l in $(LIBNAMES); do \ - ( echo installing $$l; \ - if [ "$(PLATFORM)" != "Cygwin" ]; then \ -! cp lib$$l.so $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \ - else \ -! cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \ - fi; \ -! chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \ -! mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so ); \ - done; \ - fi - ---- 91,102 ---- - for l in $(LIBNAMES); do \ - ( echo installing $$l; \ - if [ "$(PLATFORM)" != "Cygwin" ]; then \ -! cp lib$$l.dylib $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \ - else \ -! cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \ - fi; \ -! chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \ -! mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib ); \ - done; \ - fi - |