summaryrefslogtreecommitdiffstats
path: root/patches/sitecopy-0.16.6
diff options
context:
space:
mode:
authorBernhard Walle <bernhard@bwalle.de>2011-06-14 21:55:07 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-17 23:42:11 +0200
commit8653ea8084eefb657426d0bfb12ca63dc76c6ce3 (patch)
tree16d92f98a026216ba517ea22bbf2086a6405ae98 /patches/sitecopy-0.16.6
parent7710dc81ccacc1db81cd42c397fe354bb56e7a06 (diff)
downloadptxdist-8653ea8084eefb657426d0bfb12ca63dc76c6ce3.tar.gz
ptxdist-8653ea8084eefb657426d0bfb12ca63dc76c6ce3.tar.xz
Add sitecopy
Sitecopy is a simple tool to synchronize local and remote web site via FTP or WebDAV. Signed-off-by: Bernhard Walle <bernhard@bwalle.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/sitecopy-0.16.6')
-rw-r--r--patches/sitecopy-0.16.6/series1
-rw-r--r--patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff36
2 files changed, 37 insertions, 0 deletions
diff --git a/patches/sitecopy-0.16.6/series b/patches/sitecopy-0.16.6/series
new file mode 100644
index 000000000..c295b758f
--- /dev/null
+++ b/patches/sitecopy-0.16.6/series
@@ -0,0 +1 @@
+sitecopy-neon-openssl.diff
diff --git a/patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff b/patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff
new file mode 100644
index 000000000..b4f9b49ab
--- /dev/null
+++ b/patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff
@@ -0,0 +1,36 @@
+From: Bernhard Walle <bernhard@bwalle.de>
+Subject: Fix build with OpenSSL 1.x
+
+See http://lists.manyfish.co.uk/pipermail/neon-commits/2009-September/000827.html.
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+---
+ lib/neon/ne_openssl.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/lib/neon/ne_openssl.c
++++ b/lib/neon/ne_openssl.c
+@@ -36,6 +36,7 @@
+ #include <openssl/pkcs12.h>
+ #include <openssl/x509v3.h>
+ #include <openssl/rand.h>
++#include <openssl/opensslv.h>
+
+ #ifdef NE_HAVE_TS_SSL
+ #include <stdlib.h> /* for abort() */
+@@ -615,6 +616,15 @@ void ne_ssl_context_destroy(ne_ssl_conte
+ ne_free(ctx);
+ }
+
++/* OpenSSL 1.0 removed SSL_SESSION_cmp for no apparent reason - hoping
++ * it is reasonable to assume that comparing the session IDs is
++ * sufficient. */
++static int SSL_SESSION_cmp(SSL_SESSION *a, SSL_SESSION *b)
++{
++ return a->session_id_length == b->session_id_length
++ && memcmp(a->session_id, b->session_id, a->session_id_length) == 0;
++}
++
+ /* For internal use only. */
+ int ne__negotiate_ssl(ne_session *sess)
+ {