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

(-)/usr/home/emma/ports/sysutils/e2fsprogs/Makefile (-10 / +27 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	e2fsprogs
8
PORTNAME=	e2fsprogs
9
PORTVERSION=	1.40.5
9
PORTVERSION=	1.40.6
10
PORTREVISION?=	1
10
PORTREVISION?=	0
11
CATEGORIES?=	sysutils
11
CATEGORIES?=	sysutils
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 40-46 Link Here
40
	findfs.8 blkid.8 logsave.8 fsck_ext2fs.8
40
	findfs.8 blkid.8 logsave.8 fsck_ext2fs.8
41
41
42
post-extract:
42
post-extract:
43
	${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \
43
	@${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \
44
		${WRKSRC}/${CONFIGURE_SCRIPT}
44
		${WRKSRC}/${CONFIGURE_SCRIPT}
45
.endif
45
.endif
46
46
Lines 51-77 Link Here
51
PLIST_SUB=	NLS="@comment "
51
PLIST_SUB=	NLS="@comment "
52
.else
52
.else
53
USE_GETTEXT=	yes
53
USE_GETTEXT=	yes
54
# We need to make sure that anything that is outside the root file
55
# system is statically linked, else we're in trouble if e2fsck is needed
56
# for boot:
54
MAKE_ARGS+=	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
57
MAKE_ARGS+=	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
55
		../lib/libblkid.a  ../lib/libuuid.a \
58
		../lib/libblkid.a  ../lib/libuuid.a" \
56
		${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
59
		LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
57
PLIST_SUB=	NLS=""
60
PLIST_SUB=	NLS=""
58
.endif
61
.endif
59
62
60
post-patch::
63
post-patch::
61
	${REINPLACE_CMD} -E -e \
64
	@${REINPLACE_CMD} -E -e \
62
		's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
65
		's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
63
		${WRKSRC}/lib/*/Makefile.in
66
		${WRKSRC}/lib/*/Makefile.in
64
	@: # don't build/install libext2fs.info
67
# don't build/install libext2fs.info
65
	${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in
68
	@${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in
66
69
67
.if ${MASTERDIR} == ${.CURDIR}
70
.if ${MASTERDIR} == ${.CURDIR}
68
post-build:
71
post-build:
72
# Avoid a regression from 1.40.5,
73
# check that e2fsck isn't dynalinked against anything but libc.so:
74
	@${ECHO_CMD} -n "===>  checking that e2fsck depends on no shared objects beyond libc.so: "
75
	@a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \
76
	    | ${GREP} -v 'not a dynamic executable' \
77
	    | ${GREP} '=>' \
78
	    | ${AWK}  '{print $$3;}' \
79
	    | ${GREP} -v '^/lib/libc\.so\.' || :)"; \
80
	if test "x$$a" = "x" ; then echo 'PASS' ; else \
81
	    echo 'FAIL' ; echo '===>  e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
82
# Update translation binary files
69
.if !defined(WITHOUT_NLS)
83
.if !defined(WITHOUT_NLS)
70
	cd ${WRKSRC}/po && ${MAKE} update-gmo
84
	cd ${WRKSRC}/po && ${MAKE} update-gmo
71
.endif
85
.endif
72
	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s -static ${LIBS} \
86
# Build fsck(8) wrapper
87
	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \
73
		-o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
88
		-o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
74
	cd ${WRKSRC}/tests && ${MAKE} check
75
# While the ${MAKE} check can take a minute on an end user's system, the
89
# While the ${MAKE} check can take a minute on an end user's system, the
76
# correctness of tools such as e2fsck is critical to the health of the
90
# correctness of tools such as e2fsck is critical to the health of the
77
# file systems.  The upstream is not using any *BSD as his development
91
# file systems.  The upstream is not using any *BSD as his development
Lines 79-84 Link Here
79
# test on each and every system and not just package building hosts.
93
# test on each and every system and not just package building hosts.
80
# There have been subtle failures induced by Linux-isms in the past.
94
# There have been subtle failures induced by Linux-isms in the past.
81
# -- Matthias Andree, package maintainer, 2007-09-18
95
# -- Matthias Andree, package maintainer, 2007-09-18
96
	@${ECHO_CMD} '===>  Running e2fsprogs self-test suite'
97
	cd ${WRKSRC}/tests && ${MAKE} check \
98
	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
82
99
83
post-install:
100
post-install:
84
	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
101
	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
(-)/usr/home/emma/ports/sysutils/e2fsprogs/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (e2fsprogs-1.40.5.tar.gz) = 69e55eaf543acfab8e2eb8ba2883d8cd
1
MD5 (e2fsprogs-1.40.6.tar.gz) = d219b7be4f7170400c646f5611c0b702
2
SHA256 (e2fsprogs-1.40.5.tar.gz) = 11df6d84e0eb0da17938d4802d7872657b464c9a53ed21b0521c929d481d8ac4
2
SHA256 (e2fsprogs-1.40.6.tar.gz) = b5fb67fb6b4f85fdf3256b1c2f9d9473e018d4fd5af0c50b1030ad794160c11e
3
SIZE (e2fsprogs-1.40.5.tar.gz) = 4048882
3
SIZE (e2fsprogs-1.40.6.tar.gz) = 4072124
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- e2fsprogs-1.35/e2fsck/unix.c~	Sun Dec  7 18:11:38 2003
1
--- e2fsprogs-1.35/e2fsck/unix.c~	Sun Dec  7 18:11:38 2003
2
+++ e2fsprogs-1.35/e2fsck/unix.c	Tue Feb 24 22:13:52 2004
2
+++ e2fsprogs-1.35/e2fsck/unix.c	Tue Feb 24 22:13:52 2004
3
@@ -416,6 +416,24 @@
3
@@ -461,6 +461,24 @@
4
 	return 0;
4
 	return 0;
5
 }
5
 }
6
 
6
 
Lines 25-31 Link Here
25
 #define PATH_SET "PATH=/sbin"
25
 #define PATH_SET "PATH=/sbin"
26
 
26
 
27
 static void reserve_stdio_fds(void)
27
 static void reserve_stdio_fds(void)
28
@@ -448,6 +466,17 @@
28
@@ -493,6 +511,17 @@
29
 	ctx->progress_fd = 0;
29
 	ctx->progress_fd = 0;
30
 }
30
 }
31
 
31
 
Lines 43-49 Link Here
43
 static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
43
 static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
44
 {
44
 {
45
 	e2fsck_t ctx = e2fsck_global_ctx;
45
 	e2fsck_t ctx = e2fsck_global_ctx;
46
@@ -740,6 +769,8 @@
46
@@ -825,6 +854,8 @@
47
 	sigaction(SIGUSR1, &sa, 0);
47
 	sigaction(SIGUSR1, &sa, 0);
48
 	sa.sa_handler = signal_progress_off;
48
 	sa.sa_handler = signal_progress_off;
49
 	sigaction(SIGUSR2, &sa, 0);
49
 	sigaction(SIGUSR2, &sa, 0);
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure (-2 / +2 lines)
Lines 1-6 Link Here
1
--- a/configure.orig	Thu Jun  8 15:30:16 2006
1
--- a/configure.orig	Thu Jun  8 15:30:16 2006
2
+++ b/configure	Thu Jun  8 15:30:34 2006
2
+++ b/configure	Thu Jun  8 15:30:34 2006
3
@@ -8095,7 +8095,7 @@
3
@@ -9044,7 +9044,7 @@
4
 
4
 
5
 
5
 
6
 
6
 
Lines 9-15 Link Here
9
 stdlib.h string.h unistd.h sys/param.h
9
 stdlib.h string.h unistd.h sys/param.h
10
 do
10
 do
11
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
11
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12
@@ -16641,7 +16641,7 @@
12
@@ -15105,7 +15105,7 @@
13
 fi
13
 fi
14
 { echo "$as_me:$LINENO: checking for unified diff option" >&5
14
 { echo "$as_me:$LINENO: checking for unified diff option" >&5
15
 echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
15
 echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h (-1 / +1 lines)
Lines 1-6 Link Here
1
--- a/lib/ext2fs/ext2_fs.h.orig	Sat Jun 30 16:36:37 2007
1
--- a/lib/ext2fs/ext2_fs.h.orig	Sat Jun 30 16:36:37 2007
2
+++ b/lib/ext2fs/ext2_fs.h	Sat Jun 30 16:36:43 2007
2
+++ b/lib/ext2fs/ext2_fs.h	Sat Jun 30 16:36:43 2007
3
@@ -414,7 +414,7 @@
3
@@ -418,7 +418,7 @@
4
 
4
 
5
 #define i_size_high	i_dir_acl
5
 #define i_size_high	i_dir_acl
6
 
6
 
(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in (-11 / +1 lines)
Lines 19-35 Link Here
19
 
19
 
20
 LPROGS=		@E2INITRD_PROG@
20
 LPROGS=		@E2INITRD_PROG@
21
 
21
 
22
@@ -251,8 +251,7 @@
22
@@ -311,11 +310,9 @@
23
 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
24
 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
25
 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
26
-		$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir) \
27
-		$(DESTDIR)/etc/init.d
28
+		$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
29
 
30
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
31
 	@for i in $(SPROGS); do \
32
@@ -312,11 +311,9 @@
33
 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
23
 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
34
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
24
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
35
 	done
25
 	done

Return to bug 120500