[Glibc-bsd-commits] r2490 - in trunk/ufsutils/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Mon May 4 12:20:50 UTC 2009
Author: ps-guest
Date: 2009-05-04 12:20:49 +0000 (Mon, 04 May 2009)
New Revision: 2490
Modified:
trunk/ufsutils/debian/changelog
trunk/ufsutils/debian/patches/00_mount.patch
trunk/ufsutils/debian/patches/02_fsck.ufs.patch
trunk/ufsutils/debian/upstream.sh
Log:
ufsutils based on FreeBSD 7.2
Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog 2009-05-04 12:01:01 UTC (rev 2489)
+++ trunk/ufsutils/debian/changelog 2009-05-04 12:20:49 UTC (rev 2490)
@@ -1,5 +1,6 @@
-ufsutils (7.1-3) UNRELEASED; urgency=low
+ufsutils (7.2-1) UNSTABLE; urgency=low
+ [ Guillem Jover ]
* Use $(filter ...) instead of $(findstring ...) to extract space separated
options from DEB_BUILD_OPTIONS in debian/rules.
* Remove commented out lines in debian/rules.
@@ -8,13 +9,16 @@
* Use asterisks for bulleted lists in package description.
* Remove DPATCHLEVEL variable from patches.
* Switch to debhelper compatibility level 7.
- * Use dh_prep instead of “dh_clean -k”.
+ * Use dh_prep instead of "dh_clean -k".
* Do not use stamp files for build.
* Include quilt.make snippet instead of using ad-hoc code.
* Remove unused ufsutils variable and rename libufs to lib in debian/rules.
- -- Guillem Jover <guillem at debian.org> Sat, 18 Apr 2009 01:47:10 +0200
+ [ Petr Salinger ]
+ * New upstream version (RELENG_7_2_0_RELEASE)
+ -- Guillem Jover <guillem at debian.org> Mon, 04 May 2009 12:00:00 +0200
+
ufsutils (7.1-2) unstable; urgency=low
[ Petr Salinger ]
Modified: trunk/ufsutils/debian/patches/00_mount.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_mount.patch 2009-05-04 12:01:01 UTC (rev 2489)
+++ trunk/ufsutils/debian/patches/00_mount.patch 2009-05-04 12:20:49 UTC (rev 2490)
@@ -2,7 +2,7 @@
===================================================================
--- ufsutils.orig/freebsd/sys/mount.h
+++ ufsutils/freebsd/sys/mount.h
-@@ -34,14 +34,10 @@
+@@ -34,20 +34,16 @@
#define _SYS_MOUNT_H_
#include <sys/ucred.h>
@@ -12,16 +12,22 @@
-#include <sys/lockmgr.h>
-#include <sys/_mutex.h>
-#endif
--
--typedef struct fsid { int32_t val[2]; } fsid_t; /* filesystem id type */
+#include <stdint.h>
+#include <sys/vfs.h>
+#include <sys/types.h>
+#include <sys/socket.h>
/*
+ * NOTE: When changing statfs structure, mount structure, MNT_* flags or
+ * MNTK_* flags also update DDB show mount command in vfs_subr.c.
+ */
+
+-typedef struct fsid { int32_t val[2]; } fsid_t; /* filesystem id type */
+-
+ /*
* File identifier.
-@@ -60,6 +56,7 @@
+ * These are unique per filesystem on a single machine.
+@@ -65,6 +61,7 @@
*/
#define MFSNAMELEN 16 /* length of type name including null */
#define MNAMELEN 88 /* size of on/from name bufs */
@@ -29,7 +35,7 @@
#define STATFS_VERSION 0x20030518 /* current version number */
struct statfs {
uint32_t f_version; /* structure version number */
-@@ -210,6 +207,7 @@
+@@ -216,6 +213,7 @@
} while (0)
#endif /* _KERNEL */
@@ -37,7 +43,7 @@
/*
* User specifiable flags.
-@@ -384,6 +382,7 @@
+@@ -391,6 +389,7 @@
char *np_index; /* Index file */
};
@@ -45,7 +51,7 @@
/*
* Filesystem configuration information. One of these exists for each
* type of filesystem supported by the kernel. These are searched at
-@@ -421,6 +420,7 @@
+@@ -428,6 +427,7 @@
int vfc_flags;
};
#endif
@@ -53,7 +59,7 @@
/*
* NB: these flags refer to IMPLEMENTATION properties, not properties of
-@@ -485,6 +485,7 @@
+@@ -492,6 +492,7 @@
#define VQ_FLAG4000 0x4000 /* placeholder */
#define VQ_FLAG8000 0x8000 /* placeholder */
@@ -61,7 +67,7 @@
#ifdef _KERNEL
/* Point a sysctl request at a vfsidctl's data. */
#define VCTLTOREQ(vc, req) \
-@@ -741,5 +742,5 @@
+@@ -753,5 +754,5 @@
__END_DECLS
#endif /* _KERNEL */
Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2009-05-04 12:01:01 UTC (rev 2489)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2009-05-04 12:20:49 UTC (rev 2490)
@@ -4,7 +4,7 @@
+++ ufsutils/fsck.ufs/gjournal.c
@@ -54,6 +54,9 @@
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2 2006/11/01 10:56:33 ru Exp $");
+ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2.8.1 2009/04/15 03:14:26 kensmith Exp $");
+
+#if HAVE_UFS_SNAPSHOT
@@ -35,9 +35,9 @@
--- ufsutils.orig/fsck.ufs/fsck_ffs.8
+++ ufsutils/fsck.ufs/fsck_ffs.8
@@ -30,11 +30,11 @@
- .\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $
+ .\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34.2.5.2.2 2009/04/27 19:15:33 delphij Exp $
.\"
- .Dd April 24, 2001
+ .Dd January 25, 2009
-.Dt FSCK_FFS 8
+.Dt FSCK.UFS 8
.Os
@@ -49,7 +49,7 @@
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
.Nm
-@@ -313,5 +313,4 @@
+@@ -341,5 +341,4 @@
.Xr fstab 5 ,
.Xr fsck 8 ,
.Xr fsdb 8 ,
@@ -91,7 +91,7 @@
if (!preen) {
printf("\n***** FILE SYSTEM MARKED %s *****\n",
markclean ? "CLEAN" : "DIRTY");
-@@ -565,7 +570,7 @@
+@@ -593,7 +598,7 @@
}
void
@@ -100,7 +100,7 @@
{
ckfini(0);
-@@ -578,7 +583,7 @@
+@@ -606,7 +611,7 @@
* so that reboot sequence may be interrupted.
*/
void
@@ -109,7 +109,7 @@
{
printf("returning to single-user after file system check\n");
returntosingle = 1;
-@@ -647,11 +652,13 @@
+@@ -675,11 +680,13 @@
* Force foreground fsck to clean up inconsistency.
*/
if (bkgrdflag) {
@@ -123,7 +123,7 @@
fprintf(stdout, "CANNOT RUN IN BACKGROUND\n");
ckfini(0);
exit(EEXIT);
-@@ -668,6 +675,7 @@
+@@ -696,6 +703,7 @@
/*
* Force foreground fsck to clean up inconsistency.
*/
@@ -131,7 +131,7 @@
if (bkgrdflag) {
cmd.value = FS_NEEDSFSCK;
cmd.size = 1;
-@@ -675,6 +683,7 @@
+@@ -703,6 +711,7 @@
&cmd, sizeof cmd) == -1)
pwarn("CANNOT SET FS_NEEDSFSCK FLAG\n");
}
@@ -144,7 +144,7 @@
--- ufsutils.orig/fsck.ufs/inode.c
+++ ufsutils/fsck.ufs/inode.c
@@ -36,7 +36,7 @@
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $");
+ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $");
#include <sys/param.h>
-#include <sys/stdint.h>
@@ -182,7 +182,7 @@
#include <sys/uio.h>
#include <sys/disklabel.h>
-@@ -62,14 +69,18 @@
+@@ -62,14 +70,18 @@
#include <paths.h>
#include <stdint.h>
#include <string.h>
@@ -202,7 +202,7 @@
int
main(int argc, char *argv[])
-@@ -78,10 +89,11 @@
+@@ -78,11 +90,12 @@
struct rlimit rlimit;
struct itimerval itimerval;
int ret = 0;
@@ -210,21 +210,22 @@
sync();
skipclean = 1;
-- while ((ch = getopt(argc, argv, "b:Bc:dfFm:npy")) != -1) {
-+ while ((ch = getopt(argc, argv, "ab:Bc:dfFm:npy")) != -1) {
+ damagedflag = 0;
+- while ((ch = getopt(argc, argv, "b:Bc:CdDfFm:npy")) != -1) {
++ while ((ch = getopt(argc, argv, "ab:Bc:CdDfFm:npy")) != -1) {
switch (ch) {
case 'b':
skipclean = 0;
-@@ -125,6 +137,7 @@
+@@ -130,6 +143,7 @@
yflag = 0;
break;
+ case 'a':
case 'p':
preen++;
+ /*FALLTHROUGH*/
+@@ -144,20 +158,22 @@
break;
-@@ -135,20 +148,22 @@
- break;
default:
- usage();
@@ -240,7 +241,7 @@
if (signal(SIGINT, SIG_IGN) != SIG_IGN)
(void)signal(SIGINT, catch);
- if (preen)
+ if (ckclean)
(void)signal(SIGQUIT, catchquit);
+#ifdef HAVE_BSD_SIGNALS
signal(SIGINFO, infohandler);
@@ -248,7 +249,7 @@
if (bkgrdflag) {
signal(SIGALRM, alarmhandler);
itimerval.it_interval.tv_sec = 5;
-@@ -195,8 +210,10 @@
+@@ -204,8 +220,10 @@
ufs2_daddr_t n_ffree, n_bfree;
struct dups *dp;
struct statfs *mntp;
@@ -259,7 +260,7 @@
ufs2_daddr_t blks;
struct iovec *iov;
char errmsg[255];
-@@ -218,10 +235,14 @@
+@@ -227,10 +245,14 @@
* if it is listed among the mounted file systems. Failing that
* check to see if it is listed in /etc/fstab.
*/
@@ -274,7 +275,7 @@
filesys = blockcheck(filesys);
/*
* If -F flag specified, check to see whether a background check
-@@ -239,8 +258,10 @@
+@@ -248,8 +270,10 @@
if ((sblock.fs_flags & FS_DOSOFTDEP) == 0)
exit(5); /* Not running soft updates */
size = MIBSIZE;
@@ -285,7 +286,7 @@
if ((mntp == NULL && sblock.fs_clean == 1) ||
(mntp != NULL && (sblock.fs_flags & FS_UNCLEAN) == 0))
exit(7); /* Filesystem clean, report it now */
-@@ -253,6 +275,7 @@
+@@ -262,6 +286,7 @@
if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
exit(3); /* Cannot read superblock */
close(fsreadfd);
@@ -293,7 +294,7 @@
if ((sblock.fs_flags & FS_GJOURNAL) != 0) {
//printf("GJournaled file system detected on %s.\n",
// filesys);
-@@ -270,6 +293,7 @@
+@@ -279,6 +304,7 @@
"CANNOT RUN FAST FSCK\n");
}
}
@@ -301,7 +302,7 @@
}
/*
* If we are to do a background check:
-@@ -278,6 +299,7 @@
+@@ -287,6 +313,7 @@
* return created snapshot file
* if not found, clear bkgrdflag and proceed with normal fsck
*/
@@ -309,7 +310,7 @@
if (bkgrdflag) {
if (mntp == NULL) {
bkgrdflag = 0;
-@@ -365,6 +387,7 @@
+@@ -374,6 +401,7 @@
filesys = snapname;
}
}
@@ -317,7 +318,7 @@
switch (setup(filesys)) {
case 0:
-@@ -372,7 +395,9 @@
+@@ -381,7 +409,9 @@
pfatal("CAN'T CHECK FILE SYSTEM.");
return (0);
case -1:
@@ -327,7 +328,7 @@
pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree +
sblock.fs_frag * sblock.fs_cstotal.cs_nbfree));
printf("(%lld frags, %lld blocks, %.1f%% fragmentation)\n",
-@@ -392,8 +417,10 @@
+@@ -401,8 +431,10 @@
*/
if (preen == 0) {
printf("** Last Mounted on %s\n", sblock.fs_fsmnt);
@@ -338,7 +339,7 @@
printf("** Phase 1 - Check Blocks and Sizes\n");
}
pass1();
-@@ -492,8 +519,13 @@
+@@ -501,8 +533,13 @@
/*
* Check to see if the file system is mounted read-write.
*/
@@ -352,7 +353,7 @@
ckfini(resolved);
for (cylno = 0; cylno < sblock.fs_ncg; cylno++)
-@@ -536,6 +568,8 @@
+@@ -545,6 +582,8 @@
* it unless it is read-write, so we can continue using it
* as safely as possible.
*/
@@ -361,7 +362,7 @@
if (mntp->f_flags & MNT_RDONLY) {
/*
* XXX: Need to kick out MNT_ROOTFS until we fix
-@@ -558,8 +592,12 @@
+@@ -573,8 +612,12 @@
return (1);
}
return (0);
@@ -374,7 +375,7 @@
/*
* Get the mount point information for name.
*/
-@@ -599,13 +637,14 @@
+@@ -614,13 +657,14 @@
statfsp = NULL;
return (statfsp);
}
@@ -385,7 +386,7 @@
+usage(char *progname)
{
(void) fprintf(stderr,
- "usage: %s [-BFpfny] [-b block] [-c level] [-m mode] "
+ "usage: %s [-BCFpfny] [-b block] [-c level] [-m mode] "
"filesystem ...\n",
- getprogname());
+ progname);
@@ -412,7 +413,7 @@
--- ufsutils.orig/fsck.ufs/setup.c
+++ ufsutils/fsck.ufs/setup.c
@@ -36,11 +36,14 @@
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $");
+ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50.2.2.2.2 2009/04/27 19:15:33 delphij Exp $");
#include <sys/param.h>
+#include <sys/types.h>
@@ -521,7 +522,7 @@
--- ufsutils.orig/fsck.ufs/Makefile
+++ ufsutils/fsck.ufs/Makefile
@@ -1,19 +1,18 @@
- # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18 2007/09/19 01:24:19 rodrigc Exp $
+ # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18.8.1 2009/04/15 03:14:26 kensmith Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
-PROG= fsck_ffs
Modified: trunk/ufsutils/debian/upstream.sh
===================================================================
--- trunk/ufsutils/debian/upstream.sh 2009-05-04 12:01:01 UTC (rev 2489)
+++ trunk/ufsutils/debian/upstream.sh 2009-05-04 12:20:49 UTC (rev 2490)
@@ -1,7 +1,7 @@
#!/bin/bash
ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_1_0_RELEASE
+RELENG=RELENG_7_2_0_RELEASE
srcs=" \
src/sbin/badsect:badsect.ufs \
More information about the Glibc-bsd-commits
mailing list