Attachment 90277 Details for Bug 127414 – e2fsprogs-1.41.1.patch

[patch] e2fsprogs-1.41.1.patch

e2fsprogs-1.41.1.patch (text/plain), 13.35 KB, created by Matthias Andree on 2008-09-16 01:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2008-09-16 01:40:01 UTC

Size: 13.35 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 127414: 90277