rpm/e2fsprogs
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=19

Browse Source
This commit is contained in:
OBS User unknown 2008-02-01 20:29:19 +00:00 committed by Git OBS Bridge
parent 4e651311e8
commit 8dc54a5ea6
24 changed files with 307 additions and 573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
close.patch
View File

@ -1,10 +0,0 @@
--- e2fsprogs-1.39/lib/ext2fs/closefs.c
+++ e2fsprogs-1.39/lib/ext2fs/closefs.c
@@ -217,6 +217,7 @@
EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+ super_shadow = fs->super;
fs_state = fs->super->s_state;
fs->super->s_wtime = fs->now ? fs->now : time(NULL);

43
e2fsprogs-1.33-codecleanup.diff
View File

@ -1,43 +0,0 @@
--- lib/ext2fs/dirhash.c
+++ lib/ext2fs/dirhash.c
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include "ext2_fs.h"
#include "ext2fs.h"
--- lib/ext2fs/ext2fs.h
+++ lib/ext2fs/ext2fs.h
@@ -59,6 +59,7 @@
#endif
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <string.h>
--- resize/resize2fs.h
+++ resize/resize2fs.h
@@ -21,9 +21,18 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
#endif
+
#if HAVE_ERRNO_H
#include <errno.h>
#endif

30
e2fsprogs-1.33-fsckdevdisplay.diff
View File

@ -1,30 +0,0 @@
--- e2fsck/unix.c
+++ e2fsck/unix.c
@@ -995,8 +995,13 @@
*/
if (ctx->device_name == 0 &&
(sb->s_volume_name[0] != 0)) {
- ctx->device_name = string_copy(ctx, sb->s_volume_name,
- sizeof(sb->s_volume_name));
+ ctx->device_name = malloc(sizeof(sb->s_volume_name)+4+
+ (ctx->filesystem_name?strlen(ctx->filesystem_name):1));
+ if (ctx->device_name) {
+ sprintf (ctx->device_name, "%s (%s)",
+ sb->s_volume_name,
+ (ctx->filesystem_name? ctx->filesystem_name: "?"));
+ }
}
if (ctx->device_name == 0)
ctx->device_name = ctx->filesystem_name;
--- misc/fsck.c
+++ misc/fsck.c
@@ -615,6 +615,9 @@
status = EXIT_ERROR;
}
inst->exit_status = status;
+ if (status > 1)
+ printf(_("%s %s failed (status 0x%x). Run manually!\n"),
+ inst->prog, inst->device, status);
if (progress && (inst->flags & FLAG_PROGRESS) &&
!progress_active()) {
for (inst2 = instance_list; inst2; inst2 = inst2->next) {

21
e2fsprogs-1.35-libdir.diff
View File

@ -1,21 +0,0 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -611,6 +611,7 @@ if test $cross_compiling = no; then
else
AC_CHECK_PROGS(BUILD_CC, gcc cc)
fi
+AC_HEADER_TIME
AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h stdint.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disklabel.h sys/ioctl.h sys/mman.h sys/mkdev.h sys/prctl.h sys/queue.h sys/sockio.h sys/socket.h sys/sysmacros.h sys/time.h sys/stat.h sys/types.h sys/wait.h sys/resource.h sys/syscall.h net/if_dl.h netinet/in.h utime.h)
AC_CHECK_HEADERS(sys/disk.h sys/mount.h,,,
[[
@@ -820,7 +821,7 @@ if test "$root_prefix" = NONE ; then
else
root_bindir='${root_prefix}/bin'
root_sbindir='${root_prefix}/sbin'
- root_libdir='${root_prefix}/lib'
+ root_libdir='${root_prefix}/$(lib)'
root_sysconfdir='${root_prefix}/etc'
fi
AC_SUBST(root_prefix)

11
e2fsprogs-1.39-resize2fs_manpage.patch
View File

@ -1,11 +0,0 @@
--- resize/resize2fs.8.in
+++ resize/resize2fs.8.in
@@ -60,7 +60,7 @@
The
.B resize2fs
program does not manipulate the size of partitions. If you wish to enlarge
-a filesystem, you must first make sure you can expand the size of the
+a filesystem, you must make sure you can expand the size of the
underlying partition first. This can be done using
.BR fdisk (8)
by deleting the partition and recreating it with a larger size or using

13
e2fsprogs-1.40.4-uuid_null.patch
View File

@ -1,13 +0,0 @@
Index: e2fsprogs-1.40.4/lib/uuid/gen_uuid.c
===================================================================
--- e2fsprogs-1.40.4.orig/lib/uuid/gen_uuid.c
+++ e2fsprogs-1.40.4/lib/uuid/gen_uuid.c
@@ -409,7 +409,7 @@ static int get_uuid_via_daemon(int op, u
access_ret = access(uuidd_path, X_OK);
if (access_ret == 0 && start_attempts++ < 5) {
if ((pid = fork()) == 0) {
- execl(uuidd_path, "uuidd", "-qT", "300", 0);
+ execl(uuidd_path, "uuidd", "-qT", "300", NULL);
exit(1);
}
(void) waitpid(pid, 0, 0);

3
e2fsprogs-1.40.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd033d3199d172130d38647d3a5f8003bd0719e6288e54889b00ccbadc52f783
size 3642074

13
e2fsprogs-1.40.5-blkid_cache_file_env.patch Normal file
View File

@ -0,0 +1,13 @@
Index: e2fsprogs-1.40.5/lib/blkid/libblkid.3.in
===================================================================
--- e2fsprogs-1.40.5.orig/lib/blkid/libblkid.3.in
+++ e2fsprogs-1.40.5/lib/blkid/libblkid.3.in
@@ -29,6 +29,8 @@ and is verified to still be valid before
(if the user has read permission on the raw block device, otherwise not).
The cache file also allows unprivileged users (normally anyone other
than root, or those not in the "disk" group) to locate devices by label/id.
+The standard location of the cache file can be overridden by the
+environment variable BLKID_FILE.
.P
In situations where one is getting information about a single known device,
it does not impact performance whether the cache is used or not (unless you

3
e2fsprogs-1.40.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5da54aa4324d78438bcf3d0de24b6a8045426cb63acf5a003a8f8d8c21c2d9bb
size 3635871

29
e2fsprogs-blkid.diff
View File

@ -1,29 +0,0 @@
--- misc/fsck.8.in
+++ misc/fsck.8.in
@@ -391,6 +391,15 @@
.B /etc/fstab
file. It is also useful for developers who are testing
.BR fsck .
+.TP
+.B BLKID_FILE
+This environment variable allows the early boot scripts
+to override the standard location of the
+.B /etc/blkid.tab
+file. This file contains a mapping between UUID, LABEL and TYPE
+values to device nodes. The information in the blkid.tab might
+be stale after a reboot if hardware was changed or disks were
+added or removed.
.SH SEE ALSO
.BR fstab (5),
.BR mkfs (8),
--- misc/fsck.c
+++ misc/fsck.c
@@ -1243,7 +1243,7 @@
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
- blkid_get_cache(&cache, NULL);
+ blkid_get_cache(&cache, getenv("BLKID_FILE"));
PRS(argc, argv);
if (!notitle)

86
e2fsprogs-blkid_probe_hfsplus.patch
View File

@ -1,86 +0,0 @@
Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/blkid/probe.c
===================================================================
--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/blkid/probe.c
+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/blkid/probe.c
@@ -725,6 +725,19 @@ static int probe_gfs2(struct blkid_probe
return 1;
}
+static int probe_hfsplus(struct blkid_probe *probe,
+ struct blkid_magic *id __BLKID_ATTR((unused)),
+ unsigned char *buf)
+{
+ struct hfs_mdb *sbd = (struct hfs_mdb *)buf;
+
+ /* Check for a HFS+ volume embedded in a HFS volume */
+ if (memcmp(sbd->embed_sig, "H+", 2) == 0)
+ return 0;
+
+ return 1;
+}
+
/*
* BLKID_BLK_OFFS is at least as large as the highest bim_kboff defined
* in the type_array table below + bim_kbalign.
@@ -782,6 +795,8 @@ static struct blkid_magic type_array[] =
{ "iso9660", 32, 1, 5, "CD001", probe_iso9660 },
{ "iso9660", 32, 9, 5, "CDROM", probe_iso9660 },
{ "jfs", 32, 0, 4, "JFS1", probe_jfs },
+ { "hfsplus", 1, 0, 2, "BD", probe_hfsplus },
+ { "hfsplus", 1, 0, 2, "H+", 0 },
{ "hfs", 1, 0, 2, "BD", 0 },
{ "ufs", 8, 0x55c, 4, "T\031\001\000", 0 },
{ "hpfs", 8, 0, 4, "I\350\225\371", 0 },
Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/blkid/probe.h
===================================================================
--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/blkid/probe.h
+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/blkid/probe.h
@@ -395,6 +395,48 @@ struct gfs2_sb {
/* In gfs1, quota and license dinodes followed */
};
+/* HFS / HFS+ */
+struct hfs_finder_info {
+ __u32 boot_folder;
+ __u32 start_app;
+ __u32 open_folder;
+ __u32 os9_folder;
+ __u32 reserved;
+ __u32 osx_folder;
+ __u8 id[8];
+} __attribute__((packed));
+
+struct hfs_mdb {
+ __u8 signature[2];
+ __u32 cr_date;
+ __u32 ls_Mod;
+ __u16 atrb;
+ __u16 nm_fls;
+ __u16 vbm_st;
+ __u16 alloc_ptr;
+ __u16 nm_al_blks;
+ __u32 al_blk_size;
+ __u32 clp_size;
+ __u16 al_bl_st;
+ __u32 nxt_cnid;
+ __u16 free_bks;
+ __u8 label_len;
+ __u8 label[27];
+ __u32 vol_bkup;
+ __u16 vol_seq_num;
+ __u32 wr_cnt;
+ __u32 xt_clump_size;
+ __u32 ct_clump_size;
+ __u16 num_root_dirs;
+ __u32 file_count;
+ __u32 dir_count;
+ struct hfs_finder_info finder_info;
+ __u8 embed_sig[2];
+ __u16 embed_startblock;
+ __u16 embed_blockcount;
+} __attribute__((packed));
+
+
/*
* Byte swap functions
*/

64
e2fsprogs-libvolume_id-support.patch
View File

@ -1,6 +1,8 @@
--- misc/Makefile.in
Index: misc/Makefile.in
===================================================================
--- misc/Makefile.in.orig
+++ misc/Makefile.in
@@ -36,7 +36,7 @@
@@ -40,7 +40,7 @@ UUIDD_OBJS= uuidd.o
DUMPE2FS_OBJS= dumpe2fs.o
BADBLOCKS_OBJS= badblocks.o
E2IMAGE_OBJS= e2image.o
@ -9,9 +11,9 @@
BLKID_OBJS= blkid.o
FILEFRAG_OBJS= filefrag.o
@@ -57,6 +57,9 @@
@@ -62,6 +62,9 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(ST
LIBS_BLKID= $(LIBBLKID) $(LIBUUID)
DEPLIBS_BLKID= $(LIBBLKID) $(DEPLIBUUID)
DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID)
+LIBS_VOLID= -lvolume_id
+DEPLIBS_VOLID=
@ -19,7 +21,7 @@
LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
@@ -98,10 +101,6 @@
@@ -117,10 +120,6 @@ base_device: base_device.c
@$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
-DDEBUG -o base_device
@ -30,7 +32,7 @@
mklost+found: $(MKLPF_OBJS)
@echo " LD $@"
@$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
@@ -138,9 +137,9 @@
@@ -157,9 +156,9 @@ dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(
@$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
$(LIBS_E2P) $(LIBUUID) $(LIBINTL)
@ -42,7 +44,9 @@
badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
@echo " LD $@"
--- misc/base_device.c
Index: misc/base_device.c
===================================================================
--- misc/base_device.c.orig
+++ misc/base_device.c
@@ -27,6 +27,8 @@
#endif
@ -53,9 +57,11 @@
#include "fsck.h"
--- misc/fsck.8.in
Index: misc/fsck.8.in
===================================================================
--- misc/fsck.8.in.orig
+++ misc/fsck.8.in
@@ -8,7 +8,7 @@
@@ -8,7 +8,7 @@ fsck \- check and repair a Linux file sy
.SH SYNOPSIS
.B fsck
[
@ -64,7 +70,7 @@
]
[
.B \-C
@@ -236,6 +236,14 @@
@@ -236,6 +236,14 @@ in which case the progress bar informati
.B \-N
Don't execute, just show what would be done.
.TP
@ -79,7 +85,9 @@
.B \-P
When the
.B \-A
--- misc/fsck.c
Index: misc/fsck.c
===================================================================
--- misc/fsck.c.orig
+++ misc/fsck.c
@@ -59,7 +59,6 @@
#include "../version.h"
@ -89,7 +97,7 @@
#ifndef _PATH_MNTTAB
#define _PATH_MNTTAB "/etc/fstab"
@@ -118,7 +117,6 @@
@@ -118,7 +117,6 @@ struct fs_info *filesys_info = NULL, *fi
struct fsck_instance *instance_list;
const char *fsck_prefix_path = "/sbin:/sbin/fs.d:/sbin/fs:/etc/fs:/etc";
char *fsck_path = 0;
@ -97,7 +105,7 @@
static char *string_copy(const char *s)
{
@@ -297,7 +295,7 @@
@@ -294,7 +292,7 @@ static int parse_fstab_line(char *line,
parse_escape(freq);
parse_escape(passno);
@ -106,7 +114,7 @@
if (dev)
device = dev;
@@ -322,7 +320,7 @@
@@ -319,7 +317,7 @@ static void interpret_type(struct fs_inf
if (strcmp(fs->type, "auto") != 0)
return;
@ -115,7 +123,7 @@
if (t) {
free(fs->type);
fs->type = t;
@@ -1048,7 +1046,7 @@
@@ -1058,7 +1056,7 @@ static int check_all(NOARGS)
static void usage(NOARGS)
{
@ -124,7 +132,7 @@
exit(EXIT_USAGE);
}
@@ -1094,7 +1092,7 @@
@@ -1104,7 +1102,7 @@ static void PRS(int argc, char *argv[])
progname);
exit(EXIT_ERROR);
}
@ -133,16 +141,16 @@
if (!dev && strchr(arg, '=')) {
/*
* Check to see if we failed because
@@ -1240,7 +1238,7 @@
@@ -1250,7 +1248,7 @@ int main(int argc, char *argv[])
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
- blkid_get_cache(&cache, getenv("BLKID_FILE"));
+ fsck_get_cache(getenv("BLKID_FILE"));
- blkid_get_cache(&cache, NULL);
+ fsck_get_cache(NULL);
PRS(argc, argv);
if (!notitle)
@@ -1287,6 +1285,16 @@
@@ -1297,6 +1295,16 @@ int main(int argc, char *argv[])
break;
}
fs = lookup(devices[i]);
@ -159,7 +167,7 @@
if (!fs) {
fs = create_fs_device(devices[i], 0, "auto",
0, -1, -1);
@@ -1309,6 +1317,6 @@
@@ -1319,6 +1327,6 @@ int main(int argc, char *argv[])
}
status |= wait_many(FLAG_WAIT_ALL);
free(fsck_path);
@ -167,9 +175,11 @@
+ fsck_put_cache();
return status;
}
--- misc/fsck.h
Index: misc/fsck.h
===================================================================
--- misc/fsck.h.orig
+++ misc/fsck.h
@@ -68,3 +68,9 @@
@@ -68,3 +68,9 @@ struct fsck_instance {
extern dev_t base_devt(const char *device);
extern int match_device(const char *dev1, const char *dev2);
@ -179,7 +189,9 @@
+extern char *fsck_get_devname(const char *device);
+extern char *fsck_get_fstype(const char *device);
+
--- misc/fsck_blkid.c
Index: misc/fsck_blkid.c
===================================================================
--- /dev/null
+++ misc/fsck_blkid.c
@@ -0,0 +1,29 @@
+/*
@ -211,7 +223,9 @@
+ return blkid_get_tag_value(cache, "TYPE", device);
+}
+
--- misc/fsck_udev.c
Index: misc/fsck_udev.c
===================================================================
--- /dev/null
+++ misc/fsck_udev.c
@@ -0,0 +1,188 @@
+/*

11
e2fsprogs-mkinstalldirs.patch
View File

@ -1,11 +0,0 @@
--- MCONFIG.in
+++ MCONFIG.in
@@ -62,7 +62,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = mkdir -p
#
# Library definitions

222
e2fsprogs-no_cmd_hiding.patch
View File

@ -1,7 +1,7 @@
Index: e2fsprogs-1.40.4/lib/Makefile.elf-lib
Index: e2fsprogs-1.40.5/lib/Makefile.elf-lib
===================================================================
--- e2fsprogs-1.40.4.orig/lib/Makefile.elf-lib
+++ e2fsprogs-1.40.4/lib/Makefile.elf-lib
--- e2fsprogs-1.40.5.orig/lib/Makefile.elf-lib
+++ e2fsprogs-1.40.5/lib/Makefile.elf-lib
@@ -15,7 +15,7 @@ all:: image
real-subdirs:: Makefile
@ -11,84 +11,37 @@ Index: e2fsprogs-1.40.4/lib/Makefile.elf-lib
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -24,28 +24,28 @@ image: $(ELF_LIB)
$(ELF_LIB): $(OBJS)
@echo " GEN_ELF_SOLIB $(ELF_LIB)"
- @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+ (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
- @$(MV) elfshared/$(ELF_LIB) .
- @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
- @$(LN) $(ELF_LIB) ../$(ELF_LIB)
- @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
- @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+ $(MV) elfshared/$(ELF_LIB) .
+ $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+ $(LN) $(ELF_LIB) ../$(ELF_LIB)
+ $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
+ $(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
installdirs-elf-lib::
@echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
@echo " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
- @$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+ $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
@echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
- @$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
+ $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
@echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
- @$(LN_S) -f `echo $(libdir)|sed -e 's,//*[^/][^/]*,/..,g' -e s,/,,`$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+ $(LN_S) -f `echo $(libdir)|sed -e 's,//*[^/][^/]*,/..,g' -e s,/,,`$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
@echo " LDCONFIG"
@-$(LDCONFIG)
Index: e2fsprogs-1.40.4/lib/ext2fs/Makefile.in
Index: e2fsprogs-1.40.5/lib/ext2fs/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/lib/ext2fs/Makefile.in
+++ e2fsprogs-1.40.4/lib/ext2fs/Makefile.in
@@ -164,8 +164,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
--- e2fsprogs-1.40.5.orig/lib/ext2fs/Makefile.in
+++ e2fsprogs-1.40.5/lib/ext2fs/Makefile.in
@@ -162,12 +162,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
all:: ext2fs.pc
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@@ -176,74 +175,59 @@ COMPILE_ET=../et/compile_et --build-tree
DISTFILES= Makefile *.c *.h image
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in
- @echo " SUBST $@"
- @$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
+ $(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
COMPILE_ET=../et/compile_et --build-tree
ext2_err.c ext2_err.h: ext2_err.et
- @echo " COMPILE_ET ext2_err.et"
- @$(COMPILE_ET) ext2_err.et
+ $(COMPILE_ET) ext2_err.et
@@ -187,61 +186,49 @@ ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_
ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
tst_badblocks: tst_badblocks.o freefs.o \
tst_badblocks: tst_badblocks.o freefs.o bitmaps.o rw_bitmaps.o \
read_bb_file.o write_bb_file.o badblocks.o
- @echo " LD $@"
- @$(CC) -o tst_badblocks tst_badblocks.o freefs.o \
+ $(CC) -o tst_badblocks tst_badblocks.o freefs.o \
read_bb_file.o write_bb_file.o badblocks.o \
inline.o bitops.o gen_bitmap.o $(LIBCOM_ERR)
read_bb_file.o write_bb_file.o badblocks.o rw_bitmaps.o \
inline.o bitops.o gen_bitmap.o bitmaps.o $(LIBCOM_ERR)
tst_icount: icount.c initialize.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
@ -152,9 +105,9 @@ Index: e2fsprogs-1.40.4/lib/ext2fs/Makefile.in
- @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
+ $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
check:: tst_bitops tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap \
tst_types tst_icount tst_super_size
@@ -256,13 +240,11 @@ check:: tst_bitops tst_badblocks tst_isc
check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops
@@ -252,13 +239,11 @@ check:: tst_bitops tst_badblocks tst_isc
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size
installdirs::
@ -170,10 +123,10 @@ Index: e2fsprogs-1.40.4/lib/ext2fs/Makefile.in
@-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
@$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
@for i in $(HFILES); do \
Index: e2fsprogs-1.40.4/lib/blkid/Makefile.in
Index: e2fsprogs-1.40.5/lib/blkid/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/lib/blkid/Makefile.in
+++ e2fsprogs-1.40.4/lib/blkid/Makefile.in
--- e2fsprogs-1.40.5.orig/lib/blkid/Makefile.in
+++ e2fsprogs-1.40.5/lib/blkid/Makefile.in
@@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_
DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
@ -255,10 +208,10 @@ Index: e2fsprogs-1.40.4/lib/blkid/Makefile.in
test_probe: test_probe.in Makefile
@echo "Creating test_probe..."
Index: e2fsprogs-1.40.4/lib/e2p/Makefile.in
Index: e2fsprogs-1.40.5/lib/e2p/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/lib/e2p/Makefile.in
+++ e2fsprogs-1.40.4/lib/e2p/Makefile.in
--- e2fsprogs-1.40.5.orig/lib/e2p/Makefile.in
+++ e2fsprogs-1.40.5/lib/e2p/Makefile.in
@@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
@ -279,20 +232,28 @@ Index: e2fsprogs-1.40.4/lib/e2p/Makefile.in
$(srcdir)/ostype.c $(ALL_CFLAGS)
check:: tst_ostype
Index: e2fsprogs-1.40.4/lib/ss/Makefile.in
Index: e2fsprogs-1.40.5/lib/ss/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/lib/ss/Makefile.in
+++ e2fsprogs-1.40.4/lib/ss/Makefile.in
@@ -37,8 +37,7 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
--- e2fsprogs-1.40.5.orig/lib/ss/Makefile.in
+++ e2fsprogs-1.40.5/lib/ss/Makefile.in
@@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
XTRA_CFLAGS= -I$(srcdir)/../et
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $<
-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(CC) $(ALL_CFLAGS) -c $<
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@ $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
# for the library
@@ -106,8 +105,7 @@ test_cmd.c: test_cmd.ct mk_cmds
@DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
@ -315,20 +276,21 @@ Index: e2fsprogs-1.40.4/lib/ss/Makefile.in
ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status
@echo " CONFIG.STATUS $@"
@@ -164,8 +161,7 @@ uninstall::
@@ -164,8 +161,8 @@ uninstall::
$(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
test_ss: test_ss.o test_cmd.o $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
test_ss: test_ss.o test_cmd.o $(LIBSS) $(LIBCOM_ERR)
- @echo " LD $@"
- @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
+ echo " LD $@"
+ $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
$(LIBSS) $(LIBCOM_ERR)
check:: all test_ss
Index: e2fsprogs-1.40.4/lib/uuid/Makefile.in
Index: e2fsprogs-1.40.5/lib/uuid/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/lib/uuid/Makefile.in
+++ e2fsprogs-1.40.4/lib/uuid/Makefile.in
--- e2fsprogs-1.40.5.orig/lib/uuid/Makefile.in
+++ e2fsprogs-1.40.5/lib/uuid/Makefile.in
@@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
@ -413,10 +375,10 @@ Index: e2fsprogs-1.40.4/lib/uuid/Makefile.in
uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
@echo " CONFIG.STATUS $@"
Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
Index: e2fsprogs-1.40.5/e2fsck/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/e2fsck/Makefile.in
+++ e2fsprogs-1.40.4/e2fsck/Makefile.in
--- e2fsprogs-1.40.5.orig/e2fsck/Makefile.in
+++ e2fsprogs-1.40.5/e2fsck/Makefile.in
@@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
@ -429,29 +391,20 @@ Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
#
# Flags for using Checker
@@ -109,53 +108,43 @@ all:: profiled $(PROGS) e2fsck.shared $(
@PROFILE_CMT@all:: e2fsck.profiled
@@ -112,45 +111,36 @@ prof_err.c prof_err.h: prof_err.et
@$(COMPILE_ET) $(srcdir)/prof_err.et
prof_err.c prof_err.h: prof_err.et
- @echo " COMPILE_ET prof_err.et"
- @$(COMPILE_ET) $(srcdir)/prof_err.et
+ $(COMPILE_ET) $(srcdir)/prof_err.et
e2fsck: $(OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
+ $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
e2fsck: e2fsck.@E2FSCK_TYPE@
@echo " CP $@"
@$(CP) e2fsck.@E2FSCK_TYPE@ e2fsck
e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
+ $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
$(STATIC_LIBS)
e2fsck.shared: $(OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(LIBS)
+ $(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(LIBS)
e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
@ -493,7 +446,7 @@ Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \
$(ALL_CFLAGS)
@@ -164,16 +153,13 @@ profiled:
@@ -159,16 +149,13 @@ profiled:
@PROFILE_CMT@ @mkdir profiled
e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
@ -513,7 +466,7 @@ Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
install: $(PROGS) $(MANPAGES) installdirs
@@ -181,11 +167,9 @@ install: $(PROGS) $(MANPAGES) installdir
@@ -176,11 +163,9 @@ install: $(PROGS) $(MANPAGES) installdir
echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
@ -527,7 +480,7 @@ Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
$(DESTDIR)$(root_sbindir)/fsck.ext3
@for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
@@ -201,11 +185,9 @@ install: $(PROGS) $(MANPAGES) installdir
@@ -196,11 +181,9 @@ install: $(PROGS) $(MANPAGES) installdir
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
@ -541,10 +494,10 @@ Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
$(DESTDIR)$(man8dir)/fsck.ext3.8
install-strip: install
Index: e2fsprogs-1.40.4/debugfs/Makefile.in
Index: e2fsprogs-1.40.5/debugfs/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/debugfs/Makefile.in
+++ e2fsprogs-1.40.4/debugfs/Makefile.in
--- e2fsprogs-1.40.5.orig/debugfs/Makefile.in
+++ e2fsprogs-1.40.5/debugfs/Makefile.in
@@ -30,26 +30,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(
DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
@ -577,10 +530,10 @@ Index: e2fsprogs-1.40.4/debugfs/Makefile.in
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
Index: e2fsprogs-1.40.4/resize/Makefile.in
Index: e2fsprogs-1.40.5/resize/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/resize/Makefile.in
+++ e2fsprogs-1.40.4/resize/Makefile.in
--- e2fsprogs-1.40.5.orig/resize/Makefile.in
+++ e2fsprogs-1.40.5/resize/Makefile.in
@@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L
STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
@ -619,10 +572,10 @@ Index: e2fsprogs-1.40.4/resize/Makefile.in
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
Index: e2fsprogs-1.40.4/util/Makefile.in
Index: e2fsprogs-1.40.5/util/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/util/Makefile.in
+++ e2fsprogs-1.40.4/util/Makefile.in
--- e2fsprogs-1.40.5.orig/util/Makefile.in
+++ e2fsprogs-1.40.5/util/Makefile.in
@@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c
@MCONFIG@
@ -647,10 +600,10 @@ Index: e2fsprogs-1.40.4/util/Makefile.in
gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
@echo " CONFIG.STATUS $@"
Index: e2fsprogs-1.40.4/tests/progs/Makefile.in
Index: e2fsprogs-1.40.5/tests/progs/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/tests/progs/Makefile.in
+++ e2fsprogs-1.40.4/tests/progs/Makefile.in
--- e2fsprogs-1.40.5.orig/tests/progs/Makefile.in
+++ e2fsprogs-1.40.5/tests/progs/Makefile.in
@@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR
DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
@ -683,10 +636,10 @@ Index: e2fsprogs-1.40.4/tests/progs/Makefile.in
clean:
$(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \
Index: e2fsprogs-1.40.4/lib/et/Makefile.in
Index: e2fsprogs-1.40.5/lib/et/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/lib/et/Makefile.in
+++ e2fsprogs-1.40.4/lib/et/Makefile.in
--- e2fsprogs-1.40.5.orig/lib/et/Makefile.in
+++ e2fsprogs-1.40.5/lib/et/Makefile.in
@@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
# what to build...
#
@ -705,11 +658,11 @@ Index: e2fsprogs-1.40.4/lib/et/Makefile.in
@MAKEFILE_LIBRARY@
@MAKEFILE_ELF@
Index: e2fsprogs-1.40.4/misc/Makefile.in
Index: e2fsprogs-1.40.5/misc/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/misc/Makefile.in
+++ e2fsprogs-1.40.4/misc/Makefile.in
@@ -71,106 +71,84 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
--- e2fsprogs-1.40.5.orig/misc/Makefile.in
+++ e2fsprogs-1.40.5/misc/Makefile.in
@@ -71,8 +71,7 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
.c.o:
@ -719,15 +672,8 @@ Index: e2fsprogs-1.40.4/misc/Makefile.in
all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
$(FMANPAGES) $(LPROGS)
prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et
- @echo " COMPILE_ET prof_err.et"
- @$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
+ $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk
@echo " PROFILE_TO_C mke2fs.conf"
$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
@@ -86,91 +85,71 @@ default_profile.c: $(srcdir)/mke2fs.conf
@$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
> default_profile.c
profile.o:
- @echo " CC $<"

11
e2fsprogs-probe_reiserfs-fpe.patch
View File

@ -1,11 +0,0 @@
--- lib/blkid/probe.c
+++ lib/blkid/probe.c
@@ -422,7 +422,7 @@
blocksize = blkid_le16(rs->rs_blocksize);
/* If the superblock is inside the journal, we have the wrong one */
- if (id->bim_kboff/(blocksize>>10) > blkid_le32(rs->rs_journal_block))
+ if ((blocksize>>10) && id->bim_kboff/(blocksize>>10) > blkid_le32(rs->rs_journal_block))
return -BLKID_ERR_BIG;
/* LABEL/UUID are only valid for later versions of Reiserfs v3.6. */

15
e2fsprogs-special_make_targets.patch
View File

@ -1,15 +0,0 @@
--- 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 \

11
e2fsprogs-strncat.patch
View File

@ -1,11 +0,0 @@
--- e2fsprogs-1.39/misc/e2image.c.xx 2006-12-19 11:14:32.000000000 +0100
+++ e2fsprogs-1.39/misc/e2image.c 2006-12-19 11:16:26.000000000 +0100
@@ -126,7 +126,7 @@
hdr.magic_number = EXT2_ET_MAGIC_E2IMAGE;
strcpy(hdr.magic_descriptor, "Ext2 Image 1.0");
gethostname(hdr.fs_hostname, sizeof(hdr.fs_hostname));
- strncat(hdr.fs_device_name, device_name, sizeof(hdr.fs_device_name));
+ strncat(hdr.fs_device_name, device_name, sizeof(hdr.fs_device_name)-1);
hdr.fs_device_name[sizeof(hdr.fs_device_name) - 1] = 0;
hdr.fs_blocksize = fs->blocksize;

33
e2fsprogs-uninitialized.diff
View File

@ -1,33 +0,0 @@
# bk@suse.de:
# This patch is just here to silence the (in this case) stupid gcc warning,
# where gcc says that b is used uninitialized. "may" whould have been more
# correct, but even that is wrong because as block_ind_bmap() where the
# uninitialized access could have happened, is declared static and both
# callers which gcc warns about call block_ind_bmap() with flags & ~BMAP_SET,
# which means that
# if (flags & BMAP_SET) {
# b = *ret_blk;
# which is the line which gcc offends, is never reached, so that's a clearly
# bogus "is using uninitialized" warning. Anyway, to prevent others from
# investgating again, just initialize them:
#
--- lib/ext2fs/bmap.c
+++ lib/ext2fs/bmap.c
@@ -99,7 +99,7 @@ static _BMAP_INLINE_ errcode_t block_din
int *blocks_alloc,
blk_t nr, blk_t *ret_blk)
{
- blk_t b;
+ blk_t b = 0;
errcode_t retval;
blk_t addr_per_block;
@@ -119,7 +119,7 @@ static _BMAP_INLINE_ errcode_t block_tin
int *blocks_alloc,
blk_t nr, blk_t *ret_blk)
{
- blk_t b;
+ blk_t b = 0;
errcode_t retval;
blk_t addr_per_block;

46
e2fsprogs.changes
View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Tue Jan 29 15:45:09 CET 2008 - mkoenig@suse.de
- update to version 1.40.5:
* Fix a potential overflow big in e2image
* Mke2fs will now create new filesystems with 256 byte inodes and the
ext_attr feature flag by default
* Teach e2fsck to ignore certain "safe" filesystem features which are
set automatically by the kernel
* Add support in tune2fs and mke2fs for making a filesystem as being "ok
to be used with test kernel code"
* Change e2fsck -fD so that it sorts non-htree directories by inode
numbers instead of by name, since that optimizes performances much
more significantly
* If e2image fills the disk, fix it so it exits right away
* If ftruncate64() is not available for resize2fs, let it use ftrucate()
instead
* Add support for detecting HFS+ filesystems in the blkid library
* Add supprt in the blkid library for ext4/ext4dev filesystems
* Fix a bug in blkid where it could die on a floating point exception
when presented with a corrupt reiserfs image
* Fix blkid's handling of ntfs UUID's so that leading zeros are printed
such that UUID string is a fixed length
* Fix debugfs's 'lsdel' command so it uses ext2fs_block_iterate2 so it
will work with large files
* Allow the debugfs 'undel' command to undelete an inode without linking
it to a specific destination directory
- enhance init script
- add sysconfig parameter UUIDD_ON_DEMAND_ONLY setting the startup
policy for uuidd
- remove merged and obsolete patches:
close.patch
e2fsprogs-1.33-codecleanup.diff
e2fsprogs-1.35-libdir.diff
e2fsprogs-1.39-resize2fs_manpage.patch
e2fsprogs-1.40.4-uuid_null.patch
e2fsprogs-blkid.diff
e2fsprogs-blkid_probe_hfsplus.patch
e2fsprogs-strncat.patch
elf.diff
e2fsprogs-mkinstalldirs.patch
e2fsprogs-special_make_targets.patch
e2fsprogs-probe_reiserfs-fpe.patch
e2fsprogs-1.33-fsckdevdisplay.diff
e2fsprogs-uninitialized.diff
-------------------------------------------------------------------
Wed Jan 16 11:03:14 CET 2008 - mkoenig@suse.de

143
e2fsprogs.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package e2fsprogs (Version 1.40.4)
# spec file for package e2fsprogs (Version 1.40.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -18,7 +18,7 @@ Group: System/Filesystems
Supplements: filesystem(ext2) filesystem(ext3)
PreReq: %install_info_prereq
AutoReqProv: on
Version: 1.40.4
Version: 1.40.5
Release: 1
Summary: Utilities for the Second Extended File System
Url: http://e2fsprogs.sourceforge.net
@ -26,35 +26,32 @@ Source: %{name}-%{version}.tar.bz2
Source1: de.po
Source2: README.SUSE
Source3: uuidd.rc
Patch0: elf.diff
Patch1: %{name}-1.35-libdir.diff
Patch2: %{name}-1.33-fsckdevdisplay.diff
Patch3: %{name}-1.33-codecleanup.diff
Patch4: e2fsprogs-blkid.diff
Patch6: e2fsprogs-mdraid.patch
Patch7: e2fsprogs-probe_reiserfs-fpe.patch
Patch8: e2fsprogs-base_devt.patch
Patch9: e2fsprogs-libvolume_id-support.patch
Patch10: close.patch
Patch11: fsck-ignore-mounted.patch
Patch12: e2fsprogs-mkinstalldirs.patch
Patch13: e2fsprogs-special_make_targets.patch
Patch16: e2fsprogs-1.39-resize2fs_manpage.patch
Patch17: e2fsprogs-strncat.patch
Patch20: e2fsprogs-blkid_probe_hfsplus.patch
Patch21: e2fsprogs-uninitialized.diff
Patch22: e2fsprogs-1.40.4-uuidd_pid_path.patch
Patch23: e2fsprogs-1.40.4-uuid_null.patch
Source4: sysconfig.uuidd
#
# e2fsprogs patches
#
#Patch21: e2fsprogs-uninitialized.diff
#
# 100530 - not all installed partitions offered for upgrade
Patch1: e2fsprogs-mdraid.patch
Patch2: e2fsprogs-base_devt.patch
Patch3: e2fsprogs-libvolume_id-support.patch
# 145400 - boot.localfs: Tries to check r/w mounted systems
# 146606 - /boot and other file systems mounted, not check-able after installation
Patch4: fsck-ignore-mounted.patch
Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch
Patch6: e2fsprogs-1.40.5-blkid_cache_file_env.patch
# libcom_err patches
# 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict
Patch30: libcom_err-no-static-buffer.patch
Patch31: libcom_err-no-init_error_table.patch
Patch32: libcom_err-no-e2fsck.static.patch
Patch32: libcom_err-disable_test.patch
Patch33: libcom_err-mutex.patch
Patch34: libcom_err-compile_et_permissions.patch
# Do not suppress make commands
Patch99: e2fsprogs-no_cmd_hiding.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libext2fs2 = %{version} libcom_err2 = %{version} libuuid1 = %{version} libblkid1 = %{version}
#Requires: libext2fs2 = %{version} libcom_err2 = %{version} libuuid1 = %{version} libblkid1 = %{version}
%description
Utilities needed to create and maintain ext2 and ext3 file systems
@ -184,7 +181,7 @@ Authors:
Summary: Utilities for the Second Extended File System
Group: System/Filesystems
AutoReqProv: on
PreReq: %insserv_prereq permissions pwdutils
PreReq: %fillup_prereq %insserv_prereq permissions pwdutils
%description -n uuid-runtime
Utilities needed to create and maintain ext2 and ext3 file systems
@ -234,24 +231,12 @@ Authors:
%prep
%setup -q
# e2fsprogs patches
%patch0
%patch1
%patch2
%patch3
%patch2 -p1
%patch3 -p0
%patch4
%patch6
%patch7
%patch8 -p1
%patch9 -p0
%patch10 -p1
%patch11
%patch12
%patch16
%patch17 -p1
%patch20 -p1
%patch21
%patch22 -p1
%patch23 -p1
%patch5 -p1
%patch6 -p1
# libcom_err patches
%patch30 -p1
%patch31 -p1
@ -266,23 +251,23 @@ cp %{SOURCE2} .
%build
%{?suse_update_config:%{suse_update_config -f}}
rm aclocal.m4
rm -f po/Makefile.in
gettextize --copy --force --intl
autoreconf --force --install
%if %{suse_version} > 1010
patch -p0 -i %{P:13}
%endif
./configure --enable-dynamic-e2fsck \
--prefix=%{_prefix} --with-root-prefix='' \
--mandir=%{_mandir} --infodir=%{_infodir} --libdir=%{_libdir} \
#autoreconf --force --install
./configure --prefix=%{_prefix} \
--with-root-prefix='' \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--enable-elf-shlibs \
--disable-evms \
CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
make
# recreate german .gmo file
pushd po
make de.gmo
popd
%install
make install install-libs DESTDIR=$RPM_BUILD_ROOT lib=%{_lib}
make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}
%{find_lang} %{name}
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
mkdir -p $RPM_BUILD_ROOT/var/lib/libuuid/
@ -291,6 +276,9 @@ mkdir -p $RPM_BUILD_ROOT/var/run/uuidd/
mkdir -p $RPM_BUILD_ROOT/etc/init.d/
install -m 744 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/uuidd
ln -sf ../../etc/init.d/uuidd $RPM_BUILD_ROOT/usr/sbin/rcuuidd
# fillup template
mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates
install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/
%check
make check
@ -334,6 +322,7 @@ rm -rf $RPM_BUILD_ROOT
%{stop_on_removal uuidd}
%post -n uuid-runtime
%{fillup_only -n uuidd}
%run_permissions
%postun -n uuid-runtime
@ -405,6 +394,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(-,uuidd,uuidd) %dir /var/run/uuidd
/etc/init.d/uuidd
/usr/sbin/rcuuidd
/var/adm/fillup-templates/sysconfig.uuidd
%files -n libuuid1
%defattr(-, root, root)
@ -458,6 +448,49 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/com_err.3.gz
%changelog
* Tue Jan 29 2008 mkoenig@suse.de
- update to version 1.40.5:
* Fix a potential overflow big in e2image
* Mke2fs will now create new filesystems with 256 byte inodes and the
ext_attr feature flag by default
* Teach e2fsck to ignore certain "safe" filesystem features which are
set automatically by the kernel
* Add support in tune2fs and mke2fs for making a filesystem as being "ok
to be used with test kernel code"
* Change e2fsck -fD so that it sorts non-htree directories by inode
numbers instead of by name, since that optimizes performances much
more significantly
* If e2image fills the disk, fix it so it exits right away
* If ftruncate64() is not available for resize2fs, let it use ftrucate()
instead
* Add support for detecting HFS+ filesystems in the blkid library
* Add supprt in the blkid library for ext4/ext4dev filesystems
* Fix a bug in blkid where it could die on a floating point exception
when presented with a corrupt reiserfs image
* Fix blkid's handling of ntfs UUID's so that leading zeros are printed
such that UUID string is a fixed length
* Fix debugfs's 'lsdel' command so it uses ext2fs_block_iterate2 so it
will work with large files
* Allow the debugfs 'undel' command to undelete an inode without linking
it to a specific destination directory
- enhance init script
- add sysconfig parameter UUIDD_ON_DEMAND_ONLY setting the startup
policy for uuidd
- remove merged and obsolete patches:
close.patch
e2fsprogs-1.33-codecleanup.diff
e2fsprogs-1.35-libdir.diff
e2fsprogs-1.39-resize2fs_manpage.patch
e2fsprogs-1.40.4-uuid_null.patch
e2fsprogs-blkid.diff
e2fsprogs-blkid_probe_hfsplus.patch
e2fsprogs-strncat.patch
elf.diff
e2fsprogs-mkinstalldirs.patch
e2fsprogs-special_make_targets.patch
e2fsprogs-probe_reiserfs-fpe.patch
e2fsprogs-1.33-fsckdevdisplay.diff
e2fsprogs-uninitialized.diff
* Wed Jan 16 2008 mkoenig@suse.de
- update to version 1.40.4:
* Fix potential security vulnerability (CVE-2007-5497)
@ -832,7 +865,7 @@ rm -rf $RPM_BUILD_ROOT
subpackage.
* Mon Nov 06 2000 pthomas@suse.de
- use _mandir and _infodir more consistently in spec file.
* Sun Nov 05 2000 ro@suse.de
* Mon Nov 06 2000 ro@suse.de
- renamed packages to e2fsprogs/e2fsprogs-devel
* Fri Jun 09 2000 kasal@suse.cz
- Build dynamic libraries. Partition Surprise requires them.
@ -845,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Feb 22 2000 garloff@suse.de
- Bugfix for the change ...
- ... and change version no of fsck to 1.18a to reflect the change.
* Sun Feb 20 2000 garloff@suse.de
* Mon Feb 21 2000 garloff@suse.de
- Patch to be more clever WRT to basenames (used to find out wheter
a fsck for this device is already running).
- Give better message in case fsck fails, to tell the user what to
@ -863,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT
-fixed coredump in e2fsck
* Fri Oct 29 1999 ro@suse.de
-e2fsprogs: 1.17 vital bugfix in e2fsck
* Sun Oct 24 1999 ro@suse.de
* Mon Oct 25 1999 ro@suse.de
- e2fsprogs: update to 1.16, sparse_super is default on when
called on a > 2.2 kernel, can be overridden with -O none
* Fri Oct 15 1999 garloff@suse.de
@ -889,7 +922,7 @@ rm -rf $RPM_BUILD_ROOT
- update to 1.12
* Sat Apr 26 1997 florian@suse.de
- update to new version 1.10
* Sun Apr 13 1997 florian@suse.de
* Mon Apr 14 1997 florian@suse.de
- update to new version 1.08
- do not include ext2 libs and include files as they are only used by dump
* Thu Jan 02 1997 florian@suse.de

11
elf.diff
View File

@ -1,11 +0,0 @@
--- lib/Makefile.elf-lib
+++ lib/Makefile.elf-lib
@@ -45,7 +45,7 @@
@echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
@$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
@echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
- @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+ @$(LN_S) -f `echo $(libdir)|sed -e 's,//*[^/][^/]*,/..,g' -e s,/,,`$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
@echo " LDCONFIG"
@-$(LDCONFIG)

19
libcom_err-no-e2fsck.static.patch → libcom_err-disable_test.patch
View File

@ -1,17 +1,8 @@
--- e2fsprogs-1.39/e2fsck/Makefile.in
+++ e2fsprogs-1.39/e2fsck/Makefile.in
@@ -104,7 +104,7 @@
prof_err.c \
$(MTRACE_SRC)
-all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES) $(FMANPAGES)
+all:: profiled $(PROGS) e2fsck.shared $(MANPAGES) $(FMANPAGES)
@PROFILE_CMT@all:: e2fsck.profiled
--- e2fsprogs-1.39/lib/et/Makefile.in
+++ e2fsprogs-1.39/lib/et/Makefile.in
@@ -110,16 +110,16 @@
Index: e2fsprogs-1.40.5/lib/et/Makefile.in
===================================================================
--- e2fsprogs-1.40.5.orig/lib/et/Makefile.in
+++ e2fsprogs-1.40.5/lib/et/Makefile.in
@@ -110,16 +110,16 @@ uninstall::
$(RM) -rf $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et
check:: compile_et

14
sysconfig.uuidd Normal file
View File

@ -0,0 +1,14 @@
## Path: Applications/uuidd
## Description: Start uuidd on demand only
## Type: yesno
## Default: yes
#
# uuidd is normally started upon demand only by libuuid,
# if possible. It is not necessary to start uuidd to create
# UUIDs, it is only needed if you have the special requirement
# of creating a large amount of time-based UUIDs.
# It terminates then automatically when inactive after a
# timeout of 5 minutes.
# Set this to "no" if you want to run uuidd permanently.
#
UUIDD_ON_DEMAND_ONLY="yes"

18
uuidd.rc
View File

@ -13,14 +13,16 @@
#
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
UUIDD_BIN=/usr/sbin/uuidd
UUIDD_PID_PATH=/var/run/uuidd
UUIDD_OPTIONS="-q -T 0"
test -x $UUIDD_BIN || { echo "$UUIDD_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
. /etc/rc.status
. /etc/sysconfig/uuidd
# Reset status of this service
rc_reset
@ -28,7 +30,17 @@ rc_reset
case "$1" in
start)
echo -n "Starting uuidd "
/sbin/startproc $UUIDD_BIN
if ! test -d $UUIDD_PID_PATH; then
mkdir -p $UUIDD_PID_PATH
chown uuidd:uuidd $UUIDD_PID_PATH
fi
if test "$UUIDD_ON_DEMAND_ONLY" = no; then
/sbin/startproc $UUIDD_BIN $UUIDD_OPTIONS
else
echo -n "(on demand only)"
rc_failed 6
fi
rc_status -v
;;