diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2012-06-01 15:04:16 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2012-06-01 15:04:16 +0000 |
| commit | c14da463daa9ecaecd7efb6483bef204e7184e6b (patch) | |
| tree | db5bd989925c4776bd9e90ee6e8ea16f1bfef162 /archivers/rpm4 | |
| parent | - Fix permissions on /var/run/shibboleth (diff) | |
Correct previous commit: now use the real patch,
rather than a patch of the patch to update the port
Reported by: fluffy
Pointyhat to: johans
Notes
Notes:
svn path=/head/; revision=297959
Diffstat (limited to 'archivers/rpm4')
| -rw-r--r-- | archivers/rpm4/files/patch-misc_fts.c | 64 |
1 files changed, 30 insertions, 34 deletions
diff --git a/archivers/rpm4/files/patch-misc_fts.c b/archivers/rpm4/files/patch-misc_fts.c index c0f2e231a66e..3a36a6b2cf40 100644 --- a/archivers/rpm4/files/patch-misc_fts.c +++ b/archivers/rpm4/files/patch-misc_fts.c @@ -1,34 +1,30 @@ -diff -Nur archivers/rpm4/files/patch-misc_fts.c archivers/rpm4/files/patch-misc_fts.c ---- archivers/rpm4/files/patch-misc_fts.c 1970-01-01 01:00:00.000000000 +0100 -+++ archivers/rpm4/files/patch-misc_fts.c 2012-05-30 14:15:28.000000000 +0200 -@@ -0,0 +1,30 @@ -+--- misc/fts.c 2012-04-03 15:53:59.000000000 +0200 -++++ misc/fts.c 2012-05-30 14:07:33.000000000 +0200 -+@@ -31,13 +31,14 @@ -+ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; -+ #endif /* LIBC_SCCS and not lint */ -+ -++#include "system.h" -++#include "misc/fts.h" -+ #if defined(_LIBC) -+ #include <sys/param.h> -+ #include <include/sys/stat.h> -+ #include <fcntl.h> -+ #include <dirent.h> -+ #include <errno.h> -+-#include "misc/fts.h" -+ #include <stdlib.h> -+ #include <string.h> -+ #include <unistd.h> -+@@ -61,11 +62,9 @@ -+ # define _STAT_VER 0 -+ # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) -+ #endif -+-#include "system.h" -+ #include <stdlib.h> -+ #include <string.h> -+ #include <errno.h> -+-#include "misc/fts.h" -+ # define __set_errno(val) (*__errno_location ()) = (val) -+ # define __open open -+ # define __close close
\ No newline at end of file +--- misc/fts.c 2012-04-03 15:53:59.000000000 +0200 ++++ misc/fts.c 2012-05-30 14:07:33.000000000 +0200 +@@ -31,13 +31,14 @@ + static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; + #endif /* LIBC_SCCS and not lint */ + ++#include "system.h" ++#include "misc/fts.h" + #if defined(_LIBC) + #include <sys/param.h> + #include <include/sys/stat.h> + #include <fcntl.h> + #include <dirent.h> + #include <errno.h> +-#include "misc/fts.h" + #include <stdlib.h> + #include <string.h> + #include <unistd.h> +@@ -61,11 +62,9 @@ + # define _STAT_VER 0 + # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) + #endif +-#include "system.h" + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#include "misc/fts.h" + # define __set_errno(val) (*__errno_location ()) = (val) + # define __open open + # define __close close |