pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/e2fsprogs Update "e2fsprogs" to version 1.40....
details: https://anonhg.NetBSD.org/pkgsrc/rev/bd97762a0c39
branches: trunk
changeset: 539528:bd97762a0c39
user: tron <tron%pkgsrc.org@localhost>
date: Fri Mar 07 22:40:29 2008 +0000
description:
Update "e2fsprogs" to version 1.40.7. Changes since version 1.39:
- a lot of bug fixes
- security fix for CVE-2007-5497
- uuid support
diffstat:
sysutils/e2fsprogs/Makefile | 6 +---
sysutils/e2fsprogs/PLIST | 7 ++++-
sysutils/e2fsprogs/distinfo | 18 +++++++---------
sysutils/e2fsprogs/patches/patch-aa | 33 +++++++++++--------------------
sysutils/e2fsprogs/patches/patch-af | 36 ++++++----------------------------
sysutils/e2fsprogs/patches/patch-al | 23 +++++++++++----------
sysutils/e2fsprogs/patches/patch-aq | 38 -------------------------------------
sysutils/e2fsprogs/patches/patch-as | 25 ++++++-----------------
sysutils/e2fsprogs/patches/patch-au | 24 -----------------------
9 files changed, 53 insertions(+), 157 deletions(-)
diffs (truncated from 302 to 300 lines):
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/Makefile
--- a/sysutils/e2fsprogs/Makefile Fri Mar 07 22:00:43 2008 +0000
+++ b/sysutils/e2fsprogs/Makefile Fri Mar 07 22:40:29 2008 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2007/07/29 16:17:12 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.16 2008/03/07 22:40:29 tron Exp $
-DISTNAME= e2fsprogs-1.39
-PKGREVISION= 1
+DISTNAME= e2fsprogs-1.40.7
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/PLIST
--- a/sysutils/e2fsprogs/PLIST Fri Mar 07 22:00:43 2008 +0000
+++ b/sysutils/e2fsprogs/PLIST Fri Mar 07 22:40:29 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/06/20 19:51:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/03/07 22:40:29 tron Exp $
bin/chattr
bin/lsattr
bin/uuidgen
@@ -28,6 +28,7 @@
man/man8/mklost+found.8
man/man8/resize2fs.8
man/man8/tune2fs.8
+man/man8/uuidd.8
sbin/badblocks
sbin/blkid
sbin/debugfs
@@ -47,7 +48,9 @@
sbin/mklost+found
sbin/resize2fs
sbin/tune2fs
+sbin/uuidd
share/examples/ext2fs/mke2fs.conf
+share/locale/ca/LC_MESSAGES/e2fsprogs.mo
share/locale/cs/LC_MESSAGES/e2fsprogs.mo
share/locale/de/LC_MESSAGES/e2fsprogs.mo
share/locale/es/LC_MESSAGES/e2fsprogs.mo
@@ -55,6 +58,6 @@
share/locale/it/LC_MESSAGES/e2fsprogs.mo
share/locale/nl/LC_MESSAGES/e2fsprogs.mo
share/locale/pl/LC_MESSAGES/e2fsprogs.mo
-share/locale/rw/LC_MESSAGES/e2fsprogs.mo
share/locale/sv/LC_MESSAGES/e2fsprogs.mo
share/locale/tr/LC_MESSAGES/e2fsprogs.mo
+share/locale/vi/LC_MESSAGES/e2fsprogs.mo
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/distinfo
--- a/sysutils/e2fsprogs/distinfo Fri Mar 07 22:00:43 2008 +0000
+++ b/sysutils/e2fsprogs/distinfo Fri Mar 07 22:40:29 2008 +0000
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.13 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: distinfo,v 1.14 2008/03/07 22:40:29 tron Exp $
-SHA1 (e2fsprogs-1.39.tar.gz) = c2dad0c9bd76701eafe3804e2a7d072aa198f046
-RMD160 (e2fsprogs-1.39.tar.gz) = 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b
-Size (e2fsprogs-1.39.tar.gz) = 3695111 bytes
-SHA1 (patch-aa) = 5e7010e1d9280c9ad7b64b89eaa3675cc9262ec7
-SHA1 (patch-af) = 5bc4a9eec2a01154ade21c810ecb26272f3453c6
-SHA1 (patch-al) = 81d3169f156422739659f491ae52a53f932b0799
+SHA1 (e2fsprogs-1.40.7.tar.gz) = 56ff55add64c34bddf9cf15c3825811d230dd8b1
+RMD160 (e2fsprogs-1.40.7.tar.gz) = bfab47555ff31b8ae8d72d2e4de54c099bfc3b18
+Size (e2fsprogs-1.40.7.tar.gz) = 4087067 bytes
+SHA1 (patch-aa) = 446233b75bd23227c5c7d003cce0a19017f3f71b
+SHA1 (patch-af) = c2c8b373fcba36f031005d364c0de2fbae97106f
+SHA1 (patch-al) = e976de195735cf1f96aaceff1b978b1be405dfc9
SHA1 (patch-am) = 05a547a48b02d267e200d6161e982e5cf1226d3b
SHA1 (patch-an) = 0324fe2a0b7a9464f8af401d554e07a0bcfa22e2
SHA1 (patch-ao) = 57c8757cd378a72d728475f26cdf9a452afbf64b
SHA1 (patch-ap) = 175e97acf1a7cfcbd3a18c80ed513f26ac111e13
-SHA1 (patch-aq) = 7289be157b0449a85fc3ec0a8f8a561333719116
SHA1 (patch-ar) = 8a4a7ba5bd51ba8d68e6954c82ac6fd4cdf6153d
-SHA1 (patch-as) = e4a4221c5a870b6e2fa1001d77b01e5bf74dd20d
+SHA1 (patch-as) = e8c444fe4e1e443d1d841dc44ce54d50d31b5994
SHA1 (patch-at) = 80785a73eaa57a4a73bd0a683697ea2f890f8dbc
-SHA1 (patch-au) = 87d7571695d7899323d30eb8acee108f6570c32f
SHA1 (patch-av) = 07f3fbf646e2e9716ea10d55580fa15dd99db01d
SHA1 (patch-aw) = 4f25dc800f6fc3a428f43eba2b9674c7b3256ea6
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/patches/patch-aa
--- a/sysutils/e2fsprogs/patches/patch-aa Fri Mar 07 22:00:43 2008 +0000
+++ b/sysutils/e2fsprogs/patches/patch-aa Fri Mar 07 22:40:29 2008 +0000
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2008/03/07 22:40:29 tron Exp $
---- e2fsck/unix.c.orig 2006-03-19 20:31:06.000000000 -0500
-+++ e2fsck/unix.c
-@@ -173,7 +173,7 @@ static void check_mount(e2fsck_t ctx)
- retval = ext2fs_check_if_mounted(ctx->filesystem_name,
- &ctx->mount_flags);
- if (retval) {
-- com_err("ext2fs_check_if_mount", retval,
-+ com_err("ext2fs_check_if_mounted", retval,
- _("while determining whether %s is mounted."),
- ctx->filesystem_name);
- return;
-@@ -568,7 +568,7 @@ static void syntax_err_report(const char
- exit(FSCK_ERROR);
- }
-
--static const char *config_fn[] = { "/etc/e2fsck.conf", 0 };
-+static const char *config_fn[] = { ETC_DIR "/e2fsck.conf", 0 };
-
- static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
- {
+--- configure.orig 2008-02-28 23:03:53.000000000 +0000
++++ configure 2008-03-07 20:24:01.000000000 +0000
+@@ -15107,7 +15107,7 @@
+ fi
+ { echo "$as_me:$LINENO: checking for unified diff option" >&5
+ echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
+-if diff -u $0 $0 >& /dev/null ; then
++if diff -u $0 $0 /dev/null 2>&1; then
+ UNI_DIFF_OPTS=-u
+ else
+ UNI_DIFF_OPTS=-c
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/patches/patch-af
--- a/sysutils/e2fsprogs/patches/patch-af Fri Mar 07 22:00:43 2008 +0000
+++ b/sysutils/e2fsprogs/patches/patch-af Fri Mar 07 22:40:29 2008 +0000
@@ -1,39 +1,17 @@
-$NetBSD: patch-af,v 1.5 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: patch-af,v 1.6 2008/03/07 22:40:29 tron Exp $
---- lib/ext2fs/ismounted.c.orig 2005-09-06 05:40:14.000000000 -0400
-+++ lib/ext2fs/ismounted.c
-@@ -29,7 +29,11 @@
- #include <sys/mount.h>
- #endif /* HAVE_GETMNTINFO */
- #include <string.h>
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
-+#include <sys/statvfs.h>
-+#else
- #include <sys/stat.h>
-+#endif
-
- #include "ext2_fs.h"
- #include "ext2fs.h"
-@@ -196,7 +200,11 @@ static errcode_t check_mntent(const char
+--- lib/ext2fs/ismounted.c.orig 2008-02-28 23:03:53.000000000 +0000
++++ lib/ext2fs/ismounted.c 2008-03-07 21:08:08.000000000 +0000
+@@ -196,7 +196,11 @@
static errcode_t check_getmntinfo(const char *file, int *mount_flags,
char *mtpt, int mtlen)
{
+- struct statfs *mp;
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
-+ struct statvfs *mp;
++ struct statvfs *mp;
+#else
- struct statfs *mp;
++ struct statfs *mp;
+#endif
int len, n;
const char *s1;
char *s2;
-@@ -325,9 +333,9 @@ errcode_t ext2fs_check_mount_point(const
- *mount_flags |= EXT2_MF_BUSY;
- } else
- close(fd);
-+#endif
-
- return 0;
--#endif
- }
-
- /*
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/patches/patch-al
--- a/sysutils/e2fsprogs/patches/patch-al Fri Mar 07 22:00:43 2008 +0000
+++ b/sysutils/e2fsprogs/patches/patch-al Fri Mar 07 22:40:29 2008 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-al,v 1.1 2007/06/20 19:51:09 jlam Exp $
+$NetBSD: patch-al,v 1.2 2008/03/07 22:40:29 tron Exp $
---- MCONFIG.in.orig 2006-03-22 20:19:19.000000000 -0500
-+++ MCONFIG.in
-@@ -33,7 +33,7 @@ datadir = @datadir@
+--- debugfs/util.c.orig 2008-02-28 23:03:53.000000000 +0000
++++ debugfs/util.c 2008-03-07 21:11:18.000000000 +0000
+@@ -6,7 +6,8 @@
+ *
+ */
- CC = @CC@
- BUILD_CC = @BUILD_CC@
--DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-+DEFS = -DLOCALEDIR=\"$(localedir)\" -DETC_DIR=\"$(root_sysconfdir)\" @DEFS@
- CFLAGS = @CFLAGS@
- CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
- INTL_FLAGS = @INTL_FLAGS@
+-#define _XOPEN_SOURCE /* needed for strptime */
++
++#define _XOPEN_SOURCE 500 /* needed for strptime */
+
+ #include <stdio.h>
+ #include <unistd.h>
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/patches/patch-aq
--- a/sysutils/e2fsprogs/patches/patch-aq Fri Mar 07 22:00:43 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2007/06/20 19:51:10 jlam Exp $
-
---- misc/Makefile.in.orig 2006-03-27 00:58:10.000000000 -0500
-+++ misc/Makefile.in
-@@ -228,7 +228,7 @@ installdirs:
- $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
- $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
- $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
-- $(DESTDIR)$(libdir) $(DESTDIR)/etc
-+ $(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)
-
- install: all $(SMANPAGES) $(UMANPAGES) installdirs
- @for i in $(SPROGS); do \
-@@ -288,10 +288,10 @@ install: all $(SMANPAGES) $(UMANPAGES) i
- echo " INSTALL_DATA $(man5dir)/$$i"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
- done
-- @if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
-- echo " INSTALL_DATA /etc/mke2fs.conf"; \
-+ @if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
-+ echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
- $(INSTALL_DATA) $(srcdir)/mke2fs.conf \
-- $(DESTDIR)/etc/mke2fs.conf; \
-+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
- fi
-
- install-strip: install
-@@ -336,8 +336,8 @@ uninstall:
- for i in $(FMANPAGES); do \
- $(RM) -f $(DESTDIR)$(man5dir)/$$i; \
- done
-- if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)/etc/mke2fs.conf; then \
-- $(RM) $(DESTDIR)/etc/mke2fs.conf; \
-+ if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
-+ $(RM) $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
- fi
-
- clean:
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/patches/patch-as
--- a/sysutils/e2fsprogs/patches/patch-as Fri Mar 07 22:00:43 2008 +0000
+++ b/sysutils/e2fsprogs/patches/patch-as Fri Mar 07 22:40:29 2008 +0000
@@ -1,24 +1,13 @@
-$NetBSD: patch-as,v 1.1 2007/06/20 19:51:11 jlam Exp $
+$NetBSD: patch-as,v 1.2 2008/03/07 22:40:29 tron Exp $
---- misc/blkid.c.orig 2005-09-06 05:40:14.000000000 -0400
-+++ misc/blkid.c
-@@ -24,6 +24,10 @@ extern int optind;
-
- #include "blkid/blkid.h"
-
-+#ifndef ETC_DIR
-+#define ETC_DIR "/etc" /* Where to find the config file */
-+#endif
-+
- const char *progname = "blkid";
-
- static void print_version(FILE *out)
-@@ -39,7 +43,7 @@ static void usage(int error)
+--- misc/blkid.c.orig 2008-02-19 04:33:10.000000000 +0000
++++ misc/blkid.c 2008-03-07 20:19:07.000000000 +0000
+@@ -40,7 +40,7 @@
fprintf(out,
- "usage:\t%s [-c <file>] [-hl] [-o format] "
+ "usage:\t%s [-c <file>] [-ghl] [-o format] "
"[-s <tag>] [-t <token>]\n [-v] [-w <file>] [dev ...]\n"
- "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
-+ "\t-c\tcache file (default: " ETC_DIR "/blkid.tab, /dev/null = none)\n"
++ "\t-c\tcache file (default: " ROOT_SYSCONFDIR "/blkid.tab, /dev/null = none)\n"
"\t-h\tprint this usage message and exit\n"
+ "\t-g\tgarbage collect the blkid cache\n"
"\t-s\tshow specified tag(s) (default show all tags)\n"
- "\t-t\tfind device with a specific token (NAME=value pair)\n"
diff -r 4d058176f5e6 -r bd97762a0c39 sysutils/e2fsprogs/patches/patch-au
--- a/sysutils/e2fsprogs/patches/patch-au Fri Mar 07 22:00:43 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-au,v 1.1 2007/06/20 19:51:11 jlam Exp $
-
---- misc/mke2fs.c.orig 2006-05-13 09:16:57.000000000 -0400
-+++ misc/mke2fs.c
-@@ -61,6 +61,10 @@ extern int optind;
- #define ZAP_BOOTBLOCK
- #endif
-
-+#ifndef ETC_DIR
-+#define ETC_DIR "/etc" /* Where to find the config file */
-+#endif
-+
- extern int isatty(int);
- extern FILE *fpopen(const char *cmd, const char *mode);
-
-@@ -870,7 +874,7 @@ static void syntax_err_report(const char
- exit(1);
- }
-
--static const char *config_fn[] = { "/etc/mke2fs.conf", 0 };
-+static const char *config_fn[] = { ETC_DIR "/mke2fs.conf", 0 };
-
Home |
Main Index |
Thread Index |
Old Index