mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

Add the forgotten patches

Browse Source
This commit is contained in:
Baptiste Daroussin 2013-07-24 15:03:05 +00:00
parent 8b7b3c59f8
commit 111fcca281
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=323605
3 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sysutils/fusefs-unionfs/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,15 @@
--- ./CMakeLists.txt.orig 2012-09-11 00:06:32.000000000 +0200
+++ ./CMakeLists.txt 2013-07-24 16:54:01.550064323 +0200
@@ -9,12 +9,6 @@
SET(CMAKE_BUILD_TYPE RelWithDebInfo)
ENDIF(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-# Select flags.
-SET(CMAKE_C_FLAGS "-pipe -W -Wall -DFORTIFY_SOURCE=2")
-SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
-SET(CMAKE_C_FLAGS_RELEASE "-O2")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG")
-
add_definitions(-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26)
option(WITH_XATTR "Enable support for extended attributes" OFF)

40
sysutils/fusefs-unionfs/files/patch-src__unionfs.c Normal file
View File

@ -0,0 +1,40 @@
--- ./src/unionfs.c.orig 2012-09-11 00:06:32.000000000 +0200
+++ ./src/unionfs.c 2013-07-24 16:54:01.555073796 +0200
@@ -83,7 +83,11 @@
char p[PATHLEN_MAX];
if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG);
+#if __FreeBSD__
+ int res = lchmod(p, mode);
+#else
int res = chmod(p, mode);
+#endif
if (res == -1) RETURN(-errno);
RETURN(0);
@@ -190,7 +194,7 @@
DBG("%s\n", path);
if (uopt.stats_enabled && strcmp(path, STATS_FILENAME) == 0) {
- memset(stbuf, 0, sizeof(stbuf));
+ memset(stbuf, 0, sizeof(*stbuf));
stbuf->st_mode = S_IFREG | 0444;
stbuf->st_nlink = 1;
stbuf->st_size = STATS_SIZE;
@@ -663,7 +667,16 @@
char p[PATHLEN_MAX];
if (BUILD_PATH(p, uopt.branches[i].path, path)) RETURN(-ENAMETOOLONG);
+#ifdef __FreeBSD__
+ struct timeval tv[2];
+ tv[0].tv_sec = ts[0].tv_sec;
+ tv[0].tv_usec = ts[0].tv_nsec / 1000;
+ tv[1].tv_sec = ts[0].tv_sec;
+ tv[1].tv_usec = ts[0].tv_nsec / 1000;
+ int res = lutimes(p, tv);
+#else
int res = utimensat(0, p, ts, AT_SYMLINK_NOFOLLOW);
+#endif
if (res == -1) RETURN(-errno);

12
sysutils/fusefs-unionfs/files/patch-src__usyslog.c Normal file
View File

@ -0,0 +1,12 @@
--- ./src/usyslog.c.orig 2012-09-11 00:06:32.000000000 +0200
+++ ./src/usyslog.c 2013-07-24 16:56:29.401473882 +0200
@@ -20,7 +20,9 @@
#include <string.h>
#include <stdlib.h>
#include <errno.h>
+#ifndef __FreeBSD__
#include <malloc.h>
+#endif
#include <pthread.h>
#include <stdarg.h>