[packages/xfsprogs] - up to 3.1.10

arekm arekm at pld-linux.org
Fri Dec 14 07:07:49 CET 2012 

commit e1a86c11006f0c057bedd275cadc75bf08fe42b6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Dec 14 07:07:46 2012 +0100

    - up to 3.1.10

 xfsprogs-miscfix-v2.patch      | 121 +++++++++++++++++++++++++++++++++++++++++
 xfsprogs-repair-tcmalloc.patch |   4 +-
 xfsprogs.spec                  |  10 ++--
 3 files changed, 128 insertions(+), 7 deletions(-)
---
diff --git a/xfsprogs.spec b/xfsprogs.spec
index a2647f4..7260bb4 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -7,12 +7,12 @@
 Summary:	Tools for the XFS filesystem
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
-Version:	3.1.8
+Version:	3.1.10
 Release:	1
 License:	LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:		Applications/System
 Source0:	ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
-# Source0-md5:	f70b2e7200d4c29f0af1cf70e7be1db6
+# Source0-md5:	d6159f7a664d95b4c150d580399d4400
 Source1:	xfs_lsprojid
 Patch0:		%{name}-miscfix-v2.patch
 Patch2:		%{name}-sharedlibs.patch
@@ -128,7 +128,7 @@ Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %{?with_tcmalloc:%patch6 -p1}
@@ -143,7 +143,7 @@ Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
 # dietlibc has needed librt stuff in libc/libpthread
 sed -i -e 's|^AC_PACKAGE_NEED_AIO_H|dnl AC_PACKAGE_NEED_AIO_H|' \
 	-e 's|^AC_PACKAGE_NEED_LIO_LISTIO|dnl AC_PACKAGE_NEED_LIO_LISTIO|' \
-	configure.in
+	configure.ac
 sed -i -e 's|\(^LIBRT.*=.*\)|# \1|' include/builddefs.in
 sed -i -e 's|\(^LLDLIBS.*=.*\)|\1 -lcompat|' db/Makefile mkfs/Makefile
 %endif
@@ -176,7 +176,7 @@ mv -f repair/xfs_repair initrd/xfs_repair
 %if %{with dietlibc}
 sed -i -e 's|^dnl AC_PACKAGE_NEED_AIO_H|AC_PACKAGE_NEED_AIO_H|' \
 	-e 's|^dnl AC_PACKAGE_NEED_LIO_LISTIO|AC_PACKAGE_NEED_LIO_LISTIO|' \
-	configure.in
+	configure.ac
 sed -i -e 's|^# \(LIBRT.*=.*\)|\1|' include/builddefs.in
 sed -i -e 's|\(^LLDLIBS.*=.*\) -lcompat|\1|' db/Makefile mkfs/Makefile
 %endif
diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index a47d926..11e8c13 100644
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -29,3 +29,124 @@
  TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
  		mdrestore repair rtcp m4 man doc po debian
  
+--- xfsprogs-3.1.10/libxcmd/input.c~	2012-12-13 22:29:24.000000000 +0100
++++ xfsprogs-3.1.10/libxcmd/input.c	2012-12-14 07:01:24.852839169 +0100
+@@ -88,7 +88,7 @@
+ 
+ 	if (!line)
+ 		return NULL;
+-	printf(get_prompt());
++	printf("%s", get_prompt());
+ 	fflush(stdout);
+ 	if (!fgets(line, MAXREADLINESZ, stdin)) {
+ 		free(line);
+--- /dev/null	2011-06-01 08:46:43.490033582 +0200
++++ xfsprogs/io/sync_file_range.c	2012-11-12 18:54:28.047526230 +0100
+@@ -0,0 +1,107 @@
++/*
++ * Copyright (c) 2012 Red Hat, Inc.
++ * All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it would be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write the Free Software Foundation,
++ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ */
++
++#include <xfs/xfs.h>
++#include <xfs/command.h>
++#include <xfs/input.h>
++#include "init.h"
++#include "io.h"
++
++static cmdinfo_t sync_range_cmd;
++
++static void
++sync_range_help(void)
++{
++	printf(_(
++"\n"
++" Trigger specific writeback commands on a range of the current file\n"
++"\n"
++" With no options, the SYNC_FILE_RANGE_WRITE is implied.\n"
++" -a -- wait for IO to finish after writing (SYNC_FILE_RANGE_WAIT_AFTER).\n"
++" -b -- wait for IO to finish before writing (SYNC_FILE_RANGE_WAIT_BEFORE).\n"
++" -w -- write dirty data in range (SYNC_FILE_RANGE_WRITE).\n"
++"\n"));
++}
++
++static int
++sync_range_f(
++	int		argc,
++	char		**argv)
++{
++	off64_t		offset = 0, length = 0;
++	int		c, sync_mode = 0;
++	size_t		blocksize, sectsize;
++
++	while ((c = getopt(argc, argv, "abw")) != EOF) {
++		switch (c) {
++		case 'a':
++			sync_mode = SYNC_FILE_RANGE_WAIT_AFTER;
++			break;
++		case 'b':
++			sync_mode = SYNC_FILE_RANGE_WAIT_BEFORE;
++			break;
++		case 'w':
++			sync_mode = SYNC_FILE_RANGE_WRITE;
++			break;
++		default:
++			return command_usage(&sync_range_cmd);
++		}
++	}
++
++	/* default to just starting writeback on the range */
++	if (!sync_mode)
++		sync_mode = SYNC_FILE_RANGE_WRITE;
++
++	if (optind != argc - 2)
++		return command_usage(&sync_range_cmd);
++	init_cvtnum(&blocksize, &sectsize);
++	offset = cvtnum(blocksize, sectsize, argv[optind]);
++	if (offset < 0) {
++		printf(_("non-numeric offset argument -- %s\n"),
++			argv[optind]);
++		return 0;
++	}
++	optind++;
++	length = cvtnum(blocksize, sectsize, argv[optind]);
++	if (length < 0) {
++		printf(_("non-numeric length argument -- %s\n"),
++			argv[optind]);
++		return 0;
++	}
++
++	if (sync_file_range(file->fd, offset, length, sync_mode) < 0) {
++		perror("sync_file_range");
++		return 0;
++	}
++	return 0;
++}
++
++void
++sync_range_init(void)
++{
++	sync_range_cmd.name = "sync_range";
++	sync_range_cmd.cfunc = sync_range_f;
++	sync_range_cmd.argmin = 2;
++	sync_range_cmd.argmax = -1;
++	sync_range_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK;
++	sync_range_cmd.args = _("[-abw] off len");
++	sync_range_cmd.oneline = _("Control writeback on a range of a file");
++	sync_range_cmd.help = sync_range_help;
++
++	add_command(&sync_range_cmd);
++}
diff --git a/xfsprogs-repair-tcmalloc.patch b/xfsprogs-repair-tcmalloc.patch
index 9d4a72a..df79ae9 100644
--- a/xfsprogs-repair-tcmalloc.patch
+++ b/xfsprogs-repair-tcmalloc.patch
@@ -38,8 +38,8 @@ tools, which at least for repair reduces the memory usage dramatically.
 
 Signed-off-by: Christoph Hellwig <hch at lst.de>
 
---- xfsprogs-3.1.7/configure.in.org	2011-11-18 07:58:49.815439699 +0100
-+++ xfsprogs-3.1.7/configure.in	2011-11-18 07:59:49.360093001 +0100
+--- xfsprogs-3.1.7/configure.ac.org	2011-11-18 07:58:49.815439699 +0100
++++ xfsprogs-3.1.7/configure.ac	2011-11-18 07:59:49.360093001 +0100
 @@ -31,6 +31,26 @@
  AC_SUBST(libeditline)
  AC_SUBST(enable_editline)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfsprogs.git/commitdiff/e1a86c11006f0c057bedd275cadc75bf08fe42b6

More information about the pld-cvs-commit mailing list