Hello community,
here is the log from the commit of package e2fsprogs
checked in at Fri Aug 11 15:48:11 CEST 2006.
--------
--- e2fsprogs/e2fsprogs.changes 2006-08-10 12:10:47.000000000 +0200
+++ e2fsprogs/e2fsprogs.changes 2006-08-11 11:34:37.000000000 +0200
@@ -2 +2 @@
-Thu Aug 10 12:10:25 CEST 2006 - mskibbe@suse.de
+Fri Aug 11 11:32:55 CEST 2006 - pth@suse.de
@@ -4 +4,3 @@
-- fix aclocal problem
+- Fix to comply with gettex 0.15.
+- Move ext2resize sources to toplevel directory.
+- Fix use of MKINSTALLDIRS.
Old:
----
e2fsprogs-1.34-gettext_version.diff
e2fsprogs-1.34-install_shlibs.diff
New:
----
e2fsprogs-mkinstalldirs.patch
e2fsprogs-special_make_targets.patch
ext2resize-gettext.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ e2fsprogs.spec ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:07.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:07.000000000 +0200
@@ -19,7 +19,7 @@
PreReq: %install_info_prereq
Autoreqprov: on
Version: 1.38
-Release: 27
+Release: 28
Summary: Utilities for the Second Extended File System
URL: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2
@@ -28,8 +28,8 @@
Patch3: %{name}-1.35-libdir.diff
Patch4: %{name}-1.33-fsckdevdisplay.diff
Patch5: %{name}-1.33-codecleanup.diff
-Patch6: %{name}-1.34-gettext_version.diff
-Patch7: %{name}-1.34-install_shlibs.diff
+#Patch6: %{name}-1.34-gettext_version.diff
+#Patch7: %{name}-1.34-install_shlibs.diff
Patch8: %{name}-1.34-uint_overflow.diff
Patch15: e2fsprogs-blkid.diff
Patch16: e2fsprogs-codecleanup.diff
@@ -40,6 +40,9 @@
Patch21: close.patch
Patch22: e2fsprogs-1.38-inode_size.patch
Patch23: fsck-ignore-mounted.patch
+Patch24: e2fsprogs-mkinstalldirs.patch
+Patch25: e2fsprogs-special_make_targets.patch
+#Patch25: e2fsprogs-gettext.patch
# libcom_err patches
Patch30: libcom_err-no-static-buffer.patch
Patch31: libcom_err-no-init_error_table.patch
@@ -54,6 +57,7 @@
Patch45: ext2resize-byteorder.patch
Patch46: ext2resize-nofallback.patch
Patch47: ext2resize-nowrite.patch
+Patch48: ext2resize-gettext.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define ext2resize_name ext2resize-1.1.17
Source1: %{ext2resize_name}.tar.bz2
@@ -105,15 +109,13 @@
Theodore Ts'o
%prep
-%setup -q -a1
+%setup -q -b1
# e2fsprogs patches
%patch0 -p1
%patch1
%patch3
%patch4
%patch5
-%patch6
-%patch7
%patch8
%patch15
%patch16
@@ -124,6 +126,7 @@
%patch21 -p1
%patch22
%patch23
+%patch24
# libcom_err patches
%patch30 -p1
%patch31 -p1
@@ -131,7 +134,7 @@
%patch33 -p1
# ext2 resize patches
find . -type f|xargs chmod u+w
-pushd %{ext2resize_name}
+pushd ../%{ext2resize_name}
%patch40 -p1
%patch41 -p1
%patch42 -p1
@@ -140,14 +143,18 @@
%patch45 -p2
%patch46 -p2
%patch47 -p2
+# %patch48
popd
%build
%{?suse_update_config:%{suse_update_config -f}}
rm aclocal.m4
rm -f po/Makefile.in
-ACLOCAL="aclocal -I m4" autoreconf --force --install
-patch -p0 -i %{PATCH7}
+gettextize --copy --force --intl
+autoreconf --force --install
+%if %{suse_version} > 1010
+patch -p0 -i %{P:25}
+%endif
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -W -Wall -Wstrict-prototypes -Wpointer-arith -Wno-unused-parameter"
./configure --enable-dynamic-e2fsck \
--prefix=%{_prefix} --with-root-prefix='' \
@@ -158,7 +165,7 @@
#make check
#make gcc-wall
export CFLAGS="$RPM_OPT_FLAGS"
-pushd %{ext2resize_name}
+pushd ../%{ext2resize_name}
# aclocal
# automake -a -f
# autoconf
@@ -174,7 +181,7 @@
make install install-libs DESTDIR=$RPM_BUILD_ROOT lib=%{_lib}
%{find_lang} %{name}
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
-pushd %{ext2resize_name}
+pushd ../%{ext2resize_name}
make DESTDIR=$RPM_BUILD_ROOT install
# For now, we only want to package up the ext2online binary. Delete the
# others.
@@ -196,12 +203,12 @@
%files -f %{name}.lang
%defattr(-, root, root)
-%doc RELEASE-NOTES ChangeLog README RELEASE-NOTES doc/draft-leach-uuids-guids-01.txt doc/libblkid.txt
-%doc %{ext2resize_name}/AUTHORS.ext2resize
-%doc %{ext2resize_name}/COPYING.ext2resize
-%doc %{ext2resize_name}/NEWS.ext2resize
-%doc %{ext2resize_name}/README.ext2resize
-%doc %{ext2resize_name}/doc/HOWTO.ext2resize
+%doc RELEASE-NOTES ChangeLog README doc/draft-leach-uuids-guids-01.txt doc/libblkid.txt
+%doc ../%{ext2resize_name}/AUTHORS.ext2resize
+%doc ../%{ext2resize_name}/COPYING.ext2resize
+%doc ../%{ext2resize_name}/NEWS.ext2resize
+%doc ../%{ext2resize_name}/README.ext2resize
+%doc ../%{ext2resize_name}/doc/HOWTO.ext2resize
/sbin/badblocks
/sbin/debugfs
/sbin/dumpe2fs
@@ -289,8 +296,10 @@
%postun -n libcom_err -p /sbin/ldconfig
%changelog -n e2fsprogs
-* Thu Aug 10 2006 - mskibbe@suse.de
-- fix aclocal problem
+* Fri Aug 11 2006 - pth@suse.de
+- Fix to comply with gettex 0.15.
+- Move ext2resize sources to toplevel directory.
+- Fix use of MKINSTALLDIRS.
* Fri Aug 04 2006 - kay.sievers@suse.de
- update libvolume_id integration to match util-linux
* Fri Jun 16 2006 - ro@suse.de
++++++ e2fsprogs-1.33-codecleanup.diff ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:07.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:07.000000000 +0200
@@ -10,7 +10,7 @@
#include "ext2fs.h"
--- lib/ext2fs/ext2fs.h
+++ lib/ext2fs/ext2fs.h
-@@ -53,6 +53,7 @@
+@@ -59,6 +59,7 @@
#endif
#include
++++++ e2fsprogs-1.33-fsckdevdisplay.diff ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:07.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:07.000000000 +0200
@@ -1,6 +1,6 @@
--- e2fsck/unix.c
+++ e2fsck/unix.c
-@@ -864,8 +864,13 @@
+@@ -958,8 +958,13 @@
*/
if (ctx->device_name == 0 &&
(sb->s_volume_name[0] != 0)) {
@@ -18,7 +18,7 @@
ctx->device_name = ctx->filesystem_name;
--- misc/fsck.c
+++ misc/fsck.c
-@@ -598,6 +598,9 @@
+@@ -615,6 +615,9 @@
status = EXIT_ERROR;
}
inst->exit_status = status;
++++++ e2fsprogs-1.34-uint_overflow.diff ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:07.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:07.000000000 +0200
@@ -1,6 +1,6 @@
--- lib/ext2fs/openfs.c
+++ lib/ext2fs/openfs.c
-@@ -109,7 +109,7 @@
+@@ -130,7 +130,7 @@
if (retval)
goto cleanup;
retval = io_channel_read_blk(fs->io, 0,
++++++ e2fsprogs-blkid.diff ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,8 +1,19 @@
+--- lib/blkid/tag.c
++++ lib/blkid/tag.c
+@@ -436,7 +436,7 @@
+
+ dev = blkid_get_dev(cache, devname, flags);
+ if (!dev) {
+- fprintf(stderr, "%s: Can not find device in blkid cache\n");
++ fprintf(stderr, "%s: Can not find device in blkid cache\n", dev);
+ exit(1);
+ }
+ if (search_type) {
--- misc/fsck.8.in
+++ misc/fsck.8.in
-@@ -352,6 +352,15 @@
+@@ -391,6 +391,15 @@
.B /etc/fstab
- file. It is also use for developers who are testing
+ file. It is also useful for developers who are testing
.BR fsck .
+.TP
+.B BLKID_FILE
@@ -18,7 +29,7 @@
.BR mkfs (8),
--- misc/fsck.c
+++ misc/fsck.c
-@@ -1210,7 +1210,7 @@
+@@ -1243,7 +1243,7 @@
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
@@ -27,14 +38,3 @@
PRS(argc, argv);
if (!notitle)
---- lib/blkid/tag.c
-+++ lib/blkid/tag.c
-@@ -436,7 +436,7 @@
-
- dev = blkid_get_dev(cache, devname, flags);
- if (!dev) {
-- fprintf(stderr, "%s: Can not find device in blkid cache\n");
-+ fprintf(stderr, "%s: Can not find device in blkid cache\n", dev);
- exit(1);
- }
- if (search_type) {
++++++ e2fsprogs-libvolume_id-support.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -75,7 +75,7 @@
]
[
.B \-C
-@@ -240,6 +240,14 @@
+@@ -236,6 +236,14 @@
.B \-N
Don't execute, just show what would be done.
.TP
@@ -100,7 +100,7 @@
#ifndef _PATH_MNTTAB
#define _PATH_MNTTAB "/etc/fstab"
-@@ -119,7 +118,6 @@
+@@ -118,7 +117,6 @@
struct fsck_instance *instance_list;
const char *fsck_prefix_path = "/sbin:/sbin/fs.d:/sbin/fs:/etc/fs:/etc";
char *fsck_path = 0;
@@ -108,7 +108,7 @@
static char *string_copy(const char *s)
{
-@@ -298,7 +296,7 @@
+@@ -297,7 +295,7 @@
parse_escape(freq);
parse_escape(passno);
@@ -117,7 +117,7 @@
if (dev)
device = dev;
-@@ -323,7 +321,7 @@
+@@ -322,7 +320,7 @@
if (strcmp(fs->type, "auto") != 0)
return;
@@ -126,7 +126,7 @@
if (t) {
free(fs->type);
fs->type = t;
-@@ -1108,7 +1106,7 @@
+@@ -1048,7 +1046,7 @@
static void usage(NOARGS)
{
@@ -135,7 +135,7 @@
exit(EXIT_USAGE);
}
-@@ -1154,7 +1152,7 @@
+@@ -1094,7 +1092,7 @@
progname);
exit(EXIT_ERROR);
}
@@ -144,7 +144,7 @@
if (!dev && strchr(arg, '=')) {
/*
* Check to see if we failed because
-@@ -1303,7 +1301,7 @@
+@@ -1240,7 +1238,7 @@
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
@@ -153,7 +153,7 @@
PRS(argc, argv);
if (!notitle)
-@@ -1354,6 +1352,16 @@
+@@ -1287,6 +1285,16 @@
break;
}
fs = lookup(devices[i]);
@@ -170,7 +170,7 @@
if (!fs) {
fs = create_fs_device(devices[i], 0, "auto",
0, -1, -1);
-@@ -1384,6 +1392,6 @@
+@@ -1309,6 +1317,6 @@
}
status |= wait_many(FLAG_WAIT_ALL);
free(fsck_path);
@@ -222,7 +222,7 @@
+ return blkid_get_tag_value(cache, "TYPE", device);
+}
+
---- /dev/null
+--- misc/fsck_udev.c
+++ misc/fsck_udev.c
@@ -0,0 +1,184 @@
+/*
++++++ e2fsprogs-mkinstalldirs.patch ++++++
--- MCONFIG.in
+++ MCONFIG.in
@@ -59,7 +59,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = mkdir -p
#
# Library definitions
++++++ e2fsprogs-special_make_targets.patch ++++++
--- intl/Makefile.in
+++ intl/Makefile.in
@@ -418,6 +418,12 @@
# Define this as empty until I found a useful application.
installcheck:
+install-shlibs:
+
+uninstall-shlibs:
+
+install-shlibs-strip:
+
uninstall:
if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
&& test '@USE_INCLUDED_LIBINTL@' = yes; then \
++++++ ext2resize-byteorder.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,6 @@
---- e2fsprogs-1.36/ext2resize-1.1.17/configure.in.=K0000=.orig
-+++ e2fsprogs-1.36/ext2resize-1.1.17/configure.in
-@@ -26,6 +26,7 @@ AC_CHECK_TYPE(__u16, u_int16_t)
+--- e2fsprogs-1.38/ext2resize-1.1.17/configure.in
++++ e2fsprogs-1.38/ext2resize-1.1.17/configure.in
+@@ -26,6 +26,7 @@
AC_CHECK_TYPE(__s32, int32_t)
AC_CHECK_TYPE(__u32, u_int32_t)
AC_CHECK_TYPE(loff_t, unsigned)
@@ -8,9 +8,9 @@
dnl Checks for library functions.
AC_CHECK_FUNCS(open64)
---- e2fsprogs-1.36/ext2resize-1.1.17/src/Makefile.am.=K0000=.orig
-+++ e2fsprogs-1.36/ext2resize-1.1.17/src/Makefile.am
-@@ -6,8 +6,9 @@ sbin_PROGRAMS = ext2resize ext2prepare e
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/Makefile.am
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/Makefile.am
+@@ -6,8 +6,9 @@
noinst_LIBRARIES = libext2resize.a
@@ -22,8 +22,8 @@
#libext2resize_a_SOURCES += ext2_journal.c ext2_mkfs.c
---- e2fsprogs-1.36/ext2resize-1.1.17/src/ext2.c.=K0000=.orig
-+++ e2fsprogs-1.36/ext2resize-1.1.17/src/ext2.c
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/ext2.c
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/ext2.c
@@ -1,6 +1,7 @@
/*
ext2.c -- generic ext2 stuff
@@ -41,7 +41,7 @@
*/
static const char _ext2_c[] = "$Id: ext2.c,v 1.28 2004/04/19 14:48:59 sct Exp $";
-@@ -254,6 +257,9 @@ void ext2_read_inode(struct ext2_fs *fs,
+@@ -254,6 +257,9 @@
bh = ext2_bread(fs, blk);
memcpy(inode, bh->data + off, sizeof(struct ext2_inode));
ext2_brelse(bh, 0);
@@ -51,7 +51,7 @@
}
void ext2_set_inode_state(struct ext2_fs *fs, ino_t ino, int state,
-@@ -771,10 +777,10 @@ int ext2_ioctl(struct ext2_fs *fs, int i
+@@ -771,10 +777,10 @@
int ret = 1;
if (fs->flags & FL_DEBUG) {
@@ -64,7 +64,7 @@
printf("%s: ADD group %u\n",
__FUNCTION__, *(__u32 *)arg);
else
-@@ -890,6 +896,12 @@ struct ext2_fs *ext2_open(struct ext2_de
+@@ -890,6 +896,12 @@
handle->ops->set_blocksize(handle->cookie, 10);
ext2_read_blocks(fs, &fs->sb, 1, 1);
@@ -77,7 +77,7 @@
if (fs->sb.s_magic != EXT2_SUPER_MAGIC) {
fprintf(stderr, "%s: ext2_open: invalid superblock\n",fs->prog);
goto error_free_fs;
-@@ -1012,6 +1024,14 @@ struct ext2_fs *ext2_open(struct ext2_de
+@@ -1012,6 +1024,14 @@
goto error_free_bcache;
}
ext2_read_blocks(fs, fs->gd, fs->sb.s_first_data_block+1, fs->gdblocks);
@@ -92,9 +92,9 @@
if (!ext2_determine_itoffset(fs))
goto error_free_gd;
---- e2fsprogs-1.36/ext2resize-1.1.17/src/ext2.h.=K0000=.orig
-+++ e2fsprogs-1.36/ext2resize-1.1.17/src/ext2.h
-@@ -38,7 +38,7 @@ static const char _ext2_h[] = "$Id: ext2
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/ext2.h
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/ext2.h
+@@ -38,7 +38,7 @@
#define min(a,b) (((a)<(b))?(a):(b))
#endif
@@ -103,7 +103,7 @@
#define le16_to_cpu(a) ((((a) & 0x00ffU) << 8) | (((a) & 0xff00) >> 8))
#define le32_to_cpu(a) ((((a) & 0x000000ffU) << 24)|(((a) & 0x0000ff00U) << 8)\
|(((a) & 0xff000000U) >> 24)|(((a) & 0x00ff0000U) >> 8))
-@@ -237,6 +237,13 @@ struct ext2_fs *ext2_mkfs(struct ext2_de
+@@ -237,6 +237,13 @@
/* resize */
int ext2_resize_fs(struct ext2_fs *fs);
@@ -117,9 +117,9 @@
/* unix I/O */
loff_t ext2_llseek(unsigned int fd, loff_t offset, unsigned int whence);
struct ext2_dev_handle *ext2_make_dev_handle_from_file(char *dev, char *dir,
---- e2fsprogs-1.36/ext2resize-1.1.17/src/ext2_fs.h.=K0000=.orig
-+++ e2fsprogs-1.36/ext2resize-1.1.17/src/ext2_fs.h
-@@ -459,8 +459,15 @@ struct ext2_super_block {
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/ext2_fs.h
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/ext2_fs.h
+@@ -459,8 +459,15 @@
__u32 s_journal_inum; /* inode number of journal file */
__u32 s_journal_dev; /* device number of journal file */
__u32 s_last_orphan; /* start of list of inodes to delete */
@@ -137,9 +137,9 @@
};
/*
---- e2fsprogs-1.36/ext2resize-1.1.17/src/ext2online.c.=K0000=.orig
-+++ e2fsprogs-1.36/ext2resize-1.1.17/src/ext2online.c
-@@ -235,10 +235,12 @@ static int ext2_check_one_rsv(struct ext
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/ext2online.c
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/ext2online.c
+@@ -235,10 +235,12 @@
unsigned int three = 1, five = 5, seven = 7;
unsigned int group;
int last = 0;
@@ -155,7 +155,7 @@
fs->resize.i_block[EXT2_DIND_BLOCK],
gdb_num % apb);
ret = 0;
-@@ -250,16 +252,17 @@ static int ext2_check_one_rsv(struct ext
+@@ -250,16 +252,17 @@
while ((group = ext2_list_backups(fs, &three, &five, &seven)) <
fs->numgroups) {
__u32 *pri_buf = (__u32 *)(pri_bh->data);
@@ -176,7 +176,7 @@
ext2_brelse(pri_bh, 0);
ret = 0;
goto exit_dind;
-@@ -337,7 +340,9 @@ static blk_t ext2_make_group(struct ext2
+@@ -337,7 +340,9 @@
}
gdp = (struct ext2_group_desc *)bh->data +
(group % (fs->blocksize/sizeof(struct ext2_group_desc)));
@@ -187,8 +187,8 @@
gdp->bg_block_bitmap = start + new_bb;
gdp->bg_inode_bitmap = start + new_ib;
gdp->bg_inode_table = start + fs->itoffset;
---- /dev/null
-+++ e2fsprogs-1.36/ext2resize-1.1.17/src/swapfs.c
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/swapfs.c
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/swapfs.c
@@ -0,0 +1,177 @@
+/*
+ * swapfs.c --- swap ext2 filesystem data structures
++++++ ext2resize-canonicalise.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,6 @@
---- ext2resize-1.1.17/src/ext2online.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2online.c
+++ ext2resize-1.1.17/src/ext2online.c
-@@ -39,10 +39,20 @@ static const char _ext2online_c[] = "$Id
+@@ -39,10 +39,20 @@
#endif
#include
#include
@@ -21,7 +21,7 @@
static void usage(FILE *outfile, char *progname)
{
fprintf(outfile,
-@@ -592,7 +602,7 @@ int main(int argc, char *argv[])
+@@ -592,7 +602,7 @@
if (argc < 1 || argc > 2)
usage(stderr, progname);
@@ -30,7 +30,7 @@
find_mount(MOUNTED, &dev, &dir, &type, &opts);
if (dir == NULL) {
-@@ -722,3 +732,170 @@ int main(int argc, char *argv[])
+@@ -722,3 +732,170 @@
return 0;
}
++++++ ext2resize-compiler-warning-fixes.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,6 @@
---- ext2resize-1.1.17/src/ext2_block_relocator.c.=K0001=.orig
+--- ext2resize-1.1.17/src/ext2_block_relocator.c
+++ ext2resize-1.1.17/src/ext2_block_relocator.c
-@@ -243,7 +243,7 @@ static int dotindblock(struct ext2_fs *f
+@@ -243,7 +243,7 @@
/* Ehrm.... sorry, pedanticists! :-) */
++++++ ext2resize-cvs-20040419.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,5 @@
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/AUTHORS ext2resize-20040419/AUTHORS
---- ext2resize-1.1.17/AUTHORS 2000-10-15 02:18:33.000000000 +0100
-+++ ext2resize-20040419/AUTHORS 2002-06-25 10:54:08.000000000 +0100
+--- ext2resize-1.1.17/AUTHORS
++++ ext2resize-1.1.17/AUTHORS
@@ -1,6 +1,6 @@
Lennert Buytenhek
original ext2resize code (libext2resize, ext2resize)
@@ -9,9 +8,8 @@
+Andreas Dilger
online ext2 resize code (ext2online, parts of ext2prepare)
more recent changes to ext2resize
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/ChangeLog ext2resize-20040419/ChangeLog
---- ext2resize-1.1.17/ChangeLog 2001-03-15 20:31:49.000000000 +0000
-+++ ext2resize-20040419/ChangeLog 2002-07-03 18:52:24.000000000 +0100
+--- ext2resize-1.1.17/ChangeLog
++++ ext2resize-1.1.17/ChangeLog
@@ -1,3 +1,35 @@
+2002/05/10 Andreas Dilger
+
@@ -48,9 +46,8 @@
2001/03/15 Andreas Dilger
* Fix (harmless) bug where we couldn't shrink a non-sparse filesystem.
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/INSTALL ext2resize-20040419/INSTALL
---- ext2resize-1.1.17/INSTALL 2000-03-22 20:16:22.000000000 +0000
-+++ ext2resize-20040419/INSTALL 2002-03-08 02:40:56.000000000 +0000
+--- ext2resize-1.1.17/INSTALL
++++ ext2resize-1.1.17/INSTALL
@@ -51,6 +51,27 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
@@ -79,10 +76,8 @@
Compilers and Options
=====================
-Only in ext2resize-1.1.17: Makefile
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/Makefile.in ext2resize-20040419/Makefile.in
---- ext2resize-1.1.17/Makefile.in 2001-03-15 20:40:18.000000000 +0000
-+++ ext2resize-20040419/Makefile.in 2004-04-15 23:20:20.000000000 +0100
+--- ext2resize-1.1.17/Makefile.in
++++ ext2resize-1.1.17/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
@@ -131,9 +126,8 @@
installdirs: installdirs-recursive
installdirs-am:
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/NEWS ext2resize-20040419/NEWS
---- ext2resize-1.1.17/NEWS 2000-05-12 05:19:04.000000000 +0100
-+++ ext2resize-20040419/NEWS 2002-06-25 10:54:08.000000000 +0100
+--- ext2resize-1.1.17/NEWS
++++ ext2resize-1.1.17/NEWS
@@ -0,0 +1,8 @@
+Report from Magnus Sandin using ext2resize to grow an ext2 filesystem
+on linear-appended MD disks, from 50GB to 110GB, over 3 disks.
@@ -143,9 +137,8 @@
+to 463GB! The full LV was spread across 8 IDE disks. It took 40 minutes
+for the first resize (probably because of block relocation for group
+descriptors), no report of how long the second took.
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/README ext2resize-20040419/README
---- ext2resize-1.1.17/README 2000-10-18 06:53:16.000000000 +0100
-+++ ext2resize-20040419/README 2002-06-25 10:54:08.000000000 +0100
+--- ext2resize-1.1.17/README
++++ ext2resize-1.1.17/README
@@ -9,6 +9,8 @@
See the Resizing HOWTO (in doc/) and the ext2resize, ext2online, and
ext2prepare man pages for more information on how to use this package.
@@ -161,9 +154,8 @@
Andreas Dilger
-
+
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/THANKS ext2resize-20040419/THANKS
---- ext2resize-1.1.17/THANKS 2000-08-08 01:55:56.000000000 +0100
-+++ ext2resize-20040419/THANKS 2002-06-25 10:54:08.000000000 +0100
+--- ext2resize-1.1.17/THANKS
++++ ext2resize-1.1.17/THANKS
@@ -1,7 +1,7 @@
-Thanks, in no particular order:
+Thanks from Lennert, in no particular order:
@@ -174,15 +166,13 @@
The parted crew:
Andrew Clausen
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/VERSION ext2resize-20040419/VERSION
---- ext2resize-1.1.17/VERSION 2001-03-15 20:36:28.000000000 +0000
-+++ ext2resize-20040419/VERSION 2002-07-03 18:52:24.000000000 +0100
+--- ext2resize-1.1.17/VERSION
++++ ext2resize-1.1.17/VERSION
@@ -1 +1 @@
-1.1.17
+1.1.18
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/aclocal.m4 ext2resize-20040419/aclocal.m4
---- ext2resize-1.1.17/aclocal.m4 2001-03-15 20:40:18.000000000 +0000
-+++ ext2resize-20040419/aclocal.m4 2004-04-15 23:20:05.000000000 +0100
+--- ext2resize-1.1.17/aclocal.m4
++++ ext2resize-1.1.17/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4a
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
@@ -231,11 +221,8 @@
[AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file.
-Only in ext2resize-20040419: autom4te.cache
-Only in ext2resize-1.1.17: config.cache
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/config.log ext2resize-20040419/config.log
---- ext2resize-1.1.17/config.log 2001-03-15 20:40:29.000000000 +0000
-+++ ext2resize-20040419/config.log 2004-08-31 19:54:10.000000000 +0100
+--- ext2resize-1.1.17/config.log
++++ ext2resize-1.1.17/config.log
@@ -1,67 +1,28 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
@@ -331,10 +318,8 @@
+on sisko.scot.redhat.com
+
+config.status:3792: creating doc/Makefile
-Only in ext2resize-1.1.17: config.status
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/configure ext2resize-20040419/configure
---- ext2resize-1.1.17/configure 2001-03-15 20:40:18.000000000 +0000
-+++ ext2resize-20040419/configure 2004-04-15 23:20:05.000000000 +0100
+--- ext2resize-1.1.17/configure
++++ ext2resize-1.1.17/configure
@@ -1,26 +1,155 @@
#! /bin/sh
-
@@ -5696,9 +5681,8 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/configure.in ext2resize-20040419/configure.in
---- ext2resize-1.1.17/configure.in 2001-03-15 20:38:51.000000000 +0000
-+++ ext2resize-20040419/configure.in 2002-07-03 18:52:24.000000000 +0100
+--- ext2resize-1.1.17/configure.in
++++ ext2resize-1.1.17/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script
@@ -5742,9 +5726,8 @@
AC_CHECK_FUNCS(lseek64)
AC_CHECK_FUNCS(llseek)
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/doc/HOWTO ext2resize-20040419/doc/HOWTO
---- ext2resize-1.1.17/doc/HOWTO 2000-10-16 04:38:00.000000000 +0100
-+++ ext2resize-20040419/doc/HOWTO 2002-06-28 18:29:56.000000000 +0100
+--- ext2resize-1.1.17/doc/HOWTO
++++ ext2resize-1.1.17/doc/HOWTO
@@ -68,7 +68,8 @@
7. Online (mounted filesystem) resizing is exactly the same as offline
@@ -5761,10 +5744,8 @@
Lennert Buytenhek Andreas Dilger
-
+
-Only in ext2resize-1.1.17/doc: Makefile
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/doc/Makefile.in ext2resize-20040419/doc/Makefile.in
---- ext2resize-1.1.17/doc/Makefile.in 2001-03-15 20:40:22.000000000 +0000
-+++ ext2resize-20040419/doc/Makefile.in 2004-04-15 23:20:05.000000000 +0100
+--- ext2resize-1.1.17/doc/Makefile.in
++++ ext2resize-1.1.17/doc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
@@ -5795,9 +5776,8 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/doc/TODO ext2resize-20040419/doc/TODO
---- ext2resize-1.1.17/doc/TODO 2000-11-27 05:29:59.000000000 +0000
-+++ ext2resize-20040419/doc/TODO 2001-04-18 23:31:21.000000000 +0100
+--- ext2resize-1.1.17/doc/TODO
++++ ext2resize-1.1.17/doc/TODO
@@ -19,7 +19,7 @@
progress indicator hooks?
see whether we discard return values (we shouldn't)
@@ -5830,9 +5810,8 @@
- group metadata (inode table, bitmaps) inside the kernel
-
+need to test kernel journal recovery with a resize in the journal (root only)
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/doc/ext2online.8 ext2resize-20040419/doc/ext2online.8
---- ext2resize-1.1.17/doc/ext2online.8 2001-03-15 20:35:22.000000000 +0000
-+++ ext2resize-20040419/doc/ext2online.8 2002-12-18 19:06:08.000000000 +0000
+--- ext2resize-1.1.17/doc/ext2online.8
++++ ext2resize-1.1.17/doc/ext2online.8
@@ -1,10 +1,10 @@
.\" -*- nroff -*-
.\" Written by Andreas Dilger based on the ext2resize.8 man page.
@@ -5891,9 +5870,8 @@
the ext2 resizing tools developed by Lennert Buytenhek .
The ext2online kernel patches are available as part of the GNU ext2resize
package at http://sourceforge.org/projects/ext2resize/.
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/doc/ext2prepare.8 ext2resize-20040419/doc/ext2prepare.8
---- ext2resize-1.1.17/doc/ext2prepare.8 2001-03-15 20:35:28.000000000 +0000
-+++ ext2resize-20040419/doc/ext2prepare.8 2002-07-03 18:52:24.000000000 +0100
+--- ext2resize-1.1.17/doc/ext2prepare.8
++++ ext2resize-1.1.17/doc/ext2prepare.8
@@ -1,6 +1,6 @@
.\" -*- nroff -*-
.\" Written by Andreas Dilger based on the ext2resize.8 man page.
@@ -5920,9 +5898,8 @@
the ext2 resizing tools developed by Lennert Buytenhek .
The ext2online kernel patches are available as part of the GNU ext2resize
package at http://sourceforge.org/projects/ext2resize/.
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/doc/ext2resize.8 ext2resize-20040419/doc/ext2resize.8
---- ext2resize-1.1.17/doc/ext2resize.8 2001-03-15 20:35:34.000000000 +0000
-+++ ext2resize-20040419/doc/ext2resize.8 2002-07-03 18:52:24.000000000 +0100
+--- ext2resize-1.1.17/doc/ext2resize.8
++++ ext2resize-1.1.17/doc/ext2resize.8
@@ -5,7 +5,7 @@
.\" Dirk de Rycke significantly improved that version and after
.\" Lennert Buytenhek had yet again tweaked it a little it became
@@ -5952,9 +5929,8 @@
.B ext2resize
to shrink the file system. You may then use
.BR fdisk (8)
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/ext2resize.spec ext2resize-20040419/ext2resize.spec
---- ext2resize-1.1.17/ext2resize.spec 2001-03-15 20:34:16.000000000 +0000
-+++ ext2resize-20040419/ext2resize.spec 2002-07-03 18:52:24.000000000 +0100
+--- ext2resize-1.1.17/ext2resize.spec
++++ ext2resize-1.1.17/ext2resize.spec
@@ -1,22 +1,24 @@
#
# spec file for package ext2resize
@@ -6024,9 +6000,8 @@
+
+* Thu Oct 12 2000 - Andreas Dilger
- original RPM spec file
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/patches/README ext2resize-20040419/patches/README
---- ext2resize-1.1.17/patches/README 2001-02-16 16:33:07.000000000 +0000
-+++ ext2resize-20040419/patches/README 2001-12-13 20:49:43.000000000 +0000
+--- ext2resize-1.1.17/patches/README
++++ ext2resize-1.1.17/patches/README
@@ -1,7 +1,9 @@
These are patches needed to get the ext2online resizing working. They are
NOT required for resizing an unmounted filesystem using the ext2resize program.
@@ -6079,13 +6054,8 @@
+ "make menuconfig" (or kernel config tool of your choice) in order to
+ enable the CONFIG_EXT2_RESIZE option. If you don't do this, then your
+ kernel will not have online resizing capability at all.
-Only in ext2resize-20040419/patches: e2fsprogs-1.28.diff
-Only in ext2resize-20040419/patches: e2fsprogs-1.29.diff
-Only in ext2resize-20040419/patches: e2fsprogs-1.35.patch
-Only in ext2resize-20040419/patches: linux-2.4.0-test11-ext2compat.diff
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/patches/online-ext2-2.2.diff ext2resize-20040419/patches/online-ext2-2.2.diff
---- ext2resize-1.1.17/patches/online-ext2-2.2.diff 2000-12-08 13:41:30.000000000 +0000
-+++ ext2resize-20040419/patches/online-ext2-2.2.diff 2002-06-25 10:54:55.000000000 +0100
+--- ext2resize-1.1.17/patches/online-ext2-2.2.diff
++++ ext2resize-1.1.17/patches/online-ext2-2.2.diff
@@ -6,7 +6,7 @@
S: USA
@@ -6104,9 +6074,8 @@
*/
#include
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/patches/online-ext2-2.3.diff ext2resize-20040419/patches/online-ext2-2.3.diff
---- ext2resize-1.1.17/patches/online-ext2-2.3.diff 2000-11-09 19:19:12.000000000 +0000
-+++ ext2resize-20040419/patches/online-ext2-2.3.diff 2002-06-25 10:54:55.000000000 +0100
+--- ext2resize-1.1.17/patches/online-ext2-2.3.diff
++++ ext2resize-1.1.17/patches/online-ext2-2.3.diff
@@ -6,7 +6,7 @@
S: USA
@@ -6125,12 +6094,8 @@
*/
#include
-Only in ext2resize-20040419/patches: online-ext2-2.4.17.diff
-Only in ext2resize-20040419/patches: online-ext2-2.4.18.diff
-Only in ext2resize-20040419/patches: online-ext2-2.4.8.diff
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/patches/online-ext2-2.4.diff ext2resize-20040419/patches/online-ext2-2.4.diff
---- ext2resize-1.1.17/patches/online-ext2-2.4.diff 2001-02-14 22:59:00.000000000 +0000
-+++ ext2resize-20040419/patches/online-ext2-2.4.diff 2002-06-25 10:54:55.000000000 +0100
+--- ext2resize-1.1.17/patches/online-ext2-2.4.diff
++++ ext2resize-1.1.17/patches/online-ext2-2.4.diff
@@ -6,7 +6,7 @@
S: USA
@@ -6149,9 +6114,8 @@
*/
#include
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/patches/online-ext3-2.2.diff ext2resize-20040419/patches/online-ext3-2.2.diff
---- ext2resize-1.1.17/patches/online-ext3-2.2.diff 2001-03-13 01:47:26.000000000 +0000
-+++ ext2resize-20040419/patches/online-ext3-2.2.diff 2002-06-25 10:54:55.000000000 +0100
+--- ext2resize-1.1.17/patches/online-ext3-2.2.diff
++++ ext2resize-1.1.17/patches/online-ext3-2.2.diff
@@ -3,7 +3,7 @@
+++ linux-2.2.16-online/CREDITS Wed May 24 18:21:08 2000
@@ -461,7 +461,7 @@
@@ -6170,16 +6134,8 @@
*/
#include
-Only in ext2resize-20040419/patches: online-ext3-2.4.18.diff
-Only in ext2resize-20040419/patches: online-ext3-2.4.19.diff
-Only in ext2resize-20040419/patches: online-ext3-2.5.44.diff
-Only in ext2resize-20040419/patches: online-ext3-2.6.6-rc1.diff
-Only in ext2resize-1.1.17/patches: rawio.diff
-Only in ext2resize-1.1.17/patches: writev.diff
-Only in ext2resize-1.1.17/src: Makefile
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/Makefile.in ext2resize-20040419/src/Makefile.in
---- ext2resize-1.1.17/src/Makefile.in 2001-03-15 20:40:21.000000000 +0000
-+++ ext2resize-20040419/src/Makefile.in 2004-04-15 23:20:05.000000000 +0100
+--- ext2resize-1.1.17/src/Makefile.in
++++ ext2resize-1.1.17/src/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
@@ -6231,10 +6187,8 @@
installdirs:
$(mkinstalldirs) $(DESTDIR)$(sbindir)
-Only in ext2resize-1.1.17/src: config.h
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/config.h.in ext2resize-20040419/src/config.h.in
---- ext2resize-1.1.17/src/config.h.in 2000-09-26 00:44:13.000000000 +0100
-+++ ext2resize-20040419/src/config.h.in 2004-04-15 23:20:05.000000000 +0100
+--- ext2resize-1.1.17/src/config.h.in
++++ ext2resize-1.1.17/src/config.h.in
@@ -3,10 +3,6 @@
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
@@ -6280,9 +6234,8 @@
/* Define if you have the header file. */
#undef HAVE_UNISTD_H
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2.c ext2resize-20040419/src/ext2.c
---- ext2resize-1.1.17/src/ext2.c 2001-03-15 20:35:09.000000000 +0000
-+++ ext2resize-20040419/src/ext2.c 2004-08-31 17:19:11.000000000 +0100
+--- ext2resize-1.1.17/src/ext2.c
++++ ext2resize-1.1.17/src/ext2.c
@@ -17,7 +17,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -6588,9 +6541,8 @@
fs->logsize = fs->sb.s_log_block_size + 10;
handle->ops->set_blocksize(handle->cookie, fs->logsize);
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2.h ext2resize-20040419/src/ext2.h
---- ext2resize-1.1.17/src/ext2.h 2001-03-15 20:35:09.000000000 +0000
-+++ ext2resize-20040419/src/ext2.h 2002-12-11 00:05:12.000000000 +0000
+--- ext2resize-1.1.17/src/ext2.h
++++ ext2resize-1.1.17/src/ext2.h
@@ -20,7 +20,7 @@
#ifndef _EXT2_H
#define _EXT2_H
@@ -6687,9 +6639,8 @@
#define set_bit(buf, offset) buf[(offset)>>3] |= _bitmap[(offset)&7]
#define clear_bit(buf, offset) buf[(offset)>>3] &= ~_bitmap[(offset)&7]
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2_block_relocator.c ext2resize-20040419/src/ext2_block_relocator.c
---- ext2resize-1.1.17/src/ext2_block_relocator.c 2001-03-15 20:35:09.000000000 +0000
-+++ ext2resize-20040419/src/ext2_block_relocator.c 2002-12-09 23:53:59.000000000 +0000
+--- ext2resize-1.1.17/src/ext2_block_relocator.c
++++ ext2resize-1.1.17/src/ext2_block_relocator.c
@@ -17,7 +17,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -6790,9 +6741,8 @@
}
ext2_brelse(bh, 0);
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2_fs.h ext2resize-20040419/src/ext2_fs.h
---- ext2resize-1.1.17/src/ext2_fs.h 2000-10-04 09:59:00.000000000 +0100
-+++ ext2resize-20040419/src/ext2_fs.h 2002-07-03 18:52:24.000000000 +0100
+--- ext2resize-1.1.17/src/ext2_fs.h
++++ ext2resize-1.1.17/src/ext2_fs.h
@@ -13,74 +13,289 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
@@ -7364,9 +7314,8 @@
+ ~EXT2_DIR_ROUND)
+
+#endif /* _LINUX_EXT2_FS_H */
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2_inode_relocator.c ext2resize-20040419/src/ext2_inode_relocator.c
---- ext2resize-1.1.17/src/ext2_inode_relocator.c 2000-10-04 09:59:00.000000000 +0100
-+++ ext2resize-20040419/src/ext2_inode_relocator.c 2001-09-04 19:13:14.000000000 +0100
+--- ext2resize-1.1.17/src/ext2_inode_relocator.c
++++ ext2resize-1.1.17/src/ext2_inode_relocator.c
@@ -17,7 +17,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -7394,9 +7343,8 @@
ext2_brelse(bh, 0);
}
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2_mkfs.c ext2resize-20040419/src/ext2_mkfs.c
---- ext2resize-1.1.17/src/ext2_mkfs.c 2000-10-10 19:34:33.000000000 +0100
-+++ ext2resize-20040419/src/ext2_mkfs.c 2001-09-04 19:13:49.000000000 +0100
+--- ext2resize-1.1.17/src/ext2_mkfs.c
++++ ext2resize-1.1.17/src/ext2_mkfs.c
@@ -17,7 +17,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -7436,9 +7384,8 @@
inode.i_block[0] = block;
ext2_write_inode(fs, 2, &inode);
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2_unix_io.c ext2resize-20040419/src/ext2_unix_io.c
---- ext2resize-1.1.17/src/ext2_unix_io.c 2000-10-04 09:59:00.000000000 +0100
-+++ ext2resize-20040419/src/ext2_unix_io.c 2002-11-07 08:01:50.000000000 +0000
+--- ext2resize-1.1.17/src/ext2_unix_io.c
++++ ext2resize-1.1.17/src/ext2_unix_io.c
@@ -17,10 +17,14 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -7654,9 +7601,8 @@
error_close_read:
close(monster->fdread);
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2online.c ext2resize-20040419/src/ext2online.c
---- ext2resize-1.1.17/src/ext2online.c 2001-03-15 20:35:09.000000000 +0000
-+++ ext2resize-20040419/src/ext2online.c 2002-12-18 18:49:35.000000000 +0000
+--- ext2resize-1.1.17/src/ext2online.c
++++ ext2resize-1.1.17/src/ext2online.c
@@ -23,14 +23,10 @@
ext2-online resize patch for the linux kernel 2.0, 2.2, or 2.3.
*/
@@ -8304,9 +8250,8 @@
ext2_close(fs);
return 0;
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2prepare.c ext2resize-20040419/src/ext2prepare.c
---- ext2resize-1.1.17/src/ext2prepare.c 2001-03-15 20:35:09.000000000 +0000
-+++ ext2resize-20040419/src/ext2prepare.c 2002-06-28 18:46:43.000000000 +0100
+--- ext2resize-1.1.17/src/ext2prepare.c
++++ ext2resize-1.1.17/src/ext2prepare.c
@@ -23,7 +23,7 @@
online resize patch for the linux kernel.
*/
@@ -8570,9 +8515,8 @@
}
fprintf(stderr,
"%s: can't prepare for filesystem over %d blocks\n"
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/ext2resize.c ext2resize-20040419/src/ext2resize.c
---- ext2resize-1.1.17/src/ext2resize.c 2000-10-16 18:10:35.000000000 +0100
-+++ ext2resize-20040419/src/ext2resize.c 2001-04-18 23:31:21.000000000 +0100
+--- ext2resize-1.1.17/src/ext2resize.c
++++ ext2resize-1.1.17/src/ext2resize.c
@@ -17,7 +17,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -8616,9 +8560,8 @@
if (argc == 2) {
sscanf(argv[1], "%i%c", &resize, &mod);
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/src/llseek.c ext2resize-20040419/src/llseek.c
---- ext2resize-1.1.17/src/llseek.c 2000-10-10 19:34:33.000000000 +0100
-+++ ext2resize-20040419/src/llseek.c 2002-06-28 18:46:43.000000000 +0100
+--- ext2resize-1.1.17/src/llseek.c
++++ ext2resize-1.1.17/src/llseek.c
@@ -23,21 +23,25 @@
#if HAVE_LSEEK64
#define __USE_LARGEFILE64
@@ -8659,12 +8602,8 @@
}
#endif /* __i386__ */
-Only in ext2resize-1.1.17/src: stamp-h
-Only in ext2resize-1.1.17/src: tags
-Only in ext2resize-1.1.17/test: sparse
-diff --exclude-from=/dev/fd/63 -ur ext2resize-1.1.17/test/sparse.c ext2resize-20040419/test/sparse.c
---- ext2resize-1.1.17/test/sparse.c 2001-03-13 16:38:57.000000000 +0000
-+++ ext2resize-20040419/test/sparse.c 2001-04-18 23:31:21.000000000 +0100
+--- ext2resize-1.1.17/test/sparse.c
++++ ext2resize-1.1.17/test/sparse.c
@@ -1,13 +1,11 @@
#include
#include
++++++ ext2resize-gcc34-fixes.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,6 @@
---- ext2resize-1.1.17/src/ext2.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2.c
+++ ext2resize-1.1.17/src/ext2.c
-@@ -564,7 +564,7 @@ void ext2_close(struct ext2_fs *fs)
+@@ -564,7 +564,7 @@
ext2_journal_deinit(fs);
#endif
if (fs->flags & FL_DEBUG)
@@ -9,7 +9,7 @@
ext2_commit_metadata(fs, EXT2_META_BACKUP);
ext2_sync(fs);
-@@ -593,13 +593,13 @@ void ext2_commit_metadata(struct ext2_fs
+@@ -593,13 +593,13 @@
return;
if (fs->flags & FL_IOCTL && wmeta & EXT2_META_PRIMARY) {
@@ -26,7 +26,7 @@
fs->sb.s_r_blocks_count = (fs->r_frac * (loff_t)fs->sb.s_blocks_count)/
100;
-@@ -663,7 +663,7 @@ static int ext2_determine_itoffset(struc
+@@ -663,7 +663,7 @@
blk_t start, itend;
if (fs->flags & FL_DEBUG)
@@ -35,7 +35,7 @@
fs->itoffset = fs->gd[0].bg_inode_table - fs->sb.s_first_data_block;
fs->stride = 0;
-@@ -772,17 +772,18 @@ int ext2_ioctl(struct ext2_fs *fs, int i
+@@ -772,17 +772,18 @@
if (fs->flags & FL_DEBUG) {
if (ioc == EXT2_IOC_GROUP_EXTEND)
@@ -59,7 +59,7 @@
msg[4096] = '\0';
perror(msg);
-@@ -797,7 +798,7 @@ static blk_t ext2_get_reserved(struct ex
+@@ -797,7 +798,7 @@
int resgdblocks;
if (fs->flags & FL_DEBUG)
@@ -68,7 +68,7 @@
/* How many blocks to reserve for each group future GDT expansion.
* This assumes Bond has the right number of blocks assigned. It
-@@ -875,7 +876,7 @@ struct ext2_fs *ext2_open(struct ext2_de
+@@ -875,7 +876,7 @@
blk_t residue;
if (flags & FL_DEBUG)
@@ -77,9 +77,9 @@
if ((fs = (struct ext2_fs *)malloc(sizeof(struct ext2_fs))) == NULL) {
fprintf(stderr, "%s: error allocating fs struct\n",
---- ext2resize-1.1.17/src/ext2_block_relocator.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2_block_relocator.c
+++ ext2resize-1.1.17/src/ext2_block_relocator.c
-@@ -360,7 +360,7 @@ static int ext2_block_relocator_copy(str
+@@ -360,7 +360,7 @@
int ret = 1;
if (fs->flags & FL_DEBUG)
@@ -88,7 +88,7 @@
if ((buf = (unsigned char *)malloc(MAXCONT << fs->logsize)) != NULL) {
int num;
-@@ -484,7 +484,7 @@ static int ext2_block_relocator_grab_blo
+@@ -484,7 +484,7 @@
ptr = 0;
if (fs->flags & FL_DEBUG)
@@ -97,7 +97,7 @@
for (group = 0, start = fs->sb.s_first_data_block;
group < fs->numgroups;
-@@ -538,7 +538,7 @@ static int ext2_block_relocator_flush(st
+@@ -538,7 +538,7 @@
return 1;
if (fs->flags & FL_DEBUG)
@@ -106,7 +106,7 @@
qsort(state->block, state->usedentries, sizeof(struct ext2_block_entry),
compare_block_entries);
-@@ -634,7 +634,7 @@ static int ext2_block_relocate_grow(stru
+@@ -634,7 +634,7 @@
int group;
if (fs->flags & FL_DEBUG)
@@ -115,7 +115,7 @@
newitoffset = fs->newgdblocks + 3;
if (fs->newgdblocks <= fs->gdblocks + fs->resgdblocks)
-@@ -797,7 +797,7 @@ static int ext2_block_relocate_shrink(st
+@@ -797,7 +797,7 @@
blk_t start;
if (fs->flags & FL_DEBUG)
@@ -124,7 +124,7 @@
state->newallocoffset = fs->itoffset + fs->inodeblocks;
ext2_read_inode(fs, EXT2_RESIZE_INO, inode);
-@@ -861,8 +861,9 @@ static int ext2_block_relocate_shrink(st
+@@ -861,8 +861,9 @@
if (j >= it && j < itend) {
if (delgrp)
continue;
@@ -136,9 +136,9 @@
j + start);
return 0;
}
---- ext2resize-1.1.17/src/ext2_buffer.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2_buffer.c
+++ ext2resize-1.1.17/src/ext2_buffer.c
-@@ -214,7 +214,7 @@ void ext2_bcache_dump(struct ext2_fs *fs
+@@ -214,7 +214,7 @@
int i;
if (fs->flags & FL_DEBUG)
@@ -147,7 +147,7 @@
for (i = 0; i < (1 << ext2_hash_bits); i++)
if (fs->bc->hash[i] != NULL) {
-@@ -265,7 +265,7 @@ int ext2_bcache_init(struct ext2_fs *fs)
+@@ -265,7 +265,7 @@
int size;
if (fs->flags & FL_DEBUG)
@@ -156,9 +156,9 @@
size = ext2_buffer_cache_pool_size >> (fs->logsize - 10);
---- ext2resize-1.1.17/src/ext2_inode_relocator.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2_inode_relocator.c
+++ ext2resize-1.1.17/src/ext2_inode_relocator.c
-@@ -511,7 +511,7 @@ int ext2_inode_relocate(struct ext2_fs *
+@@ -511,7 +511,7 @@
struct ext2_inode_relocator_state state;
if (fs->flags & FL_DEBUG)
@@ -167,9 +167,9 @@
state.usedentries = 0;
state.resolvedentries = 0;
---- ext2resize-1.1.17/src/ext2_meta.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2_meta.c
+++ ext2resize-1.1.17/src/ext2_meta.c
-@@ -86,7 +86,7 @@ int ext2_metadata_push(struct ext2_fs *f
+@@ -86,7 +86,7 @@
blk_t start;
if (fs->flags & FL_DEBUG)
@@ -178,9 +178,9 @@
new_itoffset = fs->newgdblocks + 3;
---- ext2resize-1.1.17/src/ext2_resize.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2_resize.c
+++ ext2resize-1.1.17/src/ext2_resize.c
-@@ -41,7 +41,7 @@ static int ext2_add_group(struct ext2_fs
+@@ -41,7 +41,7 @@
int i;
if (fs->flags & FL_DEBUG)
@@ -189,7 +189,7 @@
if (fs->sb.s_blocks_count !=
fs->sb.s_first_data_block + group * fs->sb.s_blocks_per_group) {
-@@ -165,7 +165,7 @@ static int ext2_del_group(struct ext2_fs
+@@ -165,7 +165,7 @@
int has_sb;
if (fs->flags & FL_DEBUG)
@@ -198,7 +198,7 @@
has_sb = ext2_bg_has_super(fs, group);
-@@ -272,7 +272,7 @@ static int ext2_grow_group(struct ext2_f
+@@ -272,7 +272,7 @@
blk_t i;
if (fs->flags & FL_DEBUG)
@@ -207,7 +207,7 @@
group = fs->numgroups - 1;
start = fs->sb.s_first_data_block + group * fs->sb.s_blocks_per_group;
-@@ -310,7 +310,7 @@ static int ext2_shrink_group(struct ext2
+@@ -310,7 +310,7 @@
int i;
if (fs->flags & FL_DEBUG)
@@ -216,7 +216,7 @@
group = fs->numgroups - 1;
-@@ -318,9 +318,9 @@ static int ext2_shrink_group(struct ext2
+@@ -318,9 +318,9 @@
bpg = fs->sb.s_blocks_count - start;
if (newsize < itend + (fs->stride ? 2 : 0)) {
@@ -229,7 +229,7 @@
return 0;
}
-@@ -368,7 +368,7 @@ static int ext2_grow_fs(struct ext2_fs *
+@@ -368,7 +368,7 @@
blk_t sizelast;
if (fs->flags & FL_DEBUG)
@@ -238,7 +238,7 @@
if (!ext2_block_relocate(fs))
return 0;
-@@ -407,7 +407,7 @@ static int ext2_grow_fs(struct ext2_fs *
+@@ -407,7 +407,7 @@
static int ext2_shrink_fs(struct ext2_fs *fs)
{
if (fs->flags & FL_DEBUG)
@@ -247,7 +247,7 @@
if (fs->sb.s_blocks_count - fs->sb.s_free_blocks_count + fs->itoffset >
fs->newblocks) {
-@@ -458,7 +458,7 @@ int ext2_resize_fs(struct ext2_fs *fs)
+@@ -458,7 +458,7 @@
int status;
if (fs->flags & FL_DEBUG)
@@ -256,9 +256,9 @@
if (fs->newblocks == fs->sb.s_blocks_count) {
fprintf(stderr, "%s: new size is same as current (%u)\n",
---- ext2resize-1.1.17/src/ext2prepare.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2prepare.c
+++ ext2resize-1.1.17/src/ext2prepare.c
-@@ -136,7 +136,7 @@ int create_resize_inode(struct ext2_fs *
+@@ -136,7 +136,7 @@
blk_t block;
if (fs->flags & FL_DEBUG)
++++++ ext2resize-gettext.patch ++++++
--- configure.in
+++ configure.in
@@ -33,4 +33,5 @@
AC_CHECK_FUNCS(lseek64)
AC_CHECK_FUNCS(llseek)
-AC_OUTPUT(Makefile doc/Makefile src/Makefile)
+AM_GNU_GETTEXT
+AC_OUTPUT(Makefile doc/Makefile src/Makefile)
++++++ ext2resize-nofallback.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,6 @@
---- e2fsprogs-1.35/ext2resize-1.1.17/src/ext2online.c.=K0003=.orig
-+++ e2fsprogs-1.35/ext2resize-1.1.17/src/ext2online.c
-@@ -506,9 +506,9 @@ static blk_t ext2_online_primary(struct
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/ext2online.c
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/ext2online.c
+@@ -509,9 +509,9 @@
*/
if (ext2_ioctl(fs, EXT2_IOC_GROUP_EXTEND, &size))
fs->flags |= FL_IOCTL;
++++++ ext2resize-nowrite.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,6 @@
---- e2fsprogs-1.35/ext2resize-1.1.17/src/ext2_unix_io.c.=K0004=.orig
-+++ e2fsprogs-1.35/ext2resize-1.1.17/src/ext2_unix_io.c
-@@ -256,7 +256,7 @@ struct ext2_dev_handle *ext2_make_dev_ha
+--- e2fsprogs-1.38/ext2resize-1.1.17/src/ext2_unix_io.c
++++ e2fsprogs-1.38/ext2resize-1.1.17/src/ext2_unix_io.c
+@@ -256,7 +256,7 @@
goto error_free_cookie;
}
@@ -9,7 +9,7 @@
char msg[4097];
snprintf(msg, 4096, "%s: writing %s", prog, dev);
-@@ -301,7 +301,7 @@ struct ext2_dev_handle *ext2_make_dev_ha
+@@ -301,7 +301,7 @@
return dh;
error_close_write:
++++++ ext2resize-printf-format-fixes.patch ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,6 +1,6 @@
---- ext2resize-1.1.17/src/ext2_unix_io.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2_unix_io.c
+++ ext2resize-1.1.17/src/ext2_unix_io.c
-@@ -152,16 +152,16 @@ static void do_direct_read(void *cookie,
+@@ -152,16 +152,16 @@
if (monster->readoff != offset) {
if (ext2_llseek(monster->fdread, offset, SEEK_SET) < 0) {
@@ -21,7 +21,7 @@
exit(99);
}
monster->readoff = offset + numbytes;
-@@ -191,14 +191,14 @@ static void do_direct_write(void *cookie
+@@ -191,14 +191,14 @@
if (monster->writeoff != offset) {
if (ext2_llseek(monster->fdwrite, offset, SEEK_SET) < 0) {
@@ -38,7 +38,7 @@
strerror(errno), ret, numbytes, offset);
exit(99);
}
-@@ -276,14 +276,14 @@ struct ext2_dev_handle *ext2_make_dev_ha
+@@ -276,14 +276,14 @@
snprintf(tmp, 4096, "%s/ioctlXXXXXX", dir);
tmp[4097] = '\0';
if ((monster->fdroot = mkstemp(tmp)) < 0) {
@@ -55,9 +55,9 @@
strerror(errno));
goto error_close_write;
}
---- ext2resize-1.1.17/src/ext2online.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2online.c
+++ ext2resize-1.1.17/src/ext2online.c
-@@ -320,9 +320,9 @@ static blk_t ext2_make_group(struct ext2
+@@ -320,9 +320,9 @@
group / (fs->blocksize/sizeof(struct ext2_group_desc)));
if(bh == NULL)
{
@@ -70,9 +70,9 @@
return 0;
}
gdp = (struct ext2_group_desc *)bh->data +
---- ext2resize-1.1.17/src/ext2prepare.c.=K0000=.orig
+--- ext2resize-1.1.17/src/ext2prepare.c
+++ ext2resize-1.1.17/src/ext2prepare.c
-@@ -306,8 +306,8 @@ int main(int argc, char *argv[])
+@@ -306,8 +306,8 @@
return 2;
if (!(flags & FL_QUIET))
++++++ owner_change.diff ++++++
--- /var/tmp/diff_new_pack.2c4ZNY/_old 2006-08-11 15:47:08.000000000 +0200
+++ /var/tmp/diff_new_pack.2c4ZNY/_new 2006-08-11 15:47:08.000000000 +0200
@@ -1,28 +0,0 @@
---- e2fsprogs-1.34/MCONFIG.in
-+++ e2fsprogs-1.34/MCONFIG.in
-@@ -138,17 +138,17 @@
- #
- # Installation user and groups
- #
--BINGRP= bin
--BINOWN= bin
-+BINGRP= root
-+BINOWN= root
- BINMODE= 555
--INCGRP= bin
--INCOWN= bin
-+INCGRP= root
-+INCOWN= root
- INCMODE= 444
--LIBOWN= bin
--LIBGRP= bin
-+LIBOWN= root
-+LIBGRP= root
- LIBMODE= 444
--MANGRP= bin
--MANOWN= bin
-+MANGRP= root
-+MANOWN= root
- MANMODE= 444
-
- #
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...