[Pkg-owncloud-commits] [ocsync] 02/02: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sun Dec 8 23:16:12 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository ocsync.
commit d04d23637def003fcf31a165500e5c0e8f846bdf
Author: David Prévot <taffit at debian.org>
Date: Sun Dec 8 18:56:02 2013 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/freebsd.patch | 22 +++++++++-------------
debian/patches/path_max.patch | 12 +++++-------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/debian/patches/freebsd.patch b/debian/patches/freebsd.patch
index 3145db5..358d8e4 100644
--- a/debian/patches/freebsd.patch
+++ b/debian/patches/freebsd.patch
@@ -1,14 +1,12 @@
Description: To be able to compile ocsync under FreeBSD.
Author: Sandro Knauß <bugs at sandroknauss.de>
Reviewd-by: Steven Chamberlain <steven at pyro.eu.org>, Pino Toscano <pino at debian.org>
-Last-Update: 2013-09-26
+Last-Update: 2013-12-08
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ocsync/src/std/c_private.h
-===================================================================
---- ocsync.orig/src/std/c_private.h 2013-09-26 19:02:54.668814270 +0200
-+++ ocsync/src/std/c_private.h 2013-09-26 19:07:06.571255134 +0200
-@@ -32,6 +32,8 @@
+--- a/src/std/c_private.h
++++ b/src/std/c_private.h
+@@ -36,6 +36,8 @@
#include <wchar.h>
#endif
@@ -17,7 +15,7 @@ Index: ocsync/src/std/c_private.h
#ifdef _WIN32
#define EDQUOT 0
#define ENODATA 0
-@@ -48,8 +50,15 @@
+@@ -55,8 +57,15 @@
#define nlink_t int
#define getuid() 0
#define geteuid() 0
@@ -33,11 +31,9 @@ Index: ocsync/src/std/c_private.h
#ifdef _WIN32
typedef struct stat64 csync_stat_t;
#define _FILE_OFFSET_BITS 64
-Index: ocsync/src/std/c_string.c
-===================================================================
---- ocsync.orig/src/std/c_string.c 2013-09-26 19:02:54.668814270 +0200
-+++ ocsync/src/std/c_string.c 2013-09-26 19:02:54.662814254 +0200
-@@ -307,7 +307,7 @@
+--- a/src/std/c_string.c
++++ b/src/std/c_string.c
+@@ -335,7 +335,7 @@
#ifdef WITH_ICONV
dst = c_iconv(wstr, iconv_from_native);
#else
@@ -46,7 +42,7 @@ Index: ocsync/src/std/c_string.c
#endif
#endif
return dst;
-@@ -334,7 +334,7 @@
+@@ -372,7 +372,7 @@
#ifdef WITH_ICONV
dst = c_iconv(str, iconv_to_native);
#else
diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
index dfe91c2..5cc25a7 100644
--- a/debian/patches/path_max.patch
+++ b/debian/patches/path_max.patch
@@ -2,14 +2,12 @@ Description: Make csync_get_user_home_dir compile for HURD
Author: Svante Signell <svante.signell at gmail.com>
Origin: debian, http://lists.alioth.debian.org/pipermail/pkg-owncloud-maintainers/Week-of-Mon-20130916/000869.html
Reviewed-by: Pino Toscano <pino at debian.org>
-Last-Update: 2013-09-26
+Last-Update: 2013-12-08
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ocsync/src/csync_misc.c
-===================================================================
---- ocsync.orig/src/csync_misc.c 2013-09-26 19:36:15.226221853 +0200
-+++ ocsync/src/csync_misc.c 2013-09-26 19:36:15.211221788 +0200
-@@ -88,7 +88,6 @@
+--- a/src/csync_misc.c
++++ b/src/csync_misc.c
+@@ -90,7 +90,6 @@
#endif /* NSS_BUFLEN_PASSWD */
char *csync_get_user_home_dir(void) {
@@ -17,7 +15,7 @@ Index: ocsync/src/csync_misc.c
const char *envp;
struct passwd pwd;
struct passwd *pwdbuf;
-@@ -96,11 +95,8 @@
+@@ -98,11 +97,8 @@
int rc;
envp = getenv("HOME");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/ocsync.git
More information about the Pkg-owncloud-commits
mailing list