From: Arkadiusz Miśkiewicz Date: Sun, 5 Jul 2009 17:31:28 +0000 (+0000) Subject: - drop obsolete files X-Git-Tag: auto/th/xfsprogs-3_0_1-2~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxfsprogs.git;a=commitdiff_plain;h=47fd7788d8c92692f2e52b292181ddbbf7c2fd83 - drop obsolete files Changed files: xfsprogs-gettext.patch -> 1.2 xfsprogs-libtool.patch -> 1.2 xfsprogs-quota-exitstatus.patch -> 1.2 --- diff --git a/xfsprogs-gettext.patch b/xfsprogs-gettext.patch deleted file mode 100644 index 3dc0a8c..0000000 --- a/xfsprogs-gettext.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- xfsprogs-2.8.16/repair/progress.c.orig 2006-10-17 18:10:14.000000000 +0200 -+++ xfsprogs-2.8.16/repair/progress.c 2006-10-30 20:57:29.538997000 +0100 -@@ -10,33 +10,37 @@ - #define ONEDAY (24*ONEHOUR) - #define ONEWEEK (7*ONEDAY) - -+#ifndef N_ -+#define N_(x) x -+#endif -+ - static - char *rpt_types[] = { - #define TYPE_INODE 0 -- _("inodes"), -+ N_("inodes"), - #define TYPE_BLOCK 1 -- _("blocks"), -+ N_("blocks"), - #define TYPE_DIR 2 -- _("directories"), -+ N_("directories"), - #define TYPE_AG 3 -- _("allocation groups"), -+ N_("allocation groups"), - #define TYPE_AGI_BUCKET 4 -- _("AGI unlinked buckets"), -+ N_("AGI unlinked buckets"), - #define TYPE_EXTENTS 5 -- _("extents"), -+ N_("extents"), - #define TYPE_RTEXTENTS 6 -- _("realtime extents"), -+ N_("realtime extents"), - #define TYPE_UNLINKED_LIST 7 -- _("unlinked lists") -+ N_("unlinked lists") - }; - - - static - char *rpt_fmts[] = { - #define FMT1 0 --_(" - %02d:%02d:%02d: %s - %llu of %llu %s done\n"), -+N_(" - %02d:%02d:%02d: %s - %llu of %llu %s done\n"), - #define FMT2 1 --_(" - %02d:%02d:%02d: %s - %llu %s done\n"), -+N_(" - %02d:%02d:%02d: %s - %llu %s done\n"), - }; - - typedef struct progress_rpt_s { -@@ -48,35 +52,35 @@ - - static - progress_rpt_t progress_rpt_reports[] = { --{FMT1, _("scanning filesystem freespace"), /* 0 */ -+{FMT1, N_("scanning filesystem freespace"), /* 0 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_AG]}, --{FMT1, _("scanning agi unlinked lists"), /* 1 */ -+{FMT1, N_("scanning agi unlinked lists"), /* 1 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_AG]}, --{FMT2, _("check uncertain AG inodes"), /* 2 */ -+{FMT2, N_("check uncertain AG inodes"), /* 2 */ - &rpt_fmts[FMT2], &rpt_types[TYPE_AGI_BUCKET]}, --{FMT1, _("process known inodes and inode discovery"), /* 3 */ -+{FMT1, N_("process known inodes and inode discovery"), /* 3 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]}, --{FMT1, _("process newly discovered inodes"), /* 4 */ -+{FMT1, N_("process newly discovered inodes"), /* 4 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_AG]}, --{FMT1, _("setting up duplicate extent list"), /* 5 */ -+{FMT1, N_("setting up duplicate extent list"), /* 5 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_AG]}, --{FMT1, _("initialize realtime bitmap"), /* 6 */ -+{FMT1, N_("initialize realtime bitmap"), /* 6 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_BLOCK]}, --{FMT1, _("reset realtime bitmaps"), /* 7 */ -+{FMT1, N_("reset realtime bitmaps"), /* 7 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_AG]}, --{FMT1, _("check for inodes claiming duplicate blocks"), /* 8 */ -+{FMT1, N_("check for inodes claiming duplicate blocks"), /* 8 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]}, --{FMT1, _("rebuild AG headers and trees"), /* 9 */ -+{FMT1, N_("rebuild AG headers and trees"), /* 9 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_AG]}, --{FMT1, _("traversing filesystem"), /* 10 */ -+{FMT1, N_("traversing filesystem"), /* 10 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_AG]}, --{FMT2, _("traversing all unattached subtrees"), /* 11 */ -+{FMT2, N_("traversing all unattached subtrees"), /* 11 */ - &rpt_fmts[FMT2], &rpt_types[TYPE_DIR]}, --{FMT2, _("moving disconnected inodes to lost+found"), /* 12 */ -+{FMT2, N_("moving disconnected inodes to lost+found"), /* 12 */ - &rpt_fmts[FMT2], &rpt_types[TYPE_INODE]}, --{FMT1, _("verify and correct link counts"), /* 13 */ -+{FMT1, N_("verify and correct link counts"), /* 13 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]}, --{FMT1, _("verify link counts"), /* 14 */ -+{FMT1, N_("verify link counts"), /* 14 */ - &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]} - }; - -@@ -339,16 +343,16 @@ - if (report_interval) { - switch(msgp->format->format) { - case FMT1: -- sprintf (msgbuf, *msgp->format->fmt, -+ sprintf (msgbuf, _(*msgp->format->fmt), - tmp->tm_hour, tmp->tm_min, tmp->tm_sec, -- msgp->format->msg, sum, -- *msgp->total, *msgp->format->type); -+ _(msgp->format->msg), sum, -+ *msgp->total, _(*msgp->format->type)); - break; - case FMT2: -- sprintf (msgbuf, *msgp->format->fmt, -+ sprintf (msgbuf, _(*msgp->format->fmt), - tmp->tm_hour, tmp->tm_min, tmp->tm_sec, -- msgp->format->msg, sum, -- *msgp->format->type); -+ _(msgp->format->msg), sum, -+ _(*msgp->format->type)); - break; - } - do_log(_("%s"), msgbuf); diff --git a/xfsprogs-libtool.patch b/xfsprogs-libtool.patch deleted file mode 100644 index 794e349..0000000 --- a/xfsprogs-libtool.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- xfsdump-2.2.42/include/buildmacros~ 2006-08-21 07:44:03.000000000 +0300 -+++ xfsdump-2.2.42/include/buildmacros 2006-08-23 21:03:00.997387025 +0300 -@@ -41,10 +41,10 @@ - LTOBJECTS = $(OBJECTS:.o=.lo) - LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --LTLINK = $(LIBTOOL) --mode=link $(CC) -+LTLINK = $(LIBTOOL) --mode=link --tag=CC $(CC) - LTEXEC = $(LIBTOOL) --mode=execute - LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CCF) - - ifeq ($(ENABLE_SHARED),yes) - LTLDFLAGS += -rpath $(PKG_LIB_DIR) diff --git a/xfsprogs-quota-exitstatus.patch b/xfsprogs-quota-exitstatus.patch deleted file mode 100644 index 72d0373..0000000 --- a/xfsprogs-quota-exitstatus.patch +++ /dev/null @@ -1,409 +0,0 @@ -diff -urN xfsprogs-2.9.7/quota.org/edit.c xfsprogs-2.9.7/quota/edit.c ---- xfsprogs-2.9.7/quota.org/edit.c 2007-09-11 04:01:20.000000000 +0200 -+++ xfsprogs-2.9.7/quota/edit.c 2008-04-18 15:46:17.838170367 +0200 -@@ -140,9 +140,11 @@ - d.d_rtb_hardlimit = *rtbhard; - d.d_rtb_softlimit = *rtbsoft; - -- if (xfsquotactl(XFS_SETQLIM, dev, type, id, (void *)&d) < 0) -+ if (xfsquotactl(XFS_SETQLIM, dev, type, id, (void *)&d) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot set limits: %s\n"), - progname, strerror(errno)); -+ } - } - - static void -@@ -159,10 +161,11 @@ - { - uid_t uid = uid_from_string(name); - -- if (uid == -1) -+ if (uid == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: invalid user name: %s\n"), - progname, name); -- else -+ } else - set_limits(uid, type, mask, fs_path->fs_name, - bsoft, bhard, isoft, ihard, rtbsoft, rtbhard); - } -@@ -181,10 +184,11 @@ - { - gid_t gid = gid_from_string(name); - -- if (gid == -1) -+ if (gid == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: invalid group name: %s\n"), - progname, name); -- else -+ } else - set_limits(gid, type, mask, fs_path->fs_name, - bsoft, bhard, isoft, ihard, rtbsoft, rtbhard); - } -@@ -203,10 +207,11 @@ - { - prid_t prid = prid_from_string(name); - -- if (prid == -1) -+ if (prid == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: invalid project name: %s\n"), - progname, name); -- else -+ } else - set_limits(prid, type, mask, fs_path->fs_name, - bsoft, bhard, isoft, ihard, rtbsoft, rtbhard); - } -@@ -315,12 +320,14 @@ - else if (extractb(s, "rtbhard=", 7, bsize, ssize, &rtbhard)) - mask |= FS_DQ_RTBHARD; - else { -+ exitcode = 1; - fprintf(stderr, _("%s: unrecognised argument %s\n"), - progname, s); - return 0; - } - } - if (!mask) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot find any valid arguments\n"), - progname); - return 0; -@@ -428,6 +435,7 @@ - - if (fname) { - if ((fp = fopen(fname, "r")) == NULL) { -+ exitcode = 1; - fprintf(stderr, _("%s: fopen on %s failed: %s\n"), - progname, fname, strerror(errno)); - return 0; -@@ -458,9 +466,11 @@ - d.d_btimer = value; - d.d_rtbtimer = value; - -- if (xfsquotactl(XFS_SETQLIM, dev, type, 0, (void *)&d) < 0) -+ if (xfsquotactl(XFS_SETQLIM, dev, type, 0, (void *)&d) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot set timer: %s\n"), - progname, strerror(errno)); -+ } - } - - static int -@@ -530,9 +540,11 @@ - d.d_bwarns = value; - d.d_rtbwarns = value; - -- if (xfsquotactl(XFS_SETQLIM, dev, type, id, (void *)&d) < 0) -+ if (xfsquotactl(XFS_SETQLIM, dev, type, id, (void *)&d) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot set warnings: %s\n"), - progname, strerror(errno)); -+ } - } - - static void -@@ -544,10 +556,11 @@ - { - uid_t uid = uid_from_string(name); - -- if (uid == -1) -+ if (uid == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: invalid user name: %s\n"), - progname, name); -- else -+ } else - set_warnings(uid, type, mask, fs_path->fs_name, value); - } - -@@ -560,10 +573,11 @@ - { - gid_t gid = gid_from_string(name); - -- if (gid == -1) -+ if (gid == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: invalid group name: %s\n"), - progname, name); -- else -+ } else - set_warnings(gid, type, mask, fs_path->fs_name, value); - } - -@@ -576,10 +590,11 @@ - { - prid_t prid = prid_from_string(name); - -- if (prid == -1) -+ if (prid == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: invalid project name: %s\n"), - progname, name); -- else -+ } else - set_warnings(prid, type, mask, fs_path->fs_name, value); - } - -diff -urN xfsprogs-2.9.7/quota.org/free.c xfsprogs-2.9.7/quota/free.c ---- xfsprogs-2.9.7/quota.org/free.c 2007-09-11 04:01:20.000000000 +0200 -+++ xfsprogs-2.9.7/quota/free.c 2008-04-18 15:46:57.233387016 +0200 -@@ -61,6 +61,7 @@ - int fd; - - if ((fd = open(mount->fs_dir, O_RDONLY)) < 0) { -+ exitcode = 1; - fprintf(stderr, "%s: cannot open %s: %s\n", - progname, mount->fs_dir, strerror(errno)); - return 0; -@@ -128,17 +129,20 @@ - return 0; - - if ((fd = open(path->fs_dir, O_RDONLY)) < 0) { -+ exitcode = 1; - fprintf(stderr, "%s: cannot open %s: %s\n", - progname, path->fs_dir, strerror(errno)); - return 0; - } - - if ((xfsctl(path->fs_dir, fd, XFS_IOC_FSGETXATTR, &fsx)) < 0) { -+ exitcode = 1; - perror("XFS_IOC_FSGETXATTR"); - close(fd); - return 0; - } - if (!(fsx.fsx_xflags & XFS_XFLAG_PROJINHERIT)) { -+ exitcode = 1; - fprintf(stderr, _("%s: project quota flag not set on %s\n"), - progname, path->fs_dir); - close(fd); -@@ -146,6 +150,7 @@ - } - - if (path->fs_prid != fsx.fsx_projid) { -+ exitcode = 1; - fprintf(stderr, - _("%s: project ID %u (%s) doesn't match ID %u (%s)\n"), - progname, path->fs_prid, projects_file, -diff -urN xfsprogs-2.9.7/quota.org/project.c xfsprogs-2.9.7/quota/project.c ---- xfsprogs-2.9.7/quota.org/project.c 2007-09-11 04:01:20.000000000 +0200 -+++ xfsprogs-2.9.7/quota/project.c 2008-04-18 15:49:06.202885828 +0200 -@@ -91,6 +91,7 @@ - int fd; - - if (flag == FTW_NS ){ -+ exitcode = 1; - fprintf(stderr, _("%s: cannot stat file %s\n"), progname, path); - return 0; - } -@@ -99,14 +100,16 @@ - return 0; - } - -- if ((fd = open(path, O_RDONLY|O_NOCTTY)) == -1) -+ if ((fd = open(path, O_RDONLY|O_NOCTTY)) == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot open %s: %s\n"), - progname, path, strerror(errno)); -- else if ((xfsctl(path, fd, XFS_IOC_FSGETXATTR, &fsx)) < 0) -+ } else if ((xfsctl(path, fd, XFS_IOC_FSGETXATTR, &fsx)) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot get flags on %s: %s\n"), - progname, path, strerror(errno)); -- else { -- if (fsx.fsx_projid != prid) -+ } else { -+ if (fsx.fsx_projid != prid) - printf(_("%s - project identifier is not set" - " (inode=%u, tree=%u)\n"), - path, fsx.fsx_projid, (unsigned int)prid); -@@ -130,6 +133,7 @@ - int fd; - - if (flag == FTW_NS ){ -+ exitcode = 1; - fprintf(stderr, _("%s: cannot stat file %s\n"), progname, path); - return 0; - } -@@ -139,10 +143,12 @@ - } - - if ((fd = open(path, O_RDONLY|O_NOCTTY)) == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot open %s: %s\n"), - progname, path, strerror(errno)); - return 0; - } else if (xfsctl(path, fd, XFS_IOC_FSGETXATTR, &fsx) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot get flags on %s: %s\n"), - progname, path, strerror(errno)); - close(fd); -@@ -151,9 +157,11 @@ - - fsx.fsx_projid = 0; - fsx.fsx_xflags &= ~XFS_XFLAG_PROJINHERIT; -- if (xfsctl(path, fd, XFS_IOC_FSSETXATTR, &fsx) < 0) -+ if (xfsctl(path, fd, XFS_IOC_FSSETXATTR, &fsx) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot clear project on %s: %s\n"), - progname, path, strerror(errno)); -+ } - close(fd); - return 0; - } -@@ -169,6 +177,7 @@ - int fd; - - if (flag == FTW_NS ){ -+ exitcode = 1; - fprintf(stderr, _("%s: cannot stat file %s\n"), progname, path); - return 0; - } -@@ -178,10 +187,12 @@ - } - - if ((fd = open(path, O_RDONLY|O_NOCTTY)) == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot open %s: %s\n"), - progname, path, strerror(errno)); - return 0; - } else if (xfsctl(path, fd, XFS_IOC_FSGETXATTR, &fsx) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot get flags on %s: %s\n"), - progname, path, strerror(errno)); - close(fd); -@@ -190,9 +201,11 @@ - - fsx.fsx_projid = prid; - fsx.fsx_xflags |= XFS_XFLAG_PROJINHERIT; -- if (xfsctl(path, fd, XFS_IOC_FSSETXATTR, &fsx) < 0) -+ if (xfsctl(path, fd, XFS_IOC_FSSETXATTR, &fsx) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot set project on %s: %s\n"), - progname, path, strerror(errno)); -+ } - close(fd); - return 0; - } -@@ -272,6 +285,7 @@ - - setprfiles(); - if (access(projects_file, F_OK) != 0) { -+ exitcode = 1; - fprintf(stderr, _("projects file \"%s\" doesn't exist\n"), - projects_file); - return 0; -@@ -279,10 +293,11 @@ - - while (argc > optind) { - prid = prid_from_string(argv[optind]); -- if (prid == -1) -+ if (prid == -1) { -+ exitcode = 1; - fprintf(stderr, _("%s - no such project in %s\n"), - argv[optind], projects_file); -- else -+ } else - project(argv[optind], type); - optind++; - } -diff -urN xfsprogs-2.9.7/quota.org/quota.c xfsprogs-2.9.7/quota/quota.c ---- xfsprogs-2.9.7/quota.org/quota.c 2007-09-11 04:01:20.000000000 +0200 -+++ xfsprogs-2.9.7/quota/quota.c 2008-04-18 15:49:28.803966289 +0200 -@@ -231,6 +231,7 @@ - id = u->pw_uid; - name = u->pw_name; - } else { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot find user %s\n"), - progname, name); - return; -@@ -280,6 +281,7 @@ - gid = g->gr_gid; - name = g->gr_name; - } else { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot find group %s\n"), - progname, name); - return; -@@ -336,6 +338,7 @@ - prid_t id; - - if (!name) { -+ exitcode = 1; - fprintf(stderr, _("%s: must specify a project name/ID\n"), - progname); - return; -@@ -348,6 +351,7 @@ - id = p->pr_prid; - name = p->pr_name; - } else { -+ exitcode = 1; - fprintf(stderr, _("%s: cannot find project %s\n"), - progname, name); - return; -diff -urN xfsprogs-2.9.7/quota.org/report.c xfsprogs-2.9.7/quota/report.c ---- xfsprogs-2.9.7/quota.org/report.c 2007-09-11 04:01:20.000000000 +0200 -+++ xfsprogs-2.9.7/quota/report.c 2008-04-18 15:49:40.684534248 +0200 -@@ -115,6 +115,7 @@ - uint id; - - if ((mount = fs_table_lookup(dir, FS_MOUNT_POINT)) == NULL) { -+ exitcode = 1; - fprintf(stderr, "%s: cannot find mount point %s\n", - progname, dir); - return; -diff -urN xfsprogs-2.9.7/quota.org/state.c xfsprogs-2.9.7/quota/state.c ---- xfsprogs-2.9.7/quota.org/state.c 2007-09-11 04:01:20.000000000 +0200 -+++ xfsprogs-2.9.7/quota/state.c 2008-04-18 15:50:18.026319397 +0200 -@@ -253,6 +253,7 @@ - - mount = fs_table_lookup(dir, FS_MOUNT_POINT); - if (!mount) { -+ exitcode = 1; - fprintf(stderr, "%s: unknown mount point %s\n", progname, dir); - return; - } -@@ -274,6 +275,7 @@ - - mount = fs_table_lookup(dir, FS_MOUNT_POINT); - if (!mount) { -+ exitcode = 1; - fprintf(stderr, "%s: unknown mount point %s\n", progname, dir); - return; - } -@@ -295,6 +297,7 @@ - - mount = fs_table_lookup(dir, FS_MOUNT_POINT); - if (!mount) { -+ exitcode = 1; - fprintf(stderr, "%s: unknown mount point %s\n", progname, dir); - return; - } -@@ -327,6 +330,7 @@ - - mount = fs_table_lookup(dir, FS_MOUNT_POINT); - if (!mount) { -+ exitcode = 1; - fprintf(stderr, "%s: unknown mount point %s\n", progname, dir); - return; - } -diff -urN xfsprogs-2.9.7/quota.org/util.c xfsprogs-2.9.7/quota/util.c ---- xfsprogs-2.9.7/quota.org/util.c 2007-09-11 04:01:20.000000000 +0200 -+++ xfsprogs-2.9.7/quota/util.c 2008-04-18 15:50:29.823550039 +0200 -@@ -413,11 +413,13 @@ - return stdout; - - if ((fd = open(fname, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0) { -+ exitcode = 1; - fprintf(stderr, _("%s: open on %s failed: %s\n"), - progname, fname, strerror(errno)); - return NULL; - } - if ((fp = fdopen(fd, "w")) == NULL) { -+ exitcode = 1; - fprintf(stderr, _("%s: fdopen on %s failed: %s\n"), - progname, fname, strerror(errno)); - close(fd);