Attachment #24112 for bug #41293

View | Details | Raw Unified | Return to bug 41293
Collapse All | Expand All




#

PORTNAME=	e2fsprogs
PORTVERSION=	1.27
CATEGORIES=	sysutils
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


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 \
	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/uuid
	@${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid

.include <bsd.port.mk>

Line 1 Link Here

(-)e2fsprogs/distinfo (-1 / +1 lines)
1	MD5 (e2fsprogs-1.22.tar.gz) = a2b689fda4e954df0258c2605bc65d9b	1	MD5 (e2fsprogs-1.27.tar.gz) = 485b43875becc98dd11ac4c2a30dd734




--- 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




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

sbin/fsck.ext3
sbin/mke2fs
sbin/mkfs.ext2
sbin/mkfs.ext3
sbin/mklost+found
sbin/resize2fs
sbin/tune2fs
@dirrm include/uuid
@dirrm include/ext2fs

Return to bug 41293

Lines 6-12 Link Here

(-)e2fsprogs/Makefile (-4 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.22	9	PORTVERSION= 1.27
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 24-38 Link Here
24		24
25	MAN1= chattr.1 lsattr.1 uuidgen.1	25	MAN1= chattr.1 lsattr.1 uuidgen.1
26	MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 fsck.8 \	26	MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 fsck.8 \
27	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8	27	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
		28	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8
28		29
29	post-patch:	30	post-patch:
		31	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${CHMOD} 644
30	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${REINPLACE_CMD} -e \	32	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${REINPLACE_CMD} -e \
31	's\|LIST_HEAD\|LIN_LST_HEAD\|g ; \	33	's\|LIST_HEAD\|LIN_LST_HEAD\|g ; \
32	s\|et/com_err.h\|com_err.h\|g ; s\|<malloc.h>\|<stdlib.h>\|'	34	s\|et/com_err.h\|com_err.h\|g ; s\|<malloc.h>\|<stdlib.h>\|'
33		35
34	post-install:	36	post-install:
35	${MKDIR} ${PREFIX}/include/ext2fs	37	@${MKDIR} ${PREFIX}/include/ext2fs
36	${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs	38	@${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs
		39	@${MKDIR} ${PREFIX}/include/uuid
		40	@${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid
37		41
38	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Line 0 Link Here

(-)e2fsprogs/files/patch-lib::ext2fs::ismounted.c (+104 lines)
		1	--- lib/ext2fs/ismounted.c.orig Mon Feb 25 05:03:59 2002
		2	+++ lib/ext2fs/ismounted.c Sun Aug 4 02:51:39 2002
		3	@@ -146,50 +146,6 @@
		4	return retval;
		5	}
		6
		7	-/*
		8	- * Check to see if we're dealing with the swap device.
		9	- */
		10	-static int is_swap_device(const char *file)
		11	-{
		12	- FILE *f;
		13	- char buf[1024], *cp;
		14	- dev_t file_dev;
		15	- struct stat st_buf;
		16	- int ret = 0;
		17	-
		18	- file_dev = 0;
		19	-#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
		20	- if (stat(file, &st_buf) == 0)
		21	- file_dev = st_buf.st_rdev;
		22	-#endif
		23	-
		24	- if (!(f = fopen("/proc/swaps", "r")))
		25	- return 0;
		26	- /* Skip the first line */
		27	- fgets(buf, sizeof(buf), f);
		28	- while (!feof(f)) {
		29	- if (!fgets(buf, sizeof(buf), f))
		30	- break;
		31	- if ((cp = strchr(buf, ' ')) != NULL)
		32	- *cp = 0;
		33	- if ((cp = strchr(buf, '\t')) != NULL)
		34	- *cp = 0;
		35	- if (strcmp(buf, file) == 0) {
		36	- ret++;
		37	- break;
		38	- }
		39	-#ifndef __GNU__
		40	- if (file_dev && (stat(buf, &st_buf) == 0) &&
		41	- file_dev == st_buf.st_rdev) {
		42	- ret++;
		43	- break;
		44	- }
		45	-#endif
		46	- }
		47	- fclose(f);
		48	- return ret;
		49	-}
		50	-
		51	static errcode_t check_mntent(const char file, int mount_flags,
		52	char *mtpt, int mtlen)
		53	{
		54	@@ -248,6 +204,50 @@
		55	return 0;
		56	}
		57	#endif /* HAVE_GETMNTINFO */
		58	+
		59	+/*
		60	+ * Check to see if we're dealing with the swap device.
		61	+ */
		62	+static int is_swap_device(const char *file)
		63	+{
		64	+ FILE *f;
65	+ char buf[1024], *cp;
66	+ dev_t file_dev;
67	+ struct stat st_buf;
68	+ int ret = 0;
69	+
70	+ file_dev = 0;
71	+#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
72	+ if (stat(file, &st_buf) == 0)
73	+ file_dev = st_buf.st_rdev;
74	+#endif
75	+
76	+ if (!(f = fopen("/proc/swaps", "r")))
77	+ return 0;
78	+ /* Skip the first line */
79	+ fgets(buf, sizeof(buf), f);
80	+ while (!feof(f)) {
81	+ if (!fgets(buf, sizeof(buf), f))
82	+ break;
83	+ if ((cp = strchr(buf, ' ')) != NULL)
84	+ *cp = 0;
85	+ if ((cp = strchr(buf, '\t')) != NULL)
86	+ *cp = 0;
87	+ if (strcmp(buf, file) == 0) {
88	+ ret++;
89	+ break;
90	+ }
91	+#ifndef __GNU__
92	+ if (file_dev && (stat(buf, &st_buf) == 0) &&
93	+ file_dev == st_buf.st_rdev) {
94	+ ret++;
95	+ break;
96	+ }
97	+#endif
98	+ }
99	+ fclose(f);
100	+ return ret;
101	+}
102
103	/*
104	* ext2fs_check_mount_point() returns 1 if the device is mounted, 0

Lines 6-19 Link Here

(-)e2fsprogs/pkg-plist (+8 lines)
6	include/ext2fs/dosio.h	6	include/ext2fs/dosio.h
7	include/ext2fs/e2image.h	7	include/ext2fs/e2image.h
8	include/ext2fs/ext2_err.h	8	include/ext2fs/ext2_err.h
		9	include/ext2fs/ext2_ext_attr.h
9	include/ext2fs/ext2_fs.h	10	include/ext2fs/ext2_fs.h
10	include/ext2fs/ext2_io.h	11	include/ext2fs/ext2_io.h
11	include/ext2fs/ext2_types.h	12	include/ext2fs/ext2_types.h
12	include/ext2fs/ext2fs.h	13	include/ext2fs/ext2fs.h
13	include/ext2fs/ext2fsP.h	14	include/ext2fs/ext2fsP.h
14	include/ext2fs/irel.h	15	include/ext2fs/irel.h
		16	include/ext2fs/jfs_compat.h
15	include/ext2fs/jfs_dat.h	17	include/ext2fs/jfs_dat.h
16	include/ext2fs/jfs_user.h	18	include/ext2fs/jfs_user.h
		19	include/ext2fs/kernel-jbd.h
		20	include/ext2fs/kernel-list.h
		21	include/uuid/uuid.h
		22	include/uuid/uuidP.h
17	info/libext2fs.info.gz	23	info/libext2fs.info.gz
18	lib/libe2p.a	24	lib/libe2p.a
19	lib/libe2p.so	25	lib/libe2p.so
Lines 35-41 Link Here
35	sbin/fsck.ext3	41	sbin/fsck.ext3
36	sbin/mke2fs	42	sbin/mke2fs
37	sbin/mkfs.ext2	43	sbin/mkfs.ext2
		44	sbin/mkfs.ext3
38	sbin/mklost+found	45	sbin/mklost+found
39	sbin/resize2fs	46	sbin/resize2fs
40	sbin/tune2fs	47	sbin/tune2fs
		48	@dirrm include/uuid
41	@dirrm include/ext2fs	49	@dirrm include/ext2fs