public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2013-02-15 13:36:34 +01:00
parent f9e75352cf 1a52c7659d
commit 2aa6f262cb
302 changed files with 14276 additions and 4226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/e17/default.nix
View File

@@ -10,6 +10,8 @@ rec {
ecore = callPackage ./ecore { };
eio = callPackage ./eio { };
embryo = callPackage ./embryo { };
edje = callPackage ./edje { lua = pkgs.lua5; };
@@ -20,6 +22,12 @@ rec {
eeze = callPackage ./eeze { };
emotion = callPackage ./emotion { };
ethumb = callPackage ./ethumb { };
elementary = callPackage ./elementary { };
#### WINDOW MANAGER

5
pkgs/desktops/e17/e_dbus/default.nix
View File

@@ -2,10 +2,10 @@
, dbus_libs }:
stdenv.mkDerivation rec {
name = "e_dbus-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg";
sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q";
};
buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
propagatedBuildInputs = [ dbus_libs ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
--disable-edbus-test-client
--disable-edbus-notify-send
--disable-edbus-notify-test
--disable-edbus-async-test
'';
meta = {
description = "Enlightenment's D-Bus wrapping and glue layer library";

11
pkgs/desktops/e17/ecore/default.nix
View File

@@ -1,13 +1,16 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender
, libXcomposite, libXfixes, libXdamage }:
stdenv.mkDerivation rec {
name = "ecore-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4";
sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb";
};
buildInputs = [ pkgconfig eina evas ];
propagatedBuildInputs = [ libX11 libXext ];
propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes
libXdamage
];
meta = {
description = "Enlightenment's core mainloop, display abstraction and utility library";
longDescription = ''

8
pkgs/desktops/e17/edje/default.nix
View File

@@ -2,12 +2,16 @@
, ecore, embryo }:
stdenv.mkDerivation rec {
name = "edje-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx";
sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7";
};
buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ];
patchPhase = ''
substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc'
substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' ""
'';
meta = {
description = "Enlightenment's abstract GUI layout and animation object library";
longDescription = ''

4
pkgs/desktops/e17/eet/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
stdenv.mkDerivation rec {
name = "eet-${version}";
version = "1.6.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp";
sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767";
};
buildInputs = [ pkgconfig eina zlib libjpeg ];
meta = {

4
pkgs/desktops/e17/eeze/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
stdenv.mkDerivation rec {
name = "eeze-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p";
sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr";
};
buildInputs = [ pkgconfig eina ecore ];
propagatedBuildInputs = [ udev ];

4
pkgs/desktops/e17/efreet/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
stdenv.mkDerivation rec {
name = "efreet-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0";
sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg";
};
buildInputs = [ pkgconfig eina eet ecore ];
meta = {

4
pkgs/desktops/e17/eina/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "eina-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj";
sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w";
};
meta = {
description = "Enlightenment's core data structure library";

24
pkgs/desktops/e17/eio/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }:
stdenv.mkDerivation rec {
name = "eio-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6";
};
buildInputs = [ pkgconfig eet eina ecore ];
meta = {
description = "A library that integrates with EFL to provide efficient filesystem IO";
longDescription = ''
Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output.
It use the best techniques to achieve such purpose, like using at-variants, splice,
properly handling errors and doing it in an asynchronous fashion by means of worker
threads. It is also ported to Windows, so multi-platform.
Whenever you need to list a directory, copy, move or delete files, Eio will do that
task better than you'd achieve with naive implementations, and it is easy to use.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

19
pkgs/desktops/e17/elementary/default.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9";
};
buildInputs = [ pkgconfig eina eet evas ecore edje ];
meta = {
description = "Enlightenment's core data structure library";
longDescription = ''
Enlightenment's Eina is a core data structure and common utility
library.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

4
pkgs/desktops/e17/embryo/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina }:
stdenv.mkDerivation rec {
name = "embryo-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9";
sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9";
};
buildInputs = [ pkgconfig eina ];
meta = {

19
pkgs/desktops/e17/emotion/default.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }:
stdenv.mkDerivation rec {
name = "emotion-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw";
};
buildInputs = [ pkgconfig ecore evas eet eina edje ];
meta = {
description = "A library to easily integrate media playback into EFL applications";
longDescription = ''
Emotion is a library to easily integrate media playback into EFL applications,
it will take care of using Ecore's main loop and video display is done using Evas.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

12
pkgs/desktops/e17/enlightenment/default.nix
View File

@@ -1,12 +1,14 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }:
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus
, embryo, eio, xcbutilkeysyms, libjpeg }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.16.999.65643";
version = "0.17.1";
src = fetchurl {
url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz";
sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz";
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y";
};
buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ];
buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo
eio xcbutilkeysyms libjpeg ];
configureFlags = ''
--with-profile=FAST_PC
--disable-illume

22
pkgs/desktops/e17/ethumb/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }:
stdenv.mkDerivation rec {
name = "ethumb-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l";
};
buildInputs = [ pkgconfig eina evas ecore edje eet ];
meta = {
description = "A thumbnail generation library";
longDescription = ''
Ethumb - thumbnail generation library. Features:
* create thumbnails with a predefined frame (possibly an edje frame);
* have an option to create fdo-like thumbnails;
* have a client/server utility;
* TODO: make thumbnails from edje backgrounds, icons and themes;
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

4
pkgs/desktops/e17/evas/default.nix
View File

@@ -2,10 +2,10 @@
, libX11, libXext, eina, eet }:
stdenv.mkDerivation rec {
name = "evas-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq";
sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh";
};
buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
libX11 libXext eina eet

51
pkgs/desktops/kde-3/kdelibs/default.nix
View File

@@ -1,51 +0,0 @@
{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, cups, attr, acl
}:
let version = "3.5.10"; in
stdenv.mkDerivation {
name = "kdelibs-${version}";
src = fetchurl {
url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
};
patches = [
# We're not supposed to use linux/inotify.h, use sys/inotify.h instead.
# Adapted from Gentoo.
./inotify.patch
# Fixes compilation issues with openssl-1.0.0
./kdelibs-3.5.10-openssl_1.0.0.patch
];
buildInputs = [
zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
libxslt expat libtool freetype bzip2 cups
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
];
propagatedBuildInputs = [attr acl];
# Prevent configure from looking for pkg-config and freetype-config
# in the wrong location (it looks in /usr/bin etc. *before* looking
# in $PATH).
preConfigure = ''
substituteInPlace configure \
--replace /usr/bin /no-such-path \
--replace /usr/local/bin /no-such-path \
--replace /opt/local/bin /no-such-path
'';
configureFlags = ''
--without-arts
--with-ssl-dir=${openssl}
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';
meta.platforms = stdenv.lib.platforms.linux;
}

30
pkgs/desktops/kde-3/kdelibs/inotify.patch
View File

@@ -1,30 +0,0 @@
diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200
***************
*** 64,74 ****
// debug
#include <sys/ioctl.h>
! #ifdef HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
- #include <linux/types.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>
--- 64,76 ----
// debug
#include <sys/ioctl.h>
! #if 1
! #include <sys/inotify.h>
! #include <fcntl.h>
! #elif HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>

180
pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch
View File

@@ -1,180 +0,0 @@
diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-03-31 09:34:38.000000000 -0700
@@ -96,9 +96,14 @@
static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
const EVP_CIPHER *,unsigned char *,int ,
pem_password_cb *, void *) = 0L;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
+#else
static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
+#endif
static int (*K_X509_print_fp) (FILE *, X509*) = 0L;
static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L;
static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L;
@@ -404,9 +409,14 @@
K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
+#else
K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
+#endif
K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
@@ -568,7 +578,7 @@
K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
#endif
@@ -956,7 +966,13 @@
else return -1;
}
-
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
+ else return -1;
+}
+#else
ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
else return 0L;
@@ -968,7 +984,7 @@
return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
else return -1;
}
-
+#endif
int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h
--- kdelibs-3.5.10-old/kio/kssl/kopenssl.h 2006-07-22 01:16:39.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h 2010-03-31 09:35:20.000000000 -0700
@@ -48,6 +48,9 @@
#include <openssl/stack.h>
#include <openssl/bn.h>
#undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
#endif
#include <kstaticdeleter.h>
@@ -446,12 +449,12 @@
*/
int PEM_write_bio_X509(BIO *bp, X509 *x);
-
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
/*
* X509_asn1_meth - used for netscape output
*/
ASN1_METHOD *X509_asn1_meth();
-
+#endif
/*
* ASN1_i2d_fp - used for netscape output
@@ -531,6 +534,9 @@
*/
void sk_free(STACK *s);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
/*
* Number of elements in the stack
@@ -543,6 +549,9 @@
*/
char *sk_value(STACK *s, int n);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
/*
* Create a new stack
@@ -555,6 +564,9 @@
*/
int sk_push(STACK *s, char *d);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
/*
* Duplicate the stack
diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc
--- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc 2005-10-10 08:05:44.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc 2010-03-31 09:34:38.000000000 -0700
@@ -87,7 +87,7 @@
STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
- STACK_OF(X509) *x509 = sk_new(NULL);
+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
KSSLCertificate *cert = certs.first();
while(cert) {
sk_X509_push(x509, cert->getCert());
diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc 2006-01-19 09:06:12.000000000 -0800
+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc 2010-03-31 09:34:38.000000000 -0700
@@ -1003,17 +1003,31 @@
QByteArray KSSLCertificate::toNetscape() {
QByteArray qba;
#ifdef KSSL_HAVE_SSL
-ASN1_HEADER ah;
-ASN1_OCTET_STRING os;
-KTempFile ktf;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ NETSCAPE_X509 nx;
+ ASN1_OCTET_STRING hdr;
+#else
+ ASN1_HEADER ah;
+ ASN1_OCTET_STRING os;
+#endif
+ KTempFile ktf;
- os.data = (unsigned char *)NETSCAPE_CERT_HDR;
- os.length = strlen(NETSCAPE_CERT_HDR);
- ah.header = &os;
- ah.data = (char *)getCert();
- ah.meth = d->kossl->X509_asn1_meth();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ hdr.length = strlen(NETSCAPE_CERT_HDR);
+ nx.header = &hdr;
+ nx.cert = getCert();
+
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
+#else
+ os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ os.length = strlen(NETSCAPE_CERT_HDR);
+ ah.header = &os;
+ ah.data = (char *)getCert();
+ ah.meth = d->kossl->X509_asn1_meth();
- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+#endif
ktf.close();