Mailinglist Archive: opensuse-commit (938 mails)

< Previous Next >
commit sitecopy for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 06 Sep 2010 15:08:59 +0200
  • Message-id: <20100906130859.8D04F201E1@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package sitecopy for openSUSE:Factory
checked in at Mon Sep 6 15:08:59 CEST 2010.



--------
--- GNOME/sitecopy/sitecopy.changes 2008-08-05 08:50:46.000000000 +0200
+++ sitecopy/sitecopy.changes 2010-09-06 14:35:06.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Sep 6 12:34:53 UTC 2010 - coolo@xxxxxxxxxx
+
+- take support for new neon function from cadaver
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
sitecopy-support-neon-0.29.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sitecopy.spec ++++++
--- /var/tmp/diff_new_pack.atN9Pc/_old 2010-09-06 15:08:02.000000000 +0200
+++ /var/tmp/diff_new_pack.atN9Pc/_new 2010-09-06 15:08:02.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sitecopy (Version 0.16.6)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,17 @@


Name: sitecopy
-BuildRequires: fdupes neon-devel openssl-devel pkgconfig
+BuildRequires: fdupes libexpat-devel neon-devel openssl-devel pkgconfig
Summary: Local to Remote Website Synchronizer
Version: 0.16.6
-Release: 19
+Release: 26
Requires: %{name}-lang = %{version}
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Networking/Web/Utilities
Url: http://www.manyfish.co.uk/sitecopy/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.lyra.org/sitecopy/sitecopy-%{version}.tar.bz2
+Patch0: sitecopy-support-neon-0.29.diff

%description
Sitecopy is useful for copying locally stored web sites to remote web
@@ -39,15 +40,10 @@
and deleting individual files using an FTP client. FTP, WebDAV, and
HTTP-based authoring servers are supported.

-
-
-Authors:
---------
- Joe Orton <joe@xxxxxxxxxxxxxxxxx>
-
%lang_package
%prep
%setup -q
+%patch0 -p1

%build
CFLAGS="$RPM_OPT_FLAGS" \

++++++ sitecopy-support-neon-0.29.diff ++++++
Index: sitecopy-0.16.6/lib/neon/ne_openssl.c
===================================================================
--- sitecopy-0.16.6.orig/lib/neon/ne_openssl.c 2008-02-06 12:27:38.000000000
+0100
+++ sitecopy-0.16.6/lib/neon/ne_openssl.c 2010-09-06 14:33:36.278385141
+0200
@@ -615,6 +615,18 @@ void ne_ssl_context_destroy(ne_ssl_conte
ne_free(ctx);
}

+#if defined(OPENSSL_VERSION_NUMBER) \
+ && OPENSSL_VERSION_NUMBER > 0x10000000L
+/* 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;
+}
+#endif
+
/* For internal use only. */
int ne__negotiate_ssl(ne_session *sess)
{

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages