[Glibc-bsd-commits] r5383 - in trunk/ufsutils/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-24 21:48:44 +0000 (Fri, 24 Jan 2014)
New Revision: 5383

Removed:
   trunk/ufsutils/debian/patches/00_portable_berase.patch
Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/fsck_getopt.diff
   trunk/ufsutils/debian/patches/makefiles.diff
   trunk/ufsutils/debian/patches/series
Log:
  * New upstream release.
    - Refresh all patches.
    - 00_portable_berase.patch: Remove (merged).

Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2014-01-24 21:40:35 UTC (rev 5382)
+++ trunk/ufsutils/debian/changelog	2014-01-24 21:48:44 UTC (rev 5383)
@@ -1,9 +1,14 @@
-ufsutils (9.2-4) UNRELEASED; urgency=low
+ufsutils (10.0-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    - Refresh all patches.
+    - 00_portable_berase.patch: Remove (merged).
+
+  [ Robert Millan ]
   * Fetch source code securely (https) in get-orig-source.
   * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
 
- -- Robert Millan <rmh at debian.org>  Sat, 07 Dec 2013 23:22:58 +0100
+ -- Robert Millan <rmh at debian.org>  Fri, 24 Jan 2014 22:46:44 +0100
 
 ufsutils (9.2-3) unstable; urgency=low
 

Deleted: trunk/ufsutils/debian/patches/00_portable_berase.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_portable_berase.patch	2014-01-24 21:40:35 UTC (rev 5382)
+++ trunk/ufsutils/debian/patches/00_portable_berase.patch	2014-01-24 21:48:44 UTC (rev 5383)
@@ -1,76 +0,0 @@
-
-Replace DIOCGDELETE call in berase() with a portable implementation instead
-of just disabling it.
-
-Patch from upstream (r228349).
-
---- a/lib/libufs/block.c
-+++ b/lib/libufs/block.c
-@@ -139,10 +139,56 @@
- 	return (cnt);
- }
- 
-+#ifdef __FreeBSD_kernel__
-+
-+static int
-+berase_helper(struct uufsd *disk, ufs2_daddr_t blockno, ufs2_daddr_t size)
-+{
-+	off_t ioarg[2];
-+
-+	ioarg[0] = blockno * disk->d_bsize;
-+	ioarg[1] = size;
-+	return (ioctl(disk->d_fd, DIOCGDELETE, ioarg));
-+}
-+
-+#else
-+
-+static int
-+berase_helper(struct uufsd *disk, ufs2_daddr_t blockno, ufs2_daddr_t size)
-+{
-+	char *zero_chunk;
-+	off_t offset, zero_chunk_size, pwrite_size;
-+	int rv;
-+
-+	offset = blockno * disk->d_bsize;
-+	zero_chunk_size = 65536 * disk->d_bsize;
-+	zero_chunk = calloc(1, zero_chunk_size);
-+	if (zero_chunk == NULL) {
-+		ERROR(disk, "failed to allocate memory");
-+		return (-1);
-+	}
-+	while (size > 0) { 
-+		pwrite_size = size;
-+		if (pwrite_size > zero_chunk_size)
-+			pwrite_size = zero_chunk_size;
-+		rv = pwrite(disk->d_fd, zero_chunk, pwrite_size, offset);
-+		if (rv == -1) {
-+			ERROR(disk, "failed writing to disk");
-+			break;
-+		}
-+		size -= rv;
-+		offset += rv;
-+		rv = 0;
-+	}
-+	free(zero_chunk);
-+	return (rv);
-+}
-+
-+#endif
-+
- int
- berase(struct uufsd *disk, ufs2_daddr_t blockno, ufs2_daddr_t size)
- {
--	off_t ioarg[2];
- 	int rv;
- 
- 	ERROR(disk, NULL);
-@@ -151,8 +197,5 @@
- 		ERROR(disk, "failed to open disk for writing");
- 		return(rv);
- 	}
--	ioarg[0] = blockno * disk->d_bsize;
--	ioarg[1] = size;
--	rv = ioctl(disk->d_fd, DIOCGDELETE, ioarg);
--	return (rv);
-+	return (berase_helper(disk, blockno, size));
- }

Modified: trunk/ufsutils/debian/patches/fsck_getopt.diff
===================================================================
--- trunk/ufsutils/debian/patches/fsck_getopt.diff	2014-01-24 21:40:35 UTC (rev 5382)
+++ trunk/ufsutils/debian/patches/fsck_getopt.diff	2014-01-24 21:48:44 UTC (rev 5383)
@@ -4,8 +4,8 @@
  	sync();
  	skipclean = 1;
  	inoopt = 0;
--	while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npryZ")) != -1) {
-+	while ((ch = getopt(argc, argv, "ab:Bc:CdEfFm:npryZ")) != -1) {
+-	while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:nprSyZ")) != -1) {
++	while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:nprSyZa")) != -1) {
  		switch (ch) {
  		case 'b':
  			skipclean = 0;

Modified: trunk/ufsutils/debian/patches/makefiles.diff
===================================================================
--- trunk/ufsutils/debian/patches/makefiles.diff	2014-01-24 21:40:35 UTC (rev 5382)
+++ trunk/ufsutils/debian/patches/makefiles.diff	2014-01-24 21:48:44 UTC (rev 5383)
@@ -22,15 +22,14 @@
  .include <bsd.prog.mk>
 --- a/sbin/ffsinfo/Makefile
 +++ b/sbin/ffsinfo/Makefile
-@@ -15,5 +15,8 @@
- CFLAGS+=-DFS_DEBUG -I${GROWFS}
+@@ -16,4 +16,7 @@
  DPADD=	${LIBUFS}
  LDADD=	-lufs
-+
+ 
 +CFLAGS+=	-I../../lib/libufs
 +LDADD+=		-L../../lib/libufs -lbsd
-  
- .include <bsd.prog.mk>               
++
+ .include <bsd.prog.mk>
 --- a/sbin/fsck_ffs/Makefile
 +++ b/sbin/fsck_ffs/Makefile
 @@ -13,6 +13,11 @@

Modified: trunk/ufsutils/debian/patches/series
===================================================================
--- trunk/ufsutils/debian/patches/series	2014-01-24 21:40:35 UTC (rev 5382)
+++ trunk/ufsutils/debian/patches/series	2014-01-24 21:48:44 UTC (rev 5383)
@@ -1,5 +1,4 @@
 # Patches from (or merged in) upstream
-00_portable_berase.patch
 
 # Patches that are in good shape for merging upstream
 05_wipe_otherfs.patch