[Pkg-owncloud-commits] [ocsync] 26/29: Removed applied patches

Sandro Knauß hefee-guest at moszumanska.debian.org
Fri Dec 13 14:26:36 UTC 2013


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository ocsync.

commit 60d2071539e88c98da945c52e60b8a3fd839597c
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Dec 13 15:14:04 2013 +0100

    Removed applied patches
---
 debian/patches/freebsd.patch  | 53 -------------------------------------------
 debian/patches/path_max.patch | 31 -------------------------
 debian/patches/series         |  2 --
 3 files changed, 86 deletions(-)

diff --git a/debian/patches/freebsd.patch b/debian/patches/freebsd.patch
deleted file mode 100644
index 358d8e4..0000000
--- a/debian/patches/freebsd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-12-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/std/c_private.h
-+++ b/src/std/c_private.h
-@@ -36,6 +36,8 @@
- #include <wchar.h>
- #endif
- 
-+#include <errno.h>
-+
- #ifdef _WIN32
- #define EDQUOT 0
- #define ENODATA 0
-@@ -55,8 +57,15 @@
- #define nlink_t int
- #define getuid() 0
- #define geteuid() 0
-+#else
-+#include <fcntl.h>
-+#endif
-+
-+#ifndef ENODATA
-+#define ENODATA EPIPE
- #endif
- 
-+
- #ifdef _WIN32
- typedef struct stat64 csync_stat_t;
- #define _FILE_OFFSET_BITS 64
---- 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
--  dst = wstr;
-+  dst = (char*) wstr;
- #endif
- #endif
-   return dst;
-@@ -372,7 +372,7 @@
- #ifdef WITH_ICONV
-   dst = c_iconv(str, iconv_to_native);
- #else
--  dst = str;
-+  dst = (_TCHAR*) str;
- #endif
- #endif
-   return dst;
diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
deleted file mode 100644
index 5cc25a7..0000000
--- a/debian/patches/path_max.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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-12-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- 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) {
--    char home[PATH_MAX] = {0};
-     const char *envp;
-     struct passwd pwd;
-     struct passwd *pwdbuf;
-@@ -98,11 +97,8 @@
-     int rc;
- 
-     envp = getenv("HOME");
--    if (envp != NULL) {
--        snprintf(home, sizeof(home), "%s", envp);
--        if (home[0] != '\0') {
--            return c_strdup(home);
--        }
-+    if (envp != NULL && envp[0] != '\0') {
-+        return c_strdup(envp);
-     }
- 
-     /* Still nothing found, read the password file */
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 722c4fc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-freebsd.patch
-path_max.patch

-- 
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