ports/114161: [MAINTAINER] sysutils/e2fsprogs: update to 1.40
Matthias Andree
matthias.andree at gmx.de
Sat Jun 30 15:30:04 UTC 2007
>Number: 114161
>Category: ports
>Synopsis: [MAINTAINER] sysutils/e2fsprogs: update to 1.40
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 30 15:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 6.2-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:40:53 UTC 2007
>Description:
- Update to 1.40
Added file(s):
- files/patch-lib_ext2fs_ext2_fs.h
- files/patch-tdb.c
Removed file(s):
- files/patch-.conf-dir
- files/patch-DIOCGMEDIASIZE
- files/patch-lib_blkid_getsize.c
- files/patch-lib_blkid_probe.c
- files/patch-lib_blkid_probe.h
- files/patch-lib_ext2fs_ismounted.c
- files/patch-type-ntohl
- files/patch-types
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- e2fsprogs-1.40.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/emma/ports/sysutils/e2fsprogs/Makefile
--- /usr/ports/sysutils/e2fsprogs/Makefile Tue Jul 4 17:47:51 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile Sat Jun 30 16:54:10 2007
@@ -6,8 +6,8 @@
#
PORTNAME= e2fsprogs
-PORTVERSION= 1.39
-PORTREVISION?= 1
+PORTVERSION= 1.40
+PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,7 @@
PATCH_STRIP= -p1
GNU_CONFIGURE= yes
-CONFIGURE_ARGS?= --disable-fsck --disable-e2initrd-helper '--with-ldopts=-L${LOCALBASE}/lib' --with-cc='${CC}' --with-linker='${LD}' --with-ccopts='${CFLAGS}' --with-root-prefix='${PREFIX}'
+CONFIGURE_ARGS?= --disable-fsck --disable-e2initrd-helper '--with-ldopts=-L${LOCALBASE}/lib' --with-cc='${CC}' --with-linker='${LD}' --with-ccopts='${CFLAGS}' --with-root-prefix='${PREFIX}' --infodir=${PREFIX}/info --mandir=${PREFIX}/man
# for unknown reasons, the assembly bitops cause SIGSEGV.
# _EXT2_USE_C_VERSIONS_ uses C bitops, these appear to work fine.
CONFIGURE_ENV+= CPPFLAGS='${CPPFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include -D_EXT2_USE_C_VERSIONS_'
@@ -32,7 +32,7 @@
MAKE_ARGS+= STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a ../lib/libblkid.a ../lib/libuuid.a ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
PLIST_SUB= NLS=""
.endif
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PKGDEINSTALL= ${PKGINSTALL}
.if !defined(MASTERDIR)
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/emma/ports/sysutils/e2fsprogs/distinfo
--- /usr/ports/sysutils/e2fsprogs/distinfo Mon Jun 12 14:13:08 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/distinfo Sat Jun 30 14:53:18 2007
@@ -1,3 +1,3 @@
-MD5 (e2fsprogs-1.39.tar.gz) = 06f7806782e357797fad1d34b7ced0c6
-SHA256 (e2fsprogs-1.39.tar.gz) = dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
-SIZE (e2fsprogs-1.39.tar.gz) = 3695111
+MD5 (e2fsprogs-1.40.tar.gz) = 40095356dbe3d970b898469fe598317c
+SHA256 (e2fsprogs-1.40.tar.gz) = 3a506f345e5da098c6c37239eb99e92d11a4100490245e102b13c446d1124296
+SIZE (e2fsprogs-1.40.tar.gz) = 4160254
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-.conf-dir /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-.conf-dir
--- /usr/ports/sysutils/e2fsprogs/files/patch-.conf-dir Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-.conf-dir Thu Jan 1 01:00:00 1970
@@ -1,36 +0,0 @@
-diff -r 4decffc5e9a3 MCONFIG.in
---- a/MCONFIG.in Tue May 30 16:29:49 2006 +0200
-+++ b/MCONFIG.in Sat Jun 10 16:12:52 2006 +0200
-@@ -33,7 +33,7 @@ datadir = @datadir@
-
- CC = @CC@
- BUILD_CC = @BUILD_CC@
--DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-+DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@
- CFLAGS = @CFLAGS@
- CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
- INTL_FLAGS = @INTL_FLAGS@
-diff -r 4decffc5e9a3 e2fsck/unix.c
---- a/e2fsck/unix.c Tue May 30 16:29:49 2006 +0200
-+++ b/e2fsck/unix.c Sat Jun 10 16:12:52 2006 +0200
-@@ -568,7 +568,7 @@ static void syntax_err_report(const char
- exit(FSCK_ERROR);
- }
-
--static const char *config_fn[] = { "/etc/e2fsck.conf", 0 };
-+static const char *config_fn[] = { ROOT_SYSCONFDIR "/e2fsck.conf", 0 };
-
- static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
- {
-diff -r 4decffc5e9a3 misc/mke2fs.c
---- a/misc/mke2fs.c Tue May 30 16:29:49 2006 +0200
-+++ b/misc/mke2fs.c Sat Jun 10 16:12:52 2006 +0200
-@@ -870,7 +870,7 @@ static void syntax_err_report(const char
- exit(1);
- }
-
--static const char *config_fn[] = { "/etc/mke2fs.conf", 0 };
-+static const char *config_fn[] = { ROOT_SYSCONFDIR "/mke2fs.conf", 0 };
-
- static void edit_feature(const char *str, __u32 *compat_array)
- {
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-DIOCGMEDIASIZE /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-DIOCGMEDIASIZE
--- /usr/ports/sysutils/e2fsprogs/files/patch-DIOCGMEDIASIZE Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-DIOCGMEDIASIZE Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
-diff -r 46fd786b5562 -r 69fad9bdafc0 lib/blkid/getsize.c
---- a/lib/blkid/getsize.c Mon May 29 11:47:49 2006 -0400
-+++ b/lib/blkid/getsize.c Tue May 30 00:54:49 2006 +0200
-@@ -121,6 +121,12 @@ blkid_loff_t blkid_get_dev_size(int fd)
- if (ioctl(fd, BLKGETSIZE, &size) >= 0)
- return (blkid_loff_t)size << 9;
- #endif
-+
-+/* tested on FreeBSD 6.1-RELEASE i386 */
-+#ifdef DIOCGMEDIASIZE
-+ if (ioctl(fd, DIOCGMEDIASIZE, &size64) >= 0)
-+ return (off_t)size64;
-+#endif /* DIOCGMEDIASIZE */
-
- #ifdef FDGETPRM
- if (ioctl(fd, FDGETPRM, &this_floppy) >= 0)
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-configure /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure
--- /usr/ports/sysutils/e2fsprogs/files/patch-configure Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure Sat Jun 30 16:07:55 2007
@@ -9,3 +9,12 @@
stdlib.h string.h unistd.h sys/param.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -16641,7 +16641,7 @@
+ fi
+ { echo "$as_me:$LINENO: checking for unified diff option" >&5
+ echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
+-if diff -u $0 $0 >& /dev/null ; then
++if diff -u $0 $0 >/dev/null 2>&1 ; then
+ UNI_DIFF_OPTS=-u
+ else
+ UNI_DIFF_OPTS=-c
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c
--- /usr/ports/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c Thu Jan 1 01:00:00 1970
@@ -1,32 +0,0 @@
-diff -r 0fbbbe379fea -r 05c2c6855f62 lib/blkid/getsize.c
---- a/lib/blkid/getsize.c Tue May 30 01:48:51 2006 +0200
-+++ b/lib/blkid/getsize.c Tue May 30 05:08:02 2006 +0200
-@@ -133,20 +133,22 @@ blkid_loff_t blkid_get_dev_size(int fd)
- return (blkid_loff_t)this_floppy.size << 9;
- #endif
- #ifdef HAVE_SYS_DISKLABEL_H
--#if 0
- /*
-- * This should work in theory but I haven't tested it. Anyone
-- * on a BSD system want to test this for me? In the meantime,
-- * binary search mechanism should work just fine.
-+ * This code works for FreeBSD 4.11 i386, except for the full device
-+ * (such as /dev/ad0). It doesn't work properly for newer FreeBSD
-+ * though. FreeBSD >= 5.0 should be covered by the DIOCGMEDIASIZE
-+ * above however.
-+ *
-+ * Note that FreeBSD >= 4.0 has disk devices as unbuffered (raw,
-+ * character) devices, so we need to check for S_ISCHR, too.
- */
-- if ((fstat(fd, &st) >= 0) && S_ISBLK(st.st_mode))
-+ if ((fstat(fd, &st) >= 0) && (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
- part = st.st_rdev & 7;
- if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
- pp = &lab.d_partitions[part];
- if (pp->p_size)
- return pp->p_size << 9;
- }
--#endif
- #endif /* HAVE_SYS_DISKLABEL_H */
- {
- #ifdef HAVE_FSTAT64
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.c /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.c
--- /usr/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.c Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.c Thu Jan 1 01:00:00 1970
@@ -1,33 +0,0 @@
-diff -r 3bd3981defcd -r 3e8071a0e4b0 lib/blkid/probe.c
---- a/lib/blkid/probe.c Tue May 30 15:47:05 2006 +0200
-+++ b/lib/blkid/probe.c Tue May 30 15:47:12 2006 +0200
-@@ -253,7 +253,7 @@ static int probe_fat(struct blkid_probe
- struct msdos_super_block *ms = (struct msdos_super_block *) buf;
- struct vfat_dir_entry *dir;
- char serno[10];
-- const unsigned char *label = 0, *vol_label = 0;
-+ const unsigned char *label = 0, *vol_label = 0, *tmp;
- unsigned char *vol_serno;
- int label_len = 0, maxloop = 100;
- __u16 sector_size, dir_entries, reserved;
-@@ -261,14 +261,17 @@ static int probe_fat(struct blkid_probe
- __u32 buf_size, start_data_sect, next, root_start, root_dir_entries;
-
- /* sector size check */
-- sector_size = blkid_le16(*((__u16 *) &ms->ms_sector_size));
-+ tmp = &ms->ms_sector_size;
-+ sector_size = tmp[0] + tmp[1] << 8;
- if (sector_size != 0x200 && sector_size != 0x400 &&
- sector_size != 0x800 && sector_size != 0x1000)
- return 1;
-
-- dir_entries = blkid_le16(*((__u16 *) &ms->ms_dir_entries));
-+ tmp = &ms->ms_dir_entries;
-+ dir_entries = tmp[0] + tmp[1] << 8;
- reserved = blkid_le16(ms->ms_reserved);
-- sect_count = blkid_le16(*((__u16 *) &ms->ms_sectors));
-+ tmp = &ms->ms_sectors;
-+ sect_count = tmp[0] + tmp[1] << 8;
- if (sect_count == 0)
- sect_count = blkid_le32(ms->ms_total_sect);
-
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.h /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.h
--- /usr/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.h Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_blkid_probe.h Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-diff -r 05c2c6855f62 -r 48c00850eae6 lib/blkid/probe.h
---- a/lib/blkid/probe.h Tue May 30 05:08:02 2006 +0200
-+++ b/lib/blkid/probe.h Tue May 30 14:42:47 2006 +0200
-@@ -414,7 +414,7 @@ _INLINE_ __u64 blkid_swab64(__u64 val)
-
-
-
--#if __BYTE_ORDER == __BIG_ENDIAN
-+#ifdef WORDS_BIGENDIAN
- #define blkid_le16(x) blkid_swab16(x)
- #define blkid_le32(x) blkid_swab32(x)
- #define blkid_le64(x) blkid_swab64(x)
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
--- /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h Thu Jan 1 01:00:00 1970
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h Sat Jun 30 16:37:48 2007
@@ -0,0 +1,11 @@
+--- a/lib/ext2fs/ext2_fs.h.orig Sat Jun 30 16:36:37 2007
++++ b/lib/ext2fs/ext2_fs.h Sat Jun 30 16:36:43 2007
+@@ -414,7 +414,7 @@
+
+ #define i_size_high i_dir_acl
+
+-#if defined(__KERNEL__) || defined(__linux__)
++#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__)
+ #define i_reserved1 osd1.linux1.l_i_reserved1
+ #define i_frag osd2.linux2.l_i_frag
+ #define i_fsize osd2.linux2.l_i_fsize
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ismounted.c /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ismounted.c
--- /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ismounted.c Wed Apr 11 05:48:04 2007
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ismounted.c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
---- a/lib/ext2fs/ismounted.c.orig Tue Apr 10 23:38:42 2007
-+++ b/lib/ext2fs/ismounted.c Tue Apr 10 23:41:32 2007
-@@ -325,9 +325,9 @@
- *mount_flags |= EXT2_MF_BUSY;
- } else
- close(fd);
-+#endif
-
- return 0;
--#endif
- }
-
- /*
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in
--- /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in Sat Jun 30 16:59:12 2007
@@ -1,16 +1,15 @@
---- a/misc/Makefile.in.orig Thu Jun 8 16:20:48 2006
-+++ b/misc/Makefile.in Thu Jun 8 16:24:18 2006
-@@ -288,11 +288,9 @@
+--- a/misc/Makefile.in.orig Sat Jun 30 16:57:47 2007
++++ b/misc/Makefile.in Sat Jun 30 16:58:17 2007
+@@ -295,11 +295,9 @@
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
-- @if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
-- echo " INSTALL_DATA /etc/mke2fs.conf"; \
-+ echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.dist"; \
+- @if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+ echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
-- $(DESTDIR)/etc/mke2fs.conf; \
+- $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
- fi
-+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist
++ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist; \
install-strip: install
@for i in $(SPROGS); do \
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-tdb.c /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-tdb.c
--- /usr/ports/sysutils/e2fsprogs/files/patch-tdb.c Thu Jan 1 01:00:00 1970
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-tdb.c Sat Jun 30 16:14:22 2007
@@ -0,0 +1,10 @@
+--- a/lib/ext2fs/tdb.c.orig Thu Apr 5 02:43:05 2007
++++ b/lib/ext2fs/tdb.c Sat Jun 30 16:13:15 2007
+@@ -36,7 +36,6 @@
+ #define HAVE_UTIME_H
+ #define HAVE_UTIME
+ #endif
+-#define _XOPEN_SOURCE 500
+
+ #include <unistd.h>
+ #include <stdio.h>
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-type-ntohl /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-type-ntohl
--- /usr/ports/sysutils/e2fsprogs/files/patch-type-ntohl Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-type-ntohl Thu Jan 1 01:00:00 1970
@@ -1,30 +0,0 @@
-diff -r 3e8071a0e4b0 -r 83f8b3c2a930 e2fsck/recovery.c
---- a/e2fsck/recovery.c Tue May 30 15:47:12 2006 +0200
-+++ b/e2fsck/recovery.c Tue May 30 16:26:29 2006 +0200
-@@ -236,7 +236,7 @@ int journal_recover(journal_t *journal)
-
- if (!sb->s_start) {
- jbd_debug(1, "No recovery required, last transaction %d\n",
-- ntohl(sb->s_sequence));
-+ (int)ntohl(sb->s_sequence));
- journal->j_transaction_sequence = ntohl(sb->s_sequence) + 1;
- return 0;
- }
-diff -r 3e8071a0e4b0 -r 83f8b3c2a930 misc/dumpe2fs.c
---- a/misc/dumpe2fs.c Tue May 30 15:47:12 2006 +0200
-+++ b/misc/dumpe2fs.c Tue May 30 16:26:29 2006 +0200
-@@ -310,10 +310,10 @@ static void print_journal_information(ex
- "Journal first block: %u\n"
- "Journal sequence: 0x%08x\n"
- "Journal start: %u\n"
-- "Journal number of users: %lu\n"),
-- ntohl(jsb->s_blocksize), ntohl(jsb->s_maxlen),
-- ntohl(jsb->s_first), ntohl(jsb->s_sequence),
-- ntohl(jsb->s_start), ntohl(jsb->s_nr_users));
-+ "Journal number of users: %u\n"),
-+ (unsigned int)ntohl(jsb->s_blocksize), (unsigned int)ntohl(jsb->s_maxlen),
-+ (unsigned int)ntohl(jsb->s_first), (unsigned int)ntohl(jsb->s_sequence),
-+ (unsigned int)ntohl(jsb->s_start), (unsigned int)ntohl(jsb->s_nr_users));
-
- for (i=0; i < ntohl(jsb->s_nr_users); i++) {
- uuid_unparse(&jsb->s_users[i*16], str);
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-types /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-types
--- /usr/ports/sysutils/e2fsprogs/files/patch-types Mon Jun 12 14:13:09 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-types Thu Jan 1 01:00:00 1970
@@ -1,156 +0,0 @@
-diff -r b426cedea5e0 -r 0fbbbe379fea lib/blkid/dev.c
---- a/lib/blkid/dev.c Tue May 30 01:20:17 2006 +0200
-+++ b/lib/blkid/dev.c Tue May 30 01:48:51 2006 +0200
-@@ -68,8 +68,8 @@ void blkid_debug_dump_dev(blkid_dev dev)
- }
-
- printf(" dev: name = %s\n", dev->bid_name);
-- printf(" dev: DEVNO=\"0x%0llx\"\n", dev->bid_devno);
-- printf(" dev: TIME=\"%ld\"\n", dev->bid_time);
-+ printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno);
-+ printf(" dev: TIME=\"%ld\"\n", (long)dev->bid_time);
- printf(" dev: PRI=\"%d\"\n", dev->bid_pri);
- printf(" dev: flags = 0x%08X\n", dev->bid_flags);
-
-@@ -196,7 +196,7 @@ void usage(char *prog)
- void usage(char *prog)
- {
- fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask]\n", prog);
-- fprintf(stderr, "\tList all devices and exit\n", prog);
-+ fprintf(stderr, "\tList all devices and exit\n");
- exit(1);
- }
-
-@@ -219,7 +219,7 @@ int main(int argc, char **argv)
- case 'm':
- blkid_debug_mask = strtoul (optarg, &tmp, 0);
- if (*tmp) {
-- fprintf(stderr, "Invalid debug mask: %d\n",
-+ fprintf(stderr, "Invalid debug mask: %s\n",
- optarg);
- exit(1);
- }
-diff -r b426cedea5e0 -r 0fbbbe379fea lib/blkid/devno.c
---- a/lib/blkid/devno.c Tue May 30 01:20:17 2006 +0200
-+++ b/lib/blkid/devno.c Tue May 30 01:48:51 2006 +0200
-@@ -125,7 +125,7 @@ static void scan_dir(char *dirname, dev_
- else if (S_ISBLK(st.st_mode) && st.st_rdev == devno) {
- *devname = blkid_strdup(path);
- DBG(DEBUG_DEVNO,
-- printf("found 0x%llx at %s (%p)\n", devno,
-+ printf("found 0x%llx at %s (%p)\n", (long long)devno,
- path, *devname));
- break;
- }
-@@ -183,7 +183,7 @@ char *blkid_devno_to_devname(dev_t devno
- (unsigned long) devno));
- } else {
- DBG(DEBUG_DEVNO,
-- printf("found devno 0x%04llx as %s\n", devno, devname));
-+ printf("found devno 0x%04llx as %s\n", (long long)devno, devname));
- }
-
-
-@@ -224,7 +224,7 @@ int main(int argc, char** argv)
- }
- devno = makedev(major, minor);
- }
-- printf("Looking for device 0x%04Lx\n", devno);
-+ printf("Looking for device 0x%04llx\n", (long long)devno);
- devname = blkid_devno_to_devname(devno);
- if (devname)
- free(devname);
-diff -r b426cedea5e0 -r 0fbbbe379fea lib/blkid/probe.c
---- a/lib/blkid/probe.c Tue May 30 01:20:17 2006 +0200
-+++ b/lib/blkid/probe.c Tue May 30 01:48:51 2006 +0200
-@@ -224,7 +224,7 @@ static char *no_name = "NO NAME ";
-
- static unsigned char *search_fat_label(struct vfat_dir_entry *dir, int count)
- {
-- unsigned int i;
-+ int i;
-
- for (i = 0; i < count; i++) {
- if (dir[i].name[0] == 0x00)
-@@ -764,8 +764,8 @@ blkid_dev blkid_verify(blkid_cache cache
- return dev;
-
- DBG(DEBUG_PROBE,
-- printf("need to revalidate %s (time since last check %lu)\n",
-- dev->bid_name, diff));
-+ printf("need to revalidate %s (time since last check %llu)\n",
-+ dev->bid_name, (unsigned long long)diff));
-
- if (((probe.fd = open(dev->bid_name, O_RDONLY)) < 0) ||
- (fstat(probe.fd, &st) < 0)) {
-@@ -852,7 +852,7 @@ found_type:
- blkid_set_tag(dev, "TYPE", type, 0);
-
- DBG(DEBUG_PROBE, printf("%s: devno 0x%04llx, type %s\n",
-- dev->bid_name, st.st_rdev, type));
-+ dev->bid_name, (long long)st.st_rdev, type));
- }
-
- if (probe.sbbuf)
-diff -r b426cedea5e0 -r 0fbbbe379fea lib/blkid/read.c
---- a/lib/blkid/read.c Tue May 30 01:20:17 2006 +0200
-+++ b/lib/blkid/read.c Tue May 30 01:48:51 2006 +0200
-@@ -452,8 +452,8 @@ static void debug_dump_dev(blkid_dev dev
- }
-
- printf(" dev: name = %s\n", dev->bid_name);
-- printf(" dev: DEVNO=\"0x%0llx\"\n", dev->bid_devno);
-- printf(" dev: TIME=\"%ld\"\n", dev->bid_time);
-+ printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno);
-+ printf(" dev: TIME=\"%lld\"\n", (long long)dev->bid_time);
- printf(" dev: PRI=\"%d\"\n", dev->bid_pri);
- printf(" dev: flags = 0x%08X\n", dev->bid_flags);
-
-diff -r b426cedea5e0 -r 0fbbbe379fea lib/blkid/save.c
---- a/lib/blkid/save.c Tue May 30 01:20:17 2006 +0200
-+++ b/lib/blkid/save.c Tue May 30 01:48:51 2006 +0200
-@@ -38,7 +38,7 @@ static int save_dev(blkid_dev dev, FILE
-
- fprintf(file,
- "<device DEVNO=\"0x%04lx\" TIME=\"%ld\"",
-- (unsigned long) dev->bid_devno, dev->bid_time);
-+ (unsigned long) dev->bid_devno, (long) dev->bid_time);
- if (dev->bid_pri)
- fprintf(file, " PRI=\"%d\"", dev->bid_pri);
- list_for_each(p, &dev->bid_tags) {
-diff -r b426cedea5e0 -r 0fbbbe379fea lib/blkid/tag.c
---- a/lib/blkid/tag.c Tue May 30 01:20:17 2006 +0200
-+++ b/lib/blkid/tag.c Tue May 30 01:48:51 2006 +0200
-@@ -386,7 +386,7 @@ void usage(char *prog)
- fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device "
- "[type value]\n",
- prog);
-- fprintf(stderr, "\tList all tags for a device and exit\n", prog);
-+ fprintf(stderr, "\tList all tags for a device and exit\n");
- exit(1);
- }
-
-@@ -412,7 +412,7 @@ int main(int argc, char **argv)
- case 'm':
- blkid_debug_mask = strtoul (optarg, &tmp, 0);
- if (*tmp) {
-- fprintf(stderr, "Invalid debug mask: %d\n",
-+ fprintf(stderr, "Invalid debug mask: %s\n",
- optarg);
- exit(1);
- }
-diff -r b426cedea5e0 -r 0fbbbe379fea lib/blkid/tst_types.c
---- a/lib/blkid/tst_types.c Tue May 30 01:20:17 2006 +0200
-+++ b/lib/blkid/tst_types.c Tue May 30 01:48:51 2006 +0200
-@@ -11,7 +11,10 @@
-
- #include "blkid/blkid_types.h"
-
--main(int argc, char **argv)
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+int main(int argc, char **argv)
- {
- if (sizeof(__u8) != 1) {
- printf("Sizeof(__u8) is %d should be 1\n",
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/pkg-plist /usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist
--- /usr/ports/sysutils/e2fsprogs/pkg-plist Mon Jun 12 14:13:08 2006
+++ /usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist Sat Jun 30 17:02:45 2007
@@ -32,4 +32,5 @@
%%NLS%%share/locale/rw/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
-%%NLS%%@unexec for i in cs de es fr it nl pl rw sv tr ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done
+%%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo
+%%NLS%%@unexec for i in cs de es fr it nl pl rw sv tr vi ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done
--- e2fsprogs-1.40.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list