svn commit: r440710 - head/sysutils/xfsprogs/files

[Alexey Dokuchaev]

Author: danfe
Date: Fri May 12 20:27:52 2017
New Revision: 440710
URL: https://svnweb.freebsd.org/changeset/ports/440710

Log:
  Fix line endings and svn:eol-style properties on some patch files that got
  bogusly set to CRLF.

Modified:
  head/sysutils/xfsprogs/files/patch-include_freebsd.h   (contents, props changed)
  head/sysutils/xfsprogs/files/patch-include_libxfs.h   (contents, props changed)
  head/sysutils/xfsprogs/files/patch-libxlog_util.c   (contents, props changed)
  head/sysutils/xfsprogs/files/patch-repair_attr__repair.h   (contents, props changed)
  head/sysutils/xfsprogs/files/patch-repair_phase4.c   (contents, props changed)
  head/sysutils/xfsprogs/files/patch-repair_scan.c   (contents, props changed)
  head/sysutils/xfsprogs/files/patch-repair_xfs__repair.c   (contents, props changed)

Modified: head/sysutils/xfsprogs/files/patch-include_freebsd.h
==============================================================================
--- head/sysutils/xfsprogs/files/patch-include_freebsd.h	Fri May 12 20:25:45 2017	(r440709)
+++ head/sysutils/xfsprogs/files/patch-include_freebsd.h	Fri May 12 20:27:52 2017	(r440710)
@@ -1,17 +1,17 @@
---- include/freebsd.h.orig	2015-07-24 04:28:04 UTC
-+++ include/freebsd.h
-@@ -37,10 +37,14 @@
- #define ftruncate64	ftruncate
- #define lseek64		lseek
- #define stat64		stat
-+#define lstat64		lstat
- #define pwrite64	pwrite
- #define pread64		pread
- #define fdatasync	fsync
- #define memalign(a,sz)	valloc(sz)
-+#define nftw64		nftw
-+#define statvfs64	statvfs
-+#define posix_fadvise64	posix_fadvise
- 
- #define constpp	char * const *
- 
+--- include/freebsd.h.orig	2015-07-24 04:28:04 UTC
++++ include/freebsd.h
+@@ -37,10 +37,14 @@
+ #define ftruncate64	ftruncate
+ #define lseek64		lseek
+ #define stat64		stat
++#define lstat64		lstat
+ #define pwrite64	pwrite
+ #define pread64		pread
+ #define fdatasync	fsync
+ #define memalign(a,sz)	valloc(sz)
++#define nftw64		nftw
++#define statvfs64	statvfs
++#define posix_fadvise64	posix_fadvise
+ 
+ #define constpp	char * const *
+ 

Modified: head/sysutils/xfsprogs/files/patch-include_libxfs.h
==============================================================================
--- head/sysutils/xfsprogs/files/patch-include_libxfs.h	Fri May 12 20:25:45 2017	(r440709)
+++ head/sysutils/xfsprogs/files/patch-include_libxfs.h	Fri May 12 20:27:52 2017	(r440710)
@@ -1,10 +1,10 @@
---- include/libxfs.h.orig	2015-07-24 04:28:04 UTC
-+++ include/libxfs.h
-@@ -27,7 +27,6 @@
- #include <xfs/list.h>
- #include <xfs/hlist.h>
- #include <xfs/cache.h>
--#include <xfs/bitops.h>
- #include <xfs/kmem.h>
- #include <xfs/radix-tree.h>
- #include <xfs/swab.h>
+--- include/libxfs.h.orig	2015-07-24 04:28:04 UTC
++++ include/libxfs.h
+@@ -27,7 +27,6 @@
+ #include <xfs/list.h>
+ #include <xfs/hlist.h>
+ #include <xfs/cache.h>
+-#include <xfs/bitops.h>
+ #include <xfs/kmem.h>
+ #include <xfs/radix-tree.h>
+ #include <xfs/swab.h>

Modified: head/sysutils/xfsprogs/files/patch-libxlog_util.c
==============================================================================
--- head/sysutils/xfsprogs/files/patch-libxlog_util.c	Fri May 12 20:25:45 2017	(r440709)
+++ head/sysutils/xfsprogs/files/patch-libxlog_util.c	Fri May 12 20:27:52 2017	(r440710)
@@ -1,10 +1,10 @@
---- libxlog/util.c.orig	2015-07-28 23:02:16 UTC
-+++ libxlog/util.c
-@@ -16,6 +16,7 @@
-  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#include <inttypes.h>
- #include <xfs/libxlog.h>
- 
- int print_exit;
+--- libxlog/util.c.orig	2015-07-28 23:02:16 UTC
++++ libxlog/util.c
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <inttypes.h>
+ #include <xfs/libxlog.h>
+ 
+ int print_exit;

Modified: head/sysutils/xfsprogs/files/patch-repair_attr__repair.h
==============================================================================
--- head/sysutils/xfsprogs/files/patch-repair_attr__repair.h	Fri May 12 20:25:45 2017	(r440709)
+++ head/sysutils/xfsprogs/files/patch-repair_attr__repair.h	Fri May 12 20:27:52 2017	(r440710)
@@ -1,10 +1,10 @@
---- repair/attr_repair.h.orig	2015-07-24 04:28:04 UTC
-+++ repair/attr_repair.h
-@@ -71,6 +71,7 @@ struct xfs_acl {
-  * For v4 superblocks, that is limited to 25 entries. For v5 superblocks, it is
-  * limited only by the maximum size of the xattr that stores the information.
-  */
-+#define XATTR_SIZE_MAX 65536
- #define XFS_ACL_MAX_ENTRIES(mp) \
- 	(xfs_sb_version_hascrc(&mp->m_sb) \
- 		?  (XATTR_SIZE_MAX - sizeof(struct xfs_acl)) / \
+--- repair/attr_repair.h.orig	2015-07-24 04:28:04 UTC
++++ repair/attr_repair.h
+@@ -71,6 +71,7 @@ struct xfs_acl {
+  * For v4 superblocks, that is limited to 25 entries. For v5 superblocks, it is
+  * limited only by the maximum size of the xattr that stores the information.
+  */
++#define XATTR_SIZE_MAX 65536
+ #define XFS_ACL_MAX_ENTRIES(mp) \
+ 	(xfs_sb_version_hascrc(&mp->m_sb) \
+ 		?  (XATTR_SIZE_MAX - sizeof(struct xfs_acl)) / \

Modified: head/sysutils/xfsprogs/files/patch-repair_phase4.c
==============================================================================
--- head/sysutils/xfsprogs/files/patch-repair_phase4.c	Fri May 12 20:25:45 2017	(r440709)
+++ head/sysutils/xfsprogs/files/patch-repair_phase4.c	Fri May 12 20:27:52 2017	(r440710)
@@ -1,10 +1,10 @@
---- repair/phase4.c.orig	2015-07-24 04:28:04 UTC
-+++ repair/phase4.c
-@@ -16,6 +16,7 @@
-  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#include <inttypes.h>
- #include <libxfs.h>
- #include "threads.h"
- #include "prefetch.h"
+--- repair/phase4.c.orig	2015-07-24 04:28:04 UTC
++++ repair/phase4.c
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <inttypes.h>
+ #include <libxfs.h>
+ #include "threads.h"
+ #include "prefetch.h"

Modified: head/sysutils/xfsprogs/files/patch-repair_scan.c
==============================================================================
--- head/sysutils/xfsprogs/files/patch-repair_scan.c	Fri May 12 20:25:45 2017	(r440709)
+++ head/sysutils/xfsprogs/files/patch-repair_scan.c	Fri May 12 20:27:52 2017	(r440710)
@@ -1,10 +1,10 @@
---- repair/scan.c.orig	2015-07-24 04:28:04 UTC
-+++ repair/scan.c
-@@ -16,6 +16,7 @@
-  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#include <inttypes.h>
- #include <libxfs.h>
- #include "avl.h"
- #include "globals.h"
+--- repair/scan.c.orig	2015-07-24 04:28:04 UTC
++++ repair/scan.c
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <inttypes.h>
+ #include <libxfs.h>
+ #include "avl.h"
+ #include "globals.h"

Modified: head/sysutils/xfsprogs/files/patch-repair_xfs__repair.c
==============================================================================
--- head/sysutils/xfsprogs/files/patch-repair_xfs__repair.c	Fri May 12 20:25:45 2017	(r440709)
+++ head/sysutils/xfsprogs/files/patch-repair_xfs__repair.c	Fri May 12 20:27:52 2017	(r440710)
@@ -1,10 +1,10 @@
---- repair/xfs_repair.c.orig	2015-07-24 04:28:04 UTC
-+++ repair/xfs_repair.c
-@@ -16,6 +16,7 @@
-  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#include <inttypes.h>
- #include <xfs/libxlog.h>
- #include <sys/resource.h>
- #include "avl.h"
+--- repair/xfs_repair.c.orig	2015-07-24 04:28:04 UTC
++++ repair/xfs_repair.c
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <inttypes.h>
+ #include <xfs/libxlog.h>
+ #include <sys/resource.h>
+ #include "avl.h"