Date: Sun, 4 Aug 2002 03:31:05 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/41293: update port: sysutils/e2fsprogs Message-ID: <20020803193105.DCB073E9C17@utopia.leeym.com>
next in thread | raw e-mail | index | archive | help
>Number: 41293
>Category: ports
>Synopsis: update port: sysutils/e2fsprogs
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 03 12:40:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 4.6-STABLE i386
>Organization:
dedicate thie port to Dear Miss WeiWei
>Environment:
System: FreeBSD utopia.leeym.com 4.6-STABLE FreeBSD 4.6-STABLE #62: Fri Aug 2 05:58:35 CST 2002 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386
>Description:
update e2fsprogs to version 1.27
install libuuid related header files (required by UPnP SDK)
>How-To-Repeat:
>Fix:
--- e2fsprogs.diff begins here ---
diff -ruN --exclude CVS /usr/ports/sysutils/e2fsprogs/Makefile e2fsprogs/Makefile
--- /usr/ports/sysutils/e2fsprogs/Makefile Mon Jun 24 05:24:07 2002
+++ e2fsprogs/Makefile Sun Aug 4 03:18:24 2002
@@ -6,7 +6,7 @@
#
PORTNAME= e2fsprogs
-PORTVERSION= 1.22
+PORTVERSION= 1.27
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,15 +24,19 @@
MAN1= chattr.1 lsattr.1 uuidgen.1
MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 fsck.8 \
- mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8
+ mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
+ fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8
post-patch:
+ @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${CHMOD} 644
@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
's|LIST_HEAD|LIN_LST_HEAD|g ; \
s|et/com_err.h|com_err.h|g ; s|<malloc.h>|<stdlib.h>|'
post-install:
- ${MKDIR} ${PREFIX}/include/ext2fs
- ${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs
+ @${MKDIR} ${PREFIX}/include/ext2fs
+ @${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs
+ @${MKDIR} ${PREFIX}/include/uuid
+ @${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid
.include <bsd.port.mk>
diff -ruN --exclude CVS /usr/ports/sysutils/e2fsprogs/distinfo e2fsprogs/distinfo
--- /usr/ports/sysutils/e2fsprogs/distinfo Wed Jul 4 02:13:09 2001
+++ e2fsprogs/distinfo Sun Aug 4 01:46:02 2002
@@ -1 +1 @@
-MD5 (e2fsprogs-1.22.tar.gz) = a2b689fda4e954df0258c2605bc65d9b
+MD5 (e2fsprogs-1.27.tar.gz) = 485b43875becc98dd11ac4c2a30dd734
diff -ruN --exclude CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c e2fsprogs/files/patch-lib::ext2fs::ismounted.c
--- /usr/ports/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c Thu Jan 1 08:00:00 1970
+++ e2fsprogs/files/patch-lib::ext2fs::ismounted.c Sun Aug 4 02:53:47 2002
@@ -0,0 +1,104 @@
+--- lib/ext2fs/ismounted.c.orig Mon Feb 25 05:03:59 2002
++++ lib/ext2fs/ismounted.c Sun Aug 4 02:51:39 2002
+@@ -146,50 +146,6 @@
+ return retval;
+ }
+
+-/*
+- * Check to see if we're dealing with the swap device.
+- */
+-static int is_swap_device(const char *file)
+-{
+- FILE *f;
+- char buf[1024], *cp;
+- dev_t file_dev;
+- struct stat st_buf;
+- int ret = 0;
+-
+- file_dev = 0;
+-#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
+- if (stat(file, &st_buf) == 0)
+- file_dev = st_buf.st_rdev;
+-#endif
+-
+- if (!(f = fopen("/proc/swaps", "r")))
+- return 0;
+- /* Skip the first line */
+- fgets(buf, sizeof(buf), f);
+- while (!feof(f)) {
+- if (!fgets(buf, sizeof(buf), f))
+- break;
+- if ((cp = strchr(buf, ' ')) != NULL)
+- *cp = 0;
+- if ((cp = strchr(buf, '\t')) != NULL)
+- *cp = 0;
+- if (strcmp(buf, file) == 0) {
+- ret++;
+- break;
+- }
+-#ifndef __GNU__
+- if (file_dev && (stat(buf, &st_buf) == 0) &&
+- file_dev == st_buf.st_rdev) {
+- ret++;
+- break;
+- }
+-#endif
+- }
+- fclose(f);
+- return ret;
+-}
+-
+ static errcode_t check_mntent(const char *file, int *mount_flags,
+ char *mtpt, int mtlen)
+ {
+@@ -248,6 +204,50 @@
+ return 0;
+ }
+ #endif /* HAVE_GETMNTINFO */
++
++/*
++ * Check to see if we're dealing with the swap device.
++ */
++static int is_swap_device(const char *file)
++{
++ FILE *f;
++ char buf[1024], *cp;
++ dev_t file_dev;
++ struct stat st_buf;
++ int ret = 0;
++
++ file_dev = 0;
++#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
++ if (stat(file, &st_buf) == 0)
++ file_dev = st_buf.st_rdev;
++#endif
++
++ if (!(f = fopen("/proc/swaps", "r")))
++ return 0;
++ /* Skip the first line */
++ fgets(buf, sizeof(buf), f);
++ while (!feof(f)) {
++ if (!fgets(buf, sizeof(buf), f))
++ break;
++ if ((cp = strchr(buf, ' ')) != NULL)
++ *cp = 0;
++ if ((cp = strchr(buf, '\t')) != NULL)
++ *cp = 0;
++ if (strcmp(buf, file) == 0) {
++ ret++;
++ break;
++ }
++#ifndef __GNU__
++ if (file_dev && (stat(buf, &st_buf) == 0) &&
++ file_dev == st_buf.st_rdev) {
++ ret++;
++ break;
++ }
++#endif
++ }
++ fclose(f);
++ return ret;
++}
+
+ /*
+ * ext2fs_check_mount_point() returns 1 if the device is mounted, 0
diff -ruN --exclude CVS /usr/ports/sysutils/e2fsprogs/pkg-plist e2fsprogs/pkg-plist
--- /usr/ports/sysutils/e2fsprogs/pkg-plist Wed Jul 4 02:13:10 2001
+++ e2fsprogs/pkg-plist Sun Aug 4 03:01:15 2002
@@ -6,14 +6,20 @@
include/ext2fs/dosio.h
include/ext2fs/e2image.h
include/ext2fs/ext2_err.h
+include/ext2fs/ext2_ext_attr.h
include/ext2fs/ext2_fs.h
include/ext2fs/ext2_io.h
include/ext2fs/ext2_types.h
include/ext2fs/ext2fs.h
include/ext2fs/ext2fsP.h
include/ext2fs/irel.h
+include/ext2fs/jfs_compat.h
include/ext2fs/jfs_dat.h
include/ext2fs/jfs_user.h
+include/ext2fs/kernel-jbd.h
+include/ext2fs/kernel-list.h
+include/uuid/uuid.h
+include/uuid/uuidP.h
info/libext2fs.info.gz
lib/libe2p.a
lib/libe2p.so
@@ -35,7 +41,9 @@
sbin/fsck.ext3
sbin/mke2fs
sbin/mkfs.ext2
+sbin/mkfs.ext3
sbin/mklost+found
sbin/resize2fs
sbin/tune2fs
+@dirrm include/uuid
@dirrm include/ext2fs
--- e2fsprogs.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020803193105.DCB073E9C17>