Attachment 97982 Details for Bug 136795 – file.diff

[patch] file.diff

file.diff (text/plain), 8.58 KB, created by Matthias Andree on 2009-07-15 16:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2009-07-15 16:20:00 UTC

Size: 8.58 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/emma/ports/sysutils/e2fsprogs/Makefile
>--- /usr/ports/sysutils/e2fsprogs/Makefile	2009-04-26 00:25:12.000000000 +0200
>+++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile	2009-07-15 16:26:55.000000000 +0200
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	e2fsprogs
>-PORTVERSION=	1.41.5
>+PORTVERSION=	1.41.8
> PORTREVISION?=	0
> CATEGORIES?=	sysutils
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
>@@ -46,7 +46,7 @@
> 
> PKGDEINSTALL=	${PKGINSTALL}
> 
>-MAKE_JOBS=SAFE=	yes
>+MAKE_JOBS_SAFE=	yes
> 
> .include <bsd.port.pre.mk>
> 
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/emma/ports/sysutils/e2fsprogs/distinfo
>--- /usr/ports/sysutils/e2fsprogs/distinfo	2009-04-26 00:25:12.000000000 +0200
>+++ /usr/home/emma/ports/sysutils/e2fsprogs/distinfo	2009-07-15 15:36:25.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (e2fsprogs-1.41.5.tar.gz) = e218df6c84fc17c1126d31de9472a76c
>-SHA256 (e2fsprogs-1.41.5.tar.gz) = b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198
>-SIZE (e2fsprogs-1.41.5.tar.gz) = 4415819
>+MD5 (e2fsprogs-1.41.8.tar.gz) = 6708cc8e484809fc5cfb232882e48489
>+SHA256 (e2fsprogs-1.41.8.tar.gz) = 782c9f281ca970d176c61759465beec12b40c7793bb5fa52c8d9a61741e33801
>+SIZE (e2fsprogs-1.41.8.tar.gz) = 4436913
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-configure /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure
>--- /usr/ports/sysutils/e2fsprogs/files/patch-configure	2008-04-29 13:09:27.000000000 +0200
>+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure	2009-07-15 16:19:07.000000000 +0200
>@@ -9,3 +9,12 @@
>  stdlib.h string.h unistd.h sys/param.h
>  do
>  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>+@@ -16592,7 +16592,7 @@
>+ 	lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
>+ 	misc/Makefile ext2ed/Makefile e2fsck/Makefile \
>+ 	debugfs/Makefile tests/Makefile tests/progs/Makefile \
>+-	resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
>++	resize/Makefile doc/Makefile intl/Makefile intl/libgnuintl.h po/Makefile.in ; do
>+ 	if test -d `dirname ${srcdir}/$i` ; then
>+ 		outlist="$outlist $i"
>+ 	fi
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in
>--- /usr/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in	2009-07-15 16:37:10.000000000 +0200
>@@ -0,0 +1,25 @@
>+--- ./intl/Makefile.in.orig	2009-07-02 04:46:40.000000000 +0200
>++++ ./intl/Makefile.in	2009-07-15 16:36:29.000000000 +0200
>+@@ -43,6 +43,22 @@
>+ MKINSTALLDIRS = @MKINSTALLDIRS@
>+ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
>+ 
>++@SET_MAKE@
>++
>++@ifGNUmake@ V =
>++@ifGNUmake@ ifeq ($(strip $(V)),)
>++@ifGNUmake@ #  E = @echo
>++@ifGNUmake@ #  Q = @
>++@ifGNUmake@    E = @E@
>++@ifGNUmake@    Q = @Q@
>++@ifGNUmake@ else
>++@ifGNUmake@    E = @\#
>++@ifGNUmake@    Q =
>++@ifGNUmake@ endif
>++
>++@ifNotGNUmake@ E = @E@
>++@ifNotGNUmake@ Q = @Q@
>++
>+ l = @INTL_LIBTOOL_SUFFIX_PREFIX@
>+ 
>+ AR = ar
>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	2009-04-26 00:25:12.000000000 +0200
>+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in	2009-07-15 15:57:48.000000000 +0200
>@@ -1,5 +1,5 @@
>---- a/misc/Makefile.in.orig	2009-04-22 14:59:33.000000000 +0200
>-+++ b/misc/Makefile.in	2009-04-24 09:47:25.000000000 +0200
>+--- a/misc/Makefile.in.orig	2009-07-11 21:25:17.000000000 +0200
>++++ b/misc/Makefile.in	2009-07-15 15:56:29.000000000 +0200
> @@ -25,14 +25,14 @@
>  
>  SPROGS=		mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
>@@ -12,18 +12,18 @@
> +			logsave.8 e2undo.8 @FSCK_MAN@
>  FMANPAGES=	mke2fs.conf.5
>  
>--UPROGS=		chattr lsattr uuidgen
>--UMANPAGES=	chattr.1 lsattr.1 uuidgen.1
>+-UPROGS=		chattr lsattr @UUID_CMT@ uuidgen
>+-UMANPAGES=	chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
> +UPROGS=		chattr lsattr
> +UMANPAGES=	chattr.1 lsattr.1
>  
>  LPROGS=		@E2INITRD_PROG@
>  
>-@@ -456,35 +456,10 @@
>+@@ -457,34 +457,9 @@
>  		echo "	INSTALL_DATA $(man5dir)/$$i"; \
>  		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
>  	done
>--	@if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
>+-	$(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
> -		if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
> -			$(srcdir)/mke2fs.conf; then \
> -			true; \
>@@ -48,14 +48,11 @@
> -		fi; \
> -	else \
> -		echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
>--		$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
>++	$(Q) echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
>+ 		$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
> -			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
> -	fi
>--
>-+	echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
>-+  	$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
>-+		$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist
>-+ 
>++			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist
>+ 
>  install-strip: install
>- 	@for i in $(SPROGS); do \
>- 		echo "	STRIP $(root_sbindir)/$$i"; \
>+ 	$(Q) for i in $(SPROGS); do \
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-uuid-loop /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-uuid-loop
>--- /usr/ports/sysutils/e2fsprogs/files/patch-uuid-loop	2009-05-17 00:36:56.000000000 +0200
>+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-uuid-loop	1970-01-01 01:00:00.000000000 +0100
>@@ -1,109 +0,0 @@
>---- /dev/null
>-+++ b/lib/read_all.h
>-@@ -0,0 +1,32 @@
>-+/*
>-+ * read_all - a read variant that masks EAGAIN and EINTR.
>-+ * This function tries hard to make sure to read the complete requested
>-+ * length, and if it hits EOF while reading, it returns 0.
>-+ *
>-+ * Originally written by Theodore Y. Ts'o.
>-+ * Factored out from misc/uuidd.c and lib/uuid/gen_uuid.c
>-+ * and bugfixed by Matthias Andree, 2009.
>-+ */
>-+
>-+ssize_t read_all(int fd, char *buf, size_t count)
>-+{
>-+	ssize_t ret;
>-+	ssize_t c = 0;
>-+
>-+	memset(buf, 0, count);
>-+	while (count > 0) {
>-+		ret = read(fd, buf, count);
>-+		if (ret == -1) {
>-+			if ((errno == EAGAIN) || (errno == EINTR))
>-+				continue;
>-+			return -1;
>-+		}
>-+		if (ret == 0) {
>-+			return c;
>-+		}
>-+		count -= ret;
>-+		buf += ret;
>-+		c += ret;
>-+	}
>-+	return c;
>-+}
>---- a/lib/uuid/Makefile.in
>-+++ b/lib/uuid/Makefile.in
>-@@ -190,7 +190,7 @@ clear.o: $(srcdir)/clear.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
>- compare.o: $(srcdir)/compare.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
>- copy.o: $(srcdir)/copy.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
>- gen_uuid.o: $(srcdir)/gen_uuid.c $(srcdir)/uuidP.h $(srcdir)/uuid.h \
>-- $(srcdir)/uuidd.h
>-+ $(srcdir)/uuidd.h $(top_srcdir)/lib/read_all.h
>- isnull.o: $(srcdir)/isnull.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
>- pack.o: $(srcdir)/pack.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
>- parse.o: $(srcdir)/parse.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
>---- a/lib/uuid/gen_uuid.c
>-+++ b/lib/uuid/gen_uuid.c
>-@@ -415,25 +415,11 @@ try_again:
>- 	return 0;
>- }
>- 
>--static ssize_t read_all(int fd, char *buf, size_t count)
>--{
>--	ssize_t ret;
>--	ssize_t c = 0;
>--
>--	memset(buf, 0, count);
>--	while (count > 0) {
>--		ret = read(fd, buf, count);
>--		if (ret < 0) {
>--			if ((errno == EAGAIN) || (errno == EINTR))
>--				continue;
>--			return -1;
>--		}
>--		count -= ret;
>--		buf += ret;
>--		c += ret;
>--	}
>--	return c;
>--}
>-+/*
>-+ * Import read_all function and make it static.
>-+ */
>-+static
>-+#include "read_all.h"
>- 
>- /*
>-  * Close all file descriptors
>---- a/misc/uuidd.c
>-+++ b/misc/uuidd.c
>-@@ -85,25 +85,8 @@ static void create_daemon(void)
>- 		die("setreuid");
>- }
>- 
>--static int read_all(int fd, char *buf, size_t count)
>--{
>--	ssize_t ret;
>--	int c = 0;
>--
>--	memset(buf, 0, count);
>--	while (count > 0) {
>--		ret = read(fd, buf, count);
>--		if (ret < 0) {
>--			if ((errno == EAGAIN) || (errno == EINTR))
>--				continue;
>--			return -1;
>--		}
>--		count -= ret;
>--		buf += ret;
>--		c += ret;
>--	}
>--	return c;
>--}
>-+static
>-+#include "read_all.h"
>- 
>- static int write_all(int fd, char *buf, size_t count)
>- {
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-version.h /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-version.h
>--- /usr/ports/sysutils/e2fsprogs/files/patch-version.h	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-version.h	2009-07-15 16:47:34.000000000 +0200
>@@ -0,0 +1,8 @@
>+--- ./version.h~	2009-07-11 23:24:37.000000000 +0200
>++++ ./version.h	2009-07-15 16:47:11.000000000 +0200
>+@@ -8,4 +8,4 @@
>+  */
>+ 
>+ #define E2FSPROGS_VERSION "1.41.8"
>+-#define E2FSPROGS_DATE "11-July-2009"
>++#define E2FSPROGS_DATE "11-Jul-2009"
>--- e2fsprogs-1.41.8.patch ends here ---

Actions: View | Diff

Attachments on bug 136795: 97980 | 97981 | 97982