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

(-)/usr/home/emma/ports/sysutils/e2fsprogs/Makefile (-4 / +4 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	e2fsprogs
8
PORTNAME=	e2fsprogs
9
PORTVERSION=	1.41.0
9
PORTVERSION=	1.41.1
10
PORTREVISION?=	0
10
PORTREVISION?=	0
11
CATEGORIES?=	sysutils
11
CATEGORIES?=	sysutils
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
Lines 43-48 Link Here
43
		${WRKSRC}/${CONFIGURE_SCRIPT}
43
		${WRKSRC}/${CONFIGURE_SCRIPT}
44
.endif
44
.endif
45
45
46
PKGDEINSTALL=	${PKGINSTALL}
47
46
.include <bsd.port.pre.mk>
48
.include <bsd.port.pre.mk>
47
49
48
.if defined(WITHOUT_NLS)
50
.if defined(WITHOUT_NLS)
Lines 107-115 Link Here
107
	${LN} ${PREFIX}/sbin/e2fsck /sbin/ 2>/dev/null || \
109
	${LN} ${PREFIX}/sbin/e2fsck /sbin/ 2>/dev/null || \
108
		${INSTALL_PROGRAM} ${PREFIX}/sbin/e2fsck /sbin/
110
		${INSTALL_PROGRAM} ${PREFIX}/sbin/e2fsck /sbin/
109
	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${PREFIX}/man/man8/
111
	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${PREFIX}/man/man8/
110
	[ -f ${PREFIX}/etc/mke2fs.conf ] || \
112
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
111
		${CP} -p ${PREFIX}/etc/mke2fs.conf.dist \
112
			${PREFIX}/etc/mke2fs.conf
113
	@${ECHO_MSG} ; ${CAT} ${PKGMESSAGE} ; ${ECHO_MSG}
113
	@${ECHO_MSG} ; ${CAT} ${PKGMESSAGE} ; ${ECHO_MSG}
114
.endif
114
.endif
115
115
(-)/usr/home/emma/ports/sysutils/e2fsprogs/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (e2fsprogs-1.41.0.tar.gz) = 83144fa7e0e63647f920b77650ea1836
1
MD5 (e2fsprogs-1.41.1.tar.gz) = ddf13b3c9ece247c457db20ca9a10c3c
2
SHA256 (e2fsprogs-1.41.0.tar.gz) = db02fb36dae963eda7e8d8c11d1e178e5992f53893c5f0e76493d412758a1675
2
SHA256 (e2fsprogs-1.41.1.tar.gz) = 4b0fb1fdceea52dabdb7f9aadd34febe5a4bb229d2ac8ff97229d0d349c118e4
3
SIZE (e2fsprogs-1.41.0.tar.gz) = 4260246
3
SIZE (e2fsprogs-1.41.1.tar.gz) = 4352631
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c (+9 lines)
Lines 1-5 Link Here
1
--- a/e2fsck/unix.c.orig	2008-04-23 20:56:25.000000000 +0200
1
--- a/e2fsck/unix.c.orig	2008-04-23 20:56:25.000000000 +0200
2
+++ b/e2fsck/unix.c	2008-04-29 09:05:01.000000000 +0200
2
+++ b/e2fsck/unix.c	2008-04-29 09:05:01.000000000 +0200
3
@@ -9,8 +9,6 @@
4
  * %End-Header%
5
  */
6
 
7
-#define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */
8
-
9
 #include <stdio.h>
10
 #ifdef HAVE_STDLIB_H
11
 #include <stdlib.h>
3
@@ -462,6 +462,24 @@
12
@@ -462,6 +462,24 @@
4
 	return 0;
13
 	return 0;
5
 }
14
 }
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_tdb.c (+10 lines)
Line 0 Link Here
1
--- a/lib/ext2fs/tdb.c.orig	2008-09-16 01:55:27.000000000 +0200
2
+++ b/lib/ext2fs/tdb.c	2008-09-16 01:55:34.000000000 +0200
3
@@ -36,7 +36,6 @@
4
 #define HAVE_UTIME_H
5
 #define HAVE_UTIME
6
 #endif
7
-#define _XOPEN_SOURCE 600
8
 
9
 #include <unistd.h>
10
 #include <stdio.h>
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in (-8 / +35 lines)
Lines 1-5 Link Here
1
--- a/misc/Makefile.in.orig	2008-06-18 05:53:42.000000000 +0200
1
--- a/misc/Makefile.in.orig	2008-08-25 06:19:56.000000000 +0200
2
+++ b/misc/Makefile.in	2008-07-13 12:55:25.000000000 +0200
2
+++ b/misc/Makefile.in	2008-09-16 01:40:51.000000000 +0200
3
@@ -19,14 +19,14 @@
3
@@ -19,14 +19,14 @@
4
 
4
 
5
 SPROGS=		mke2fs badblocks tune2fs dumpe2fs blkid logsave \
5
 SPROGS=		mke2fs badblocks tune2fs dumpe2fs blkid logsave \
Lines 19-34 Link Here
19
 
19
 
20
 LPROGS=		@E2INITRD_PROG@
20
 LPROGS=		@E2INITRD_PROG@
21
 
21
 
22
@@ -337,11 +337,9 @@
22
@@ -343,35 +343,10 @@
23
 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
23
 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
24
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
24
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
25
 	done
25
 	done
26
-	@if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
26
-	@if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
27
 		echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
27
-		if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
28
 		$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
28
-			$(srcdir)/mke2fs.conf; then \
29
-			true; \
30
-		else \
31
-			if grep -q ext4dev $(DESTDIR)$(root_sysconfdir)/mke2fs.conf ; then \
32
-				echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \
33
-				$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
34
-					$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new; \
35
-				echo "Warning: installing mke2fs.conf in $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \
36
-				echo "Check to see if you need to update your $(root_sysconfdir)/mke2fs.conf"; \
37
-			else \
38
-				echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
39
-				mv $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
40
-				   $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old; \
41
-				$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
42
-					$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
43
-				echo "Your mke2fs.conf is too old.  Backing up old version in"; \
44
-				echo "$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old.  Please check to see"; \
45
-				echo "if you have any local customizations that you wish to preserve."; \
46
-			fi; \
47
-			echo " "; \
48
-		fi; \
49
-	else \
50
-		echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
51
-		$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
29
-			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
52
-			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
30
-	fi
53
-	fi
31
+			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist; \
54
-
32
 
55
+	echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
56
+  	$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
57
+		$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist
58
+ 
33
 install-strip: install
59
 install-strip: install
34
 	@for i in $(SPROGS); do \
60
 	@for i in $(SPROGS); do \
61
 		echo "	STRIP $(root_sbindir)/$$i"; \
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-tdb.c (-10 lines)
Lines 1-10 Link Here
1
--- a/lib/ext2fs/tdb.c.orig	Thu Apr  5 02:43:05 2007
2
+++ b/lib/ext2fs/tdb.c	Sat Jun 30 16:13:15 2007
3
@@ -36,7 +36,6 @@
4
 #define HAVE_UTIME_H
5
 #define HAVE_UTIME
6
 #endif
7
-#define _XOPEN_SOURCE 500
8
 
9
 #include <unistd.h>
10
 #include <stdio.h>
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-tests-md5sum (-12 / +12 lines)
Lines 1-43 Link Here
1
--- a/tests/u_mke2fs/script.orig	2008-06-18 05:53:42.000000000 +0200
1
--- a/tests/u_mke2fs/script.orig	2008-08-25 06:19:56.000000000 +0200
2
+++ b/tests/u_mke2fs/script	2008-07-13 13:31:23.000000000 +0200
2
+++ b/tests/u_mke2fs/script	2008-09-16 01:45:10.000000000 +0200
3
@@ -10,16 +10,16 @@
3
@@ -11,16 +11,16 @@
4
 
4
 
5
 echo mke2fs -q -F -o Linux -b 1024 test.img  > $OUT
5
 echo mke2fs -q -F -o Linux -b 1024 test.img  > $OUT
6
 $MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
6
 $MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
7
-md5=$(md5sum $TMPFILE | cut -d " " -f 1)
7
-md5=`md5sum $TMPFILE | cut -d " " -f 1`
8
+md5=$(md5 -q $TMPFILE)
8
+md5=$(md5 -q $TMPFILE)
9
 echo md5sum before mke2fs $md5 >> $OUT
9
 echo md5sum before mke2fs $md5 >> $OUT
10
 
10
 
11
 echo using mke2fs to test e2undo >> $OUT
11
 echo using mke2fs to test e2undo >> $OUT
12
 $MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE  >> $OUT 2>&1
12
 $MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE  >> $OUT 2>&1
13
-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
13
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
14
+new_md5=$(md5 -q $TMPFILE)
14
+new_md5=$(md5 -q $TMPFILE)
15
 echo md5sum after mke2fs $new_md5 >> $OUT
15
 echo md5sum after mke2fs $new_md5 >> $OUT
16
 
16
 
17
 $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
17
 $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
18
-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
18
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
19
+new_md5=$(md5 -q $TMPFILE)
19
+new_md5=$(md5 -q $TMPFILE)
20
 echo md5sum after e2undo $new_md5 >> $OUT
20
 echo md5sum after e2undo $new_md5 >> $OUT
21
 
21
 
22
 if [ $md5 = $new_md5 ]; then
22
 if [ $md5 = $new_md5 ]; then
23
--- a/tests/u_tune2fs/script.orig	2008-06-18 05:53:42.000000000 +0200
23
--- a/tests/u_tune2fs/script.orig	2008-08-25 06:19:56.000000000 +0200
24
+++ b/tests/u_tune2fs/script	2008-07-13 13:32:10.000000000 +0200
24
+++ b/tests/u_tune2fs/script	2008-09-16 01:46:32.000000000 +0200
25
@@ -10,16 +10,16 @@
25
@@ -11,16 +11,16 @@
26
 
26
 
27
 echo mke2fs -q -F -o Linux -b 1024 $TMPFILE  > $OUT
27
 echo mke2fs -q -F -o Linux -b 1024 $TMPFILE  > $OUT
28
 $MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
28
 $MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
29
-md5=$(md5sum $TMPFILE | cut -d " " -f 1)
29
-md5=`md5sum $TMPFILE | cut -d " " -f 1`
30
+md5=$(md5 -q $TMPFILE)
30
+md5=$(md5 -q $TMPFILE)
31
 echo md5sum before tune2fs $md5 >> $OUT
31
 echo md5sum before tune2fs $md5 >> $OUT
32
 
32
 
33
 echo using tune2fs to test e2undo >> $OUT
33
 echo using tune2fs to test e2undo >> $OUT
34
 $TUNE2FS -I 256 $TMPFILE  >> $OUT 2>&1
34
 $TUNE2FS -I 256 $TMPFILE  >> $OUT 2>&1
35
-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
35
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
36
+new_md5=$(md5 -q $TMPFILE)
36
+new_md5=$(md5 -q $TMPFILE)
37
 echo md5sum after tune2fs $new_md5 >> $OUT
37
 echo md5sum after tune2fs $new_md5 >> $OUT
38
 
38
 
39
 $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
39
 $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
40
-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
40
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
41
+new_md5=$(md5 -q $TMPFILE)
41
+new_md5=$(md5 -q $TMPFILE)
42
 echo md5sum after e2undo $new_md5 >> $OUT
42
 echo md5sum after e2undo $new_md5 >> $OUT
43
 
43
 
(-)/usr/home/emma/ports/sysutils/e2fsprogs/pkg-install (+57 lines)
Line 0 Link Here
1
#!/bin/sh
2
set -e
3
4
PKGNAME="$1"
5
MODE="$2" # PRE-INSTALL, POST-INSTALL, DEINSTALL, POST-DEINSTALL
6
7
case "$MODE" in
8
POST-INSTALL)
9
	if test -f ${PKG_PREFIX}/etc/mke2fs.conf; then
10
		if cmp -s ${PKG_PREFIX}/etc/mke2fs.conf.dist \
11
						${PKG_PREFIX}/etc/mke2fs.conf; then
12
			true
13
		else
14
			if grep -q ext4dev ${PKG_PREFIX}/etc/mke2fs.conf ; then
15
				cp -f -p ${PKG_PREFIX}/etc/mke2fs.conf.dist \
16
					${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-new
17
				echo "==========================================================================="
18
				echo "Warning: installing mke2fs.conf in ${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-new"
19
				echo "Check to see if you need to update your ${PKG_PREFIX}/etc/mke2fs.conf"
20
				echo "==========================================================================="
21
			else
22
				mv ${PKG_PREFIX}/etc/mke2fs.conf \
23
				   ${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-old
24
				cp -f -p ${PKG_PREFIX}/etc/mke2fs.conf.dist \
25
					${PKG_PREFIX}/etc/mke2fs.conf
26
				echo "==========================================================================="
27
				echo "Your mke2fs.conf is too old.  Backing up old version in"
28
				echo "${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-old.  Please check to see"
29
				echo "if you have any local customizations that you wish to preserve."
30
				echo "==========================================================================="
31
			fi
32
			echo " "
33
		fi
34
	else
35
		cp -f -p ${PKG_PREFIX}/etc/mke2fs.conf.dist \
36
			${PKG_PREFIX}/etc/mke2fs.conf
37
	fi
38
	;;
39
DEINSTALL)
40
	if cmp -s ${PKG_PREFIX}/etc/mke2fs.conf \
41
		${PKG_PREFIX}/etc/mke2fs.conf.dist
42
	then
43
		rm -f ${PKG_PREFIX}/etc/mke2fs.conf
44
	else
45
		echo "If and only if you are deleting e2fsprogs forever,"
46
		echo "remember to delete ${PKG_PREFIX}/etc/mke2fs.conf."
47
	fi
48
	if test -f ${PKG_PREFIX}/etc/e2fsck.conf
49
	then
50
		echo "If and only if you are deleting e2fsprogs forever,"
51
		echo "remember to delete ${PKG_PREFIX}/etc/e2fsck.conf."
52
	fi
53
	;;
54
PRE-INSTALL|POST-DEINSTALL)
55
	true
56
	;;
57
esac
(-)/usr/home/emma/ports/sysutils/e2fsprogs/pkg-message (-2 lines)
Lines 1-7 Link Here
1
===========================================================================
1
===========================================================================
2
3
Note: this is a modified version of the e2fsprogs package, not the official
2
Note: this is a modified version of the e2fsprogs package, not the official
4
package. Report all building and run-time trouble that originates in the
3
package. Report all building and run-time trouble that originates in the
5
package to the port maintainer, <matthias.andree@gmx.de>.
4
package to the port maintainer, <matthias.andree@gmx.de>.
6
7
===========================================================================
5
===========================================================================
(-)/usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist (-4 / +2 lines)
Lines 1-9 Link Here
1
bin/chattr
1
bin/chattr
2
bin/lsattr
2
bin/lsattr
3
@unexec if cmp -s %D/etc/mke2fs.conf %D/etc/mke2fs.conf.dist ; then rm -f %D/etc/mke2fs.conf ; else echo "If and only if you are deleting e2fsprogs forever," ; echo "remember to delete %D/etc/mke2fs.conf." ; fi
4
@unexec if test -f %D/etc/e2fsck.conf ; then echo "If and only if you are deleting e2fsprogs forever," ; echo "remember to delete %D/etc/e2fsck.conf, too." ; fi
5
etc/mke2fs.conf.dist
3
etc/mke2fs.conf.dist
6
@exec test -f %D/etc/mke2fs.conf || cp -p %D/etc/mke2fs.conf.dist %D/etc/mke2fs.conf
7
sbin/badblocks
4
sbin/badblocks
8
sbin/blkid
5
sbin/blkid
9
sbin/debugfs
6
sbin/debugfs
Lines 35-44 Link Here
35
%%NLS%%share/locale/de/LC_MESSAGES/e2fsprogs.mo
32
%%NLS%%share/locale/de/LC_MESSAGES/e2fsprogs.mo
36
%%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo
33
%%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo
37
%%NLS%%share/locale/fr/LC_MESSAGES/e2fsprogs.mo
34
%%NLS%%share/locale/fr/LC_MESSAGES/e2fsprogs.mo
35
%%NLS%%share/locale/id/LC_MESSAGES/e2fsprogs.mo
38
%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo
36
%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo
39
%%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo
37
%%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo
40
%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
38
%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
41
%%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
39
%%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
42
%%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
40
%%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
43
%%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo
41
%%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo
44
%%NLS%%@unexec for i in ca cs de es fr it nl pl sv tr vi ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done
42
%%NLS%%@unexec for i in ca cs de es fr id it nl pl sv tr vi ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done

Return to bug 127414