aboutsummaryrefslogtreecommitdiff
path: root/sysutils/e2fsprogs
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2012-04-01 15:29:03 +0000
committerMatthias Andree <mandree@FreeBSD.org>2012-04-01 15:29:03 +0000
commit42639374015ba806baf761acefe7085cc7dae12d (patch)
treeea61bc8c1c6c588b4f2acb234911634f7c9889d6 /sysutils/e2fsprogs
parent11621dedad062b2ad14c7f00eb23705785d0c5f7 (diff)
Notes
Diffstat (limited to 'sysutils/e2fsprogs')
-rw-r--r--sysutils/e2fsprogs/Makefile6
-rw-r--r--sysutils/e2fsprogs/distinfo4
-rw-r--r--sysutils/e2fsprogs/files/patch-e2fsck__unix.c10
-rw-r--r--sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h6
-rw-r--r--sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c4
-rw-r--r--sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c4
-rw-r--r--sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c4
-rw-r--r--sysutils/e2fsprogs/files/patch-lib_quota_quotaio.c11
-rw-r--r--sysutils/e2fsprogs/files/patch-misc__Makefile.in35
-rw-r--r--sysutils/e2fsprogs/files/patch-tests__test_script.in4
10 files changed, 48 insertions, 40 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index d40ca8d39f24..ad1780801b15 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= e2fsprogs
-PORTVERSION= 1.42
-PORTREVISION?= 1
+PORTVERSION= 1.42.2
+PORTREVISION?= 0
CATEGORIES?= sysutils
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
MAINTAINER?= mandree@FreeBSD.org
COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 3601f4311e91..36f5d4707588 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2fsprogs-1.42.tar.gz) = 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
-SIZE (e2fsprogs-1.42.tar.gz) = 5709827
+SHA256 (e2fsprogs-1.42.2.tar.gz) = 1d36fec5e34ac285f59dff3851d6f4ca9f0b964ddd7e8fe00f1f920b091cb8be
+SIZE (e2fsprogs-1.42.2.tar.gz) = 5753009
diff --git a/sysutils/e2fsprogs/files/patch-e2fsck__unix.c b/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
index 4be5f73ed1b2..ca8da9c0391b 100644
--- a/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
+++ b/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
@@ -1,5 +1,5 @@
---- ./e2fsck/unix.c.orig 2011-11-14 16:55:54.000000000 +0100
-+++ ./e2fsck/unix.c 2012-02-16 00:35:12.000000000 +0100
+--- ./e2fsck/unix.c.orig 2012-03-23 14:15:37.000000000 +0100
++++ ./e2fsck/unix.c 2012-04-01 17:15:48.000000000 +0200
@@ -9,8 +9,6 @@
* %End-Header%
*/
@@ -9,7 +9,7 @@
#include "config.h"
#include <stdio.h>
#ifdef HAVE_STDLIB_H
-@@ -543,6 +541,24 @@
+@@ -560,6 +558,24 @@
return 0;
}
@@ -34,7 +34,7 @@
#define PATH_SET "PATH=/sbin"
/*
-@@ -575,6 +591,17 @@
+@@ -592,6 +608,17 @@
ctx->progress = e2fsck_update_progress;
}
@@ -52,7 +52,7 @@
static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
{
e2fsck_t ctx = e2fsck_global_ctx;
-@@ -932,6 +959,8 @@
+@@ -960,6 +987,8 @@
sigaction(SIGUSR1, &sa, 0);
sa.sa_handler = signal_progress_off;
sigaction(SIGUSR2, &sa, 0);
diff --git a/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h b/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h
index b2e0320fb014..22454282a4c4 100644
--- a/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h
+++ b/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h
@@ -1,6 +1,6 @@
---- ./lib/ext2fs/ext2_fs.h.orig 2011-09-25 07:55:10.000000000 +0200
-+++ ./lib/ext2fs/ext2_fs.h 2012-02-16 00:35:12.000000000 +0100
-@@ -454,7 +454,7 @@
+--- ./lib/ext2fs/ext2_fs.h.orig 2012-03-23 14:15:37.000000000 +0100
++++ ./lib/ext2fs/ext2_fs.h 2012-04-01 17:15:48.000000000 +0200
+@@ -455,7 +455,7 @@
#define i_dir_acl i_size_high
diff --git a/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c b/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c
index 800c818da334..62cfb177ebd7 100644
--- a/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c
+++ b/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c
@@ -1,5 +1,5 @@
---- ./lib/ext2fs/tdb.c.orig 2011-11-29 16:50:04.000000000 +0100
-+++ ./lib/ext2fs/tdb.c 2012-02-16 00:35:12.000000000 +0100
+--- ./lib/ext2fs/tdb.c.orig 2012-03-18 19:18:33.000000000 +0100
++++ ./lib/ext2fs/tdb.c 2012-04-01 17:15:49.000000000 +0200
@@ -36,7 +36,6 @@
#define HAVE_UTIME_H
#define HAVE_UTIME
diff --git a/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c b/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
index 9d250204b166..274585f30f17 100644
--- a/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
+++ b/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
@@ -1,5 +1,5 @@
---- ./lib/ext2fs/tst_bitops.c.orig 2011-09-18 20:06:51.000000000 +0200
-+++ ./lib/ext2fs/tst_bitops.c 2012-02-16 00:35:12.000000000 +0100
+--- ./lib/ext2fs/tst_bitops.c.orig 2012-03-18 19:18:33.000000000 +0100
++++ ./lib/ext2fs/tst_bitops.c 2012-04-01 17:15:49.000000000 +0200
@@ -104,7 +104,7 @@
bigarray = malloc(1 << 29);
if (!bigarray) {
diff --git a/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c b/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
index cc3ec6a7b55c..ef0c3403c1ab 100644
--- a/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
+++ b/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
@@ -1,5 +1,5 @@
---- ./lib/uuid/gen_uuid.c.orig 2011-09-18 20:20:44.000000000 +0200
-+++ ./lib/uuid/gen_uuid.c 2012-02-16 00:35:12.000000000 +0100
+--- ./lib/uuid/gen_uuid.c.orig 2012-03-18 19:18:33.000000000 +0100
++++ ./lib/uuid/gen_uuid.c 2012-04-01 17:15:49.000000000 +0200
@@ -91,6 +91,7 @@
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
diff --git a/sysutils/e2fsprogs/files/patch-lib_quota_quotaio.c b/sysutils/e2fsprogs/files/patch-lib_quota_quotaio.c
deleted file mode 100644
index a8c429a35abb..000000000000
--- a/sysutils/e2fsprogs/files/patch-lib_quota_quotaio.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/quota/quotaio.c~ 2011-11-27 19:22:10.000000000 -0600
-+++ ./lib/quota/quotaio.c 2012-02-16 15:08:31.757648919 -0600
-@@ -143,7 +143,7 @@ errcode_t quota_inode_truncate(ext2_fils
-
- inode.i_dtime = fs->now ? fs->now : time(0);
- if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
-- return;
-+ return err;
-
- ext2fs_block_iterate3(fs, ino, BLOCK_FLAG_READ_ONLY, NULL,
- release_blocks_proc, NULL);--- ./usr/ports/sysutils/e2fsprogs/files/patch-lib_quota_quotaio.c.orig 2012-02-17 22:18:01.000000000 +0100
diff --git a/sysutils/e2fsprogs/files/patch-misc__Makefile.in b/sysutils/e2fsprogs/files/patch-misc__Makefile.in
index 1e70e5d08fac..312ce6244f10 100644
--- a/sysutils/e2fsprogs/files/patch-misc__Makefile.in
+++ b/sysutils/e2fsprogs/files/patch-misc__Makefile.in
@@ -1,5 +1,5 @@
---- ./misc/Makefile.in.orig 2011-09-18 23:14:56.000000000 +0200
-+++ ./misc/Makefile.in 2012-02-16 00:35:12.000000000 +0100
+--- ./misc/Makefile.in.orig 2012-03-27 06:36:20.000000000 +0200
++++ ./misc/Makefile.in 2012-04-01 17:17:10.000000000 +0200
@@ -28,15 +28,15 @@
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
@@ -21,18 +21,36 @@
LPROGS= @E2INITRD_PROG@
-@@ -475,34 +475,9 @@
+@@ -123,14 +123,14 @@
+
+ mke2fs.conf: $(srcdir)/mke2fs.conf.in
+ if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
+- cp $(srcdir)/mke2fs.conf.custom.in mke2fs.conf; \
++ cp $(srcdir)/mke2fs.conf.custom.in mke2fs.conf.dist; \
+ else \
+- cp $(srcdir)/mke2fs.conf.in mke2fs.conf; \
++ cp $(srcdir)/mke2fs.conf.in mke2fs.conf.dist; \
+ fi
+
+ default_profile.c: mke2fs.conf $(srcdir)/profile-to-c.awk
+ $(E) " PROFILE_TO_C mke2fs.conf"
+- $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf \
++ $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf.dist \
+ > default_profile.c
+ profile.o:
+ $(E) " CC $<"
+@@ -482,34 +482,9 @@
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
- $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
- if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
-- $(srcdir)/mke2fs.conf; then \
+- 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 \
+- $(INSTALL_DATA) 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"; \
@@ -40,7 +58,7 @@
- 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 \
+- $(INSTALL_DATA) 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"; \
@@ -50,10 +68,11 @@
- fi; \
- else \
- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
-+ $(Q) echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
- $(INSTALL_DATA) $(srcdir)/mke2fs.conf \
+- $(INSTALL_DATA) mke2fs.conf \
- $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
- fi
++ $(Q) echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
++ $(INSTALL_DATA) mke2fs.conf.dist \
+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist
install-strip: install
diff --git a/sysutils/e2fsprogs/files/patch-tests__test_script.in b/sysutils/e2fsprogs/files/patch-tests__test_script.in
index a4df90f9c2a1..55f6e014fcdf 100644
--- a/sysutils/e2fsprogs/files/patch-tests__test_script.in
+++ b/sysutils/e2fsprogs/files/patch-tests__test_script.in
@@ -1,5 +1,5 @@
---- ./tests/test_script.in.orig 2012-02-16 00:46:56.000000000 +0100
-+++ ./tests/test_script.in 2012-02-16 00:47:07.000000000 +0100
+--- ./tests/test_script.in.orig 2012-03-18 19:18:33.000000000 +0100
++++ ./tests/test_script.in 2012-04-01 17:15:49.000000000 +0200
@@ -39,7 +39,7 @@
. $TEST_CONFIG
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 20:03:22 +0000