Re: [ptxdist] [PATCH] Add sitecopy
On Tue, Jun 14, 2011 at 09:55:07PM +0200, Bernhard Walle wrote:
Sitecopy is a simple tool to synchronize local and remote web site via FTP or
WebDAV.
Signed-off-by: Bernhard Walle bernh...@bwalle.de
Thanks. Applied.
Michael
diff -r 22739a15eec4 -r c6a44fc1b614 patches/sitecopy-0.16.6/series
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/patches/sitecopy-0.16.6/series Di Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,1 @@
+sitecopy-neon-openssl.diff
diff -r 22739a15eec4 -r c6a44fc1b614
patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff Di Jun 14
21:54:48 2011 +0200
@@ -0,0 +1,36 @@
+From: Bernhard Walle bernh...@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 bernh...@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)
+ {
diff -r 22739a15eec4 -r c6a44fc1b614 rules/sitecopy.in
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/rules/sitecopy.in Di Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,57 @@
+## SECTION=networking
+
+menuconfig SITECOPY
+ tristate
+ prompt sitecopy
+ select EXPATif SITECOPY_XML_EXPAT
+ select LIBXML2 if SITECOPY_XML_LIBXML2
+ select OPENSSL if SITECOPY_OPENSSL
+ help
+ Synchronize local and remote web site via FTP or WebDAV
+
+if SITECOPY
+
+config SITECOPY_FTP
+ bool
+ prompt FTP support enabled
+ help
+ Build with FTP support. No additional dependencies.
+
+config SITECOPY_RSH
+ bool
+ prompt rsh/rcp support enabled
+ help
+ Build with rsh/rcp support. No additional dependencies.
+
+config SITECOPY_SFTP
+ bool
+ prompt sftp/scp support enabled
+ help
+ Build with sftp/scp support. No additional dependencies.
+
+config SITECOPY_WEBDAV
+ bool
+ prompt WebDAV support enabled
+ help
+ Build with WebDAV support. No additional dependencies.
+
+config SITECOPY_OPENSSL
+ bool
+ prompt SSL support with OpenSSL
+ help
+ Build with SSL support. Required OpenSSL to be built.
+
+choice
+ prompt xml library
+ default SITECOPY_XML_EXPAT
+
+ config SITECOPY_XML_EXPAT
+ bool
+ prompt expat
+
+ config SITECOPY_XML_LIBXML2
+ bool
+ prompt libxml2
+endchoice
+
+endif
diff -r 22739a15eec4 -r c6a44fc1b614 rules/sitecopy.make
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/rules/sitecopy.make Di Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,100 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2011 by Bernhard Walle bernh...@bwalle.de
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SITECOPY) += sitecopy
+
+#
+# Paths and names
+#
+SITECOPY_VERSION := 0.16.6
+SITECOPY_MD5 := b3aeb5a5f00af3db90b408e8c32a6c01
+SITECOPY := sitecopy-$(SITECOPY_VERSION)
+SITECOPY_SUFFIX := tar.gz
+SITECOPY_URL :=
http://www.manyfish.co.uk/sitecopy/$(SITECOPY).$(SITECOPY_SUFFIX)
+SITECOPY_SOURCE := $(SRCDIR)/$(SITECOPY).$(SITECOPY_SUFFIX)
+SITECOPY_DIR := $(BUILDDIR)/$(SITECOPY)
+SITECOPY_LICENSE := unknown
+
+#
+# Prepare
+#
+
+#
+# autoconf
+#
+SITECOPY_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+ --disable-gnomefe \
+ --enable-threadsafe-ssl=posix \
+ --disable-nls \
+ --enable-threads=posix \
+ --disable-rpath \
+ --without-pakchois \
+ --without-socks \
+ --without-gssapi
+
+ifdef PTXCONF_SITECOPY_SFTP
+SITECOPY_AUTOCONF += --enable-sftp
+else
+SITECOPY_AUTOCONF +=
Re: [ptxdist] [PATCH] Add sitecopy
On Sun, Jun 12, 2011 at 09:43:58AM +0200, Bernhard Walle wrote: Sitecopy is a simple tool to synchronize local and remote web site via FTP or WebDAV. Signed-off-by: Bernhard Walle bernh...@bwalle.de diff -r aaf41af0b677 -r cdce85a6b513 rules/sitecopy.in --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/sitecopy.in So Jun 12 09:38:23 2011 +0200 @@ -0,0 +1,8 @@ +## SECTION=networking + +config SITECOPY + tristate + prompt sitecopy + select LIBXML2 hmm, from ./configure --help it looks like expat is possible too. I'd like to see an option for that. + help + Synchronize local and remote web site via FTP or WebDAV diff -r aaf41af0b677 -r cdce85a6b513 rules/sitecopy.make --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/sitecopy.make So Jun 12 09:38:23 2011 +0200 @@ -0,0 +1,64 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle bernh...@bwalle.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_SITECOPY) += sitecopy + +# +# Paths and names +# +SITECOPY_VERSION := 0.16.6 +SITECOPY_MD5 := b3aeb5a5f00af3db90b408e8c32a6c01 +SITECOPY := sitecopy-$(SITECOPY_VERSION) +SITECOPY_SUFFIX := tar.gz +SITECOPY_URL := http://www.manyfish.co.uk/sitecopy/$(SITECOPY).$(SITECOPY_SUFFIX) +SITECOPY_SOURCE := $(SRCDIR)/$(SITECOPY).$(SITECOPY_SUFFIX) +SITECOPY_DIR := $(BUILDDIR)/$(SITECOPY) +SITECOPY_LICENSE := unknown + +# +# Get +# + +$(SITECOPY_SOURCE): + @$(call targetinfo) + @$(call get, SITECOPY) remove. + +# +# Prepare +# + +# +# autoconf +# +SITECOPY_CONF_TOOL := autoconf configure has a lot of options. Please add --disable-*, --without-* for everything, that's not used. Michael + +# +# Target-Install +# + +$(STATEDIR)/sitecopy.targetinstall: + @$(call targetinfo) + + @$(call install_init, sitecopy) + @$(call install_fixup, sitecopy,PRIORITY,optional) + @$(call install_fixup, sitecopy,SECTION,base) + @$(call install_fixup, sitecopy,AUTHOR,Bernhard Walle bernh...@bwalle.de) + @$(call install_fixup, sitecopy,DESCRIPTION,missing) + + @$(call install_copy, sitecopy, 0, 0, 0755, -, /usr/bin/sitecopy) + + @$(call install_finish, sitecopy) + + @$(call touch) + +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Add sitecopy
Sitecopy is a simple tool to synchronize local and remote web site via FTP or
WebDAV.
Signed-off-by: Bernhard Walle bernh...@bwalle.de
diff -r 22739a15eec4 -r c6a44fc1b614 patches/sitecopy-0.16.6/series
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/patches/sitecopy-0.16.6/seriesDi Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,1 @@
+sitecopy-neon-openssl.diff
diff -r 22739a15eec4 -r c6a44fc1b614
patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/patches/sitecopy-0.16.6/sitecopy-neon-openssl.diffDi Jun 14
21:54:48 2011 +0200
@@ -0,0 +1,36 @@
+From: Bernhard Walle bernh...@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 bernh...@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)
+ {
diff -r 22739a15eec4 -r c6a44fc1b614 rules/sitecopy.in
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/rules/sitecopy.in Di Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,57 @@
+## SECTION=networking
+
+menuconfig SITECOPY
+ tristate
+ prompt sitecopy
+ select EXPATif SITECOPY_XML_EXPAT
+ select LIBXML2 if SITECOPY_XML_LIBXML2
+ select OPENSSL if SITECOPY_OPENSSL
+ help
+ Synchronize local and remote web site via FTP or WebDAV
+
+if SITECOPY
+
+config SITECOPY_FTP
+ bool
+ prompt FTP support enabled
+ help
+ Build with FTP support. No additional dependencies.
+
+config SITECOPY_RSH
+ bool
+ prompt rsh/rcp support enabled
+ help
+ Build with rsh/rcp support. No additional dependencies.
+
+config SITECOPY_SFTP
+ bool
+ prompt sftp/scp support enabled
+ help
+ Build with sftp/scp support. No additional dependencies.
+
+config SITECOPY_WEBDAV
+ bool
+ prompt WebDAV support enabled
+ help
+ Build with WebDAV support. No additional dependencies.
+
+config SITECOPY_OPENSSL
+ bool
+ prompt SSL support with OpenSSL
+ help
+ Build with SSL support. Required OpenSSL to be built.
+
+choice
+ prompt xml library
+ default SITECOPY_XML_EXPAT
+
+ config SITECOPY_XML_EXPAT
+ bool
+ prompt expat
+
+ config SITECOPY_XML_LIBXML2
+ bool
+ prompt libxml2
+endchoice
+
+endif
diff -r 22739a15eec4 -r c6a44fc1b614 rules/sitecopy.make
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/rules/sitecopy.make Di Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,100 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2011 by Bernhard Walle bernh...@bwalle.de
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SITECOPY) += sitecopy
+
+#
+# Paths and names
+#
+SITECOPY_VERSION := 0.16.6
+SITECOPY_MD5 := b3aeb5a5f00af3db90b408e8c32a6c01
+SITECOPY := sitecopy-$(SITECOPY_VERSION)
+SITECOPY_SUFFIX:= tar.gz
+SITECOPY_URL :=
http://www.manyfish.co.uk/sitecopy/$(SITECOPY).$(SITECOPY_SUFFIX)
+SITECOPY_SOURCE:= $(SRCDIR)/$(SITECOPY).$(SITECOPY_SUFFIX)
+SITECOPY_DIR := $(BUILDDIR)/$(SITECOPY)
+SITECOPY_LICENSE := unknown
+
+#
+# Prepare
+#
+
+#
+# autoconf
+#
+SITECOPY_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+ --disable-gnomefe \
+ --enable-threadsafe-ssl=posix \
+ --disable-nls \
+ --enable-threads=posix \
+ --disable-rpath \
+ --without-pakchois \
+ --without-socks \
+ --without-gssapi
+
+ifdef PTXCONF_SITECOPY_SFTP
+SITECOPY_AUTOCONF += --enable-sftp
+else
+SITECOPY_AUTOCONF += --disable-sftp
+endif
+
+ifdef PTXCONF_SITECOPY_RSH
+SITECOPY_AUTOCONF += --enable-rsh
+else
+SITECOPY_AUTOCONF += --disable-rsh
+endif
+
+ifdef
[ptxdist] [PATCH] Add sitecopy
Sitecopy is a simple tool to synchronize local and remote web site via FTP or WebDAV. Signed-off-by: Bernhard Walle bernh...@bwalle.de diff -r aaf41af0b677 -r cdce85a6b513 rules/sitecopy.in --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/sitecopy.in So Jun 12 09:38:23 2011 +0200 @@ -0,0 +1,8 @@ +## SECTION=networking + +config SITECOPY + tristate + prompt sitecopy + select LIBXML2 + help + Synchronize local and remote web site via FTP or WebDAV diff -r aaf41af0b677 -r cdce85a6b513 rules/sitecopy.make --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/sitecopy.make So Jun 12 09:38:23 2011 +0200 @@ -0,0 +1,64 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle bernh...@bwalle.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_SITECOPY) += sitecopy + +# +# Paths and names +# +SITECOPY_VERSION := 0.16.6 +SITECOPY_MD5 := b3aeb5a5f00af3db90b408e8c32a6c01 +SITECOPY := sitecopy-$(SITECOPY_VERSION) +SITECOPY_SUFFIX:= tar.gz +SITECOPY_URL := http://www.manyfish.co.uk/sitecopy/$(SITECOPY).$(SITECOPY_SUFFIX) +SITECOPY_SOURCE:= $(SRCDIR)/$(SITECOPY).$(SITECOPY_SUFFIX) +SITECOPY_DIR := $(BUILDDIR)/$(SITECOPY) +SITECOPY_LICENSE := unknown + +# +# Get +# + +$(SITECOPY_SOURCE): + @$(call targetinfo) + @$(call get, SITECOPY) + +# +# Prepare +# + +# +# autoconf +# +SITECOPY_CONF_TOOL := autoconf + +# +# Target-Install +# + +$(STATEDIR)/sitecopy.targetinstall: + @$(call targetinfo) + + @$(call install_init, sitecopy) + @$(call install_fixup, sitecopy,PRIORITY,optional) + @$(call install_fixup, sitecopy,SECTION,base) + @$(call install_fixup, sitecopy,AUTHOR,Bernhard Walle bernh...@bwalle.de) + @$(call install_fixup, sitecopy,DESCRIPTION,missing) + + @$(call install_copy, sitecopy, 0, 0, 0755, -, /usr/bin/sitecopy) + + @$(call install_finish, sitecopy) + + @$(call touch) + +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de
