diff --git a/e2fsprogs-1.35-libdir.diff b/e2fsprogs-1.35-libdir.diff index 3fef9ea..d97546a 100644 --- a/e2fsprogs-1.35-libdir.diff +++ b/e2fsprogs-1.35-libdir.diff @@ -2,15 +2,15 @@ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in -@@ -569,6 +569,7 @@ if test $cross_compiling = no; then +@@ -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 net/if_dl.h netinet/in.h utime.h) + 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,,, [[ -@@ -778,7 +779,7 @@ if test "$root_prefix" = NONE ; then +@@ -820,7 +821,7 @@ if test "$root_prefix" = NONE ; then else root_bindir='${root_prefix}/bin' root_sbindir='${root_prefix}/sbin' diff --git a/e2fsprogs-1.39-uuid_duplicates.patch b/e2fsprogs-1.39-uuid_duplicates.patch deleted file mode 100644 index 5c149f2..0000000 --- a/e2fsprogs-1.39-uuid_duplicates.patch +++ /dev/null @@ -1,337 +0,0 @@ -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/Makefile.in -=================================================================== ---- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/uuid/Makefile.in -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/Makefile.in -@@ -19,6 +19,8 @@ SMANPAGES= uuid.3 uuid_clear.3 uuid_comp - OBJS= clear.o \ - compare.o \ - copy.o \ -+ pv.o \ -+ shm.o \ - gen_uuid.o \ - isnull.o \ - pack.o \ -@@ -30,6 +32,8 @@ OBJS= clear.o \ - SRCS= $(srcdir)/clear.c \ - $(srcdir)/compare.c \ - $(srcdir)/copy.c \ -+ $(srcdir)/pv.c \ -+ $(srcdir)/shm.c \ - $(srcdir)/gen_uuid.c \ - $(srcdir)/isnull.c \ - $(srcdir)/pack.c \ -@@ -82,7 +86,7 @@ tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID - - uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID) - @echo " LD $@" -- @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ -+ @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ - $(LIBUUID) - - uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/gen_uuid.c -=================================================================== ---- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/uuid/gen_uuid.c -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/gen_uuid.c -@@ -74,6 +74,10 @@ - #endif - - #include "uuidP.h" -+#include "pv.h" -+#include "shm.h" -+#include -+#include - - #ifdef HAVE_SRANDOM - #define srand(x) srandom(x) -@@ -247,54 +251,75 @@ static int get_node_id(unsigned char *no - /* Assume that the gettimeofday() has microsecond granularity */ - #define MAX_ADJUSTMENT 10 - -+static pthread_once_t m_uuid_init_guard = PTHREAD_ONCE_INIT; -+static pthread_mutex_t m_uuid_mutex = PTHREAD_MUTEX_INITIALIZER; -+static int m_uuid_sem_id = -1; -+ -+void m_uuid_init_once() -+{ -+ m_uuid_sem_id = uuid_sem_init((int)'u'); -+} -+ - static int get_clock(uint32_t *clock_high, uint32_t *clock_low, uint16_t *ret_clock_seq) - { -- static int adjustment = 0; -- static struct timeval last = {0, 0}; -- static uint16_t clock_seq; -- struct timeval tv; -- unsigned long long clock_reg; -- -+ unsigned long long clock_reg; -+ struct timeval tv; -+ static uint16_t clock_seq; -+ static int adjustment = 0; -+ -+ int shm_id = shm_init((int)'s', sizeof(struct timeval)); -+ struct timeval *clock_time = (struct timeval*)shm_addr(shm_id); -+ - try_again: - gettimeofday(&tv, 0); -- if ((last.tv_sec == 0) && (last.tv_usec == 0)) { -+ if ((clock_time->tv_sec == 0) && (clock_time->tv_usec == 0)) { - get_random_bytes(&clock_seq, sizeof(clock_seq)); - clock_seq &= 0x3FFF; -- last = tv; -- last.tv_sec--; -+ *clock_time = tv; -+ clock_time->tv_sec--; - } -- if ((tv.tv_sec < last.tv_sec) || -- ((tv.tv_sec == last.tv_sec) && -- (tv.tv_usec < last.tv_usec))) { -+ if ((tv.tv_sec < clock_time->tv_sec) || -+ ((tv.tv_sec == clock_time->tv_sec) && -+ (tv.tv_usec < clock_time->tv_usec))) { - clock_seq = (clock_seq+1) & 0x3FFF; - adjustment = 0; -- last = tv; -- } else if ((tv.tv_sec == last.tv_sec) && -- (tv.tv_usec == last.tv_usec)) { -+ *clock_time = tv; -+ } else if ((tv.tv_sec == clock_time->tv_sec) && -+ (tv.tv_usec == clock_time->tv_usec)) { - if (adjustment >= MAX_ADJUSTMENT) - goto try_again; - adjustment++; - } else { - adjustment = 0; -- last = tv; -+ *clock_time = tv; - } -- -+ -+ clock_seq = (clock_seq+1) & 0x3FFF; -+ - clock_reg = tv.tv_usec*10 + adjustment; -- clock_reg += ((unsigned long long) tv.tv_sec)*10000000; -- clock_reg += (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000; -- -+ clock_reg += ((unsigned long)tv.tv_sec)*10000000; -+ clock_reg += (((unsigned long long)0x01B21DD2) << 23) + 0x13814000; -+ - *clock_high = clock_reg >> 32; - *clock_low = clock_reg; - *ret_clock_seq = clock_seq; -+ shm_detach(clock_time); - return 0; - } - - void uuid_generate_time(uuid_t out) - { -+ pthread_mutex_lock(&m_uuid_mutex); -+ -+ pthread_once(&m_uuid_init_guard, m_uuid_init_once); -+ -+ if(m_uuid_sem_id != -1) -+ uuid_sem_P(m_uuid_sem_id); -+ - static unsigned char node_id[6]; - static int has_init = 0; - struct uuid uu; -- uint32_t clock_mid; -+ uint32_t clock_mid; - - if (!has_init) { - if (get_node_id(node_id) <= 0) { -@@ -314,6 +339,11 @@ void uuid_generate_time(uuid_t out) - uu.time_hi_and_version = ((clock_mid >> 16) & 0x0FFF) | 0x1000; - memcpy(uu.node, node_id, 6); - uuid_pack(&uu, out); -+ -+ if(m_uuid_sem_id != -1) -+ uuid_sem_V(m_uuid_sem_id); -+ -+ pthread_mutex_unlock(&m_uuid_mutex); - } - - void uuid_generate_random(uuid_t out) -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/pv.c -=================================================================== ---- /dev/null -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/pv.c -@@ -0,0 +1,88 @@ -+#include -+#include -+#include -+#include -+ -+#if defined(PV_REPORT_VERBOSE) -+#include -+ -+#define report(msg) perror(msg) -+#else -+#define report(msg) -+#endif -+#include -+ -+#include "pv.h" -+ -+int uuid_sem_init(int project_id) -+{ -+ key_t sem_key; -+ int sem_id; -+ -+ sem_key = ftok("/", project_id); -+ if(sem_key == (key_t)-1) -+ { -+ report("Can't generate semaphore key"); -+ return -1; -+ } -+ -+ sem_id = semget(sem_key, 0, 0); -+ if(sem_id == -1) -+ { -+ sem_id = semget(sem_key, 1, IPC_CREAT | IPC_EXCL | -+ S_IRUSR | S_IWUSR | S_IRGRP | -+ S_IWGRP | S_IROTH | S_IWOTH); -+ if(sem_id != -1) -+ { -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short *array; -+ struct seminfo *__buf; -+ } arg; -+ arg.val = 1; -+ -+ if(semctl(sem_id, 0, SETVAL, arg) == -1) -+ { -+ report("Can't initialize semaphore"); -+ -+ /* try to remove -- we've created it */ -+ semctl(sem_id, 0, IPC_RMID, (int)0); -+ sem_id = -1; -+ } -+ } -+ else -+ if(errno == EEXIST) -+ { -+ if( (sem_id = semget(sem_key, 0, 0)) == -1) -+ { -+ report("Can't acquire / create semahore"); -+ } -+ } -+ else -+ { -+ report("Can't neither acquire nor create semahore"); -+ } -+ } -+ return sem_id; -+} -+ -+static inline int sem_pv(int id, int op) -+{ -+ struct sembuf sb; -+ sb.sem_num = 0; -+ sb.sem_op = op; -+ sb.sem_flg = SEM_UNDO; -+ return semop(id, &sb, 1); -+} -+ -+int uuid_sem_P(int id) -+{ -+ return sem_pv(id, -1); -+} -+ -+int uuid_sem_V(int id) -+{ -+ return sem_pv(id, 1); -+} -+ -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/pv.h -=================================================================== ---- /dev/null -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/pv.h -@@ -0,0 +1,9 @@ -+#ifndef PV_H_INCLUDE_GUARD -+#define PV_H_INCLUDE_GUARD -+ -+int uuid_sem_init(int project_id); -+int uuid_sem_P(int id); -+int uuid_sem_V(int id); -+ -+#endif // PV_H_INCLUDE_GUARD -+ -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/shm.c -=================================================================== ---- /dev/null -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/shm.c -@@ -0,0 +1,55 @@ -+#include -+#include -+#include -+ -+#if defined(SHM_REPORT_VERBOSE) -+#include -+ -+#define report(msg) perror(msg) -+#else -+#define report(msg) -+#endif -+#include -+ -+#include "shm.h" -+ -+int shm_init(int project_id, size_t size) { -+ key_t key; -+ int id; -+ -+ key = ftok("/", project_id); -+ if (key == (key_t)-1) { -+ report("Can't generate shared memory key"); -+ return -1; -+ } -+ -+ id = shmget(key, 0, 0); -+ if (id == -1) { -+ id = shmget(key, size, 0666 | IPC_CREAT); -+ if (id == -1 && errno == EEXIST) { -+ if ((id = shmget(key, 0, 0)) == -1) { -+ report("Can't acquire/create shared memory"); -+ } -+ } -+ else if (id == -1) { -+ report("Can neither acquire nor create shared memory"); -+ } -+ } -+ return id; -+} -+ -+void *shm_addr(int id) { -+ void *p; -+ -+ p = shmat(id, NULL, 0); -+ if (p == (void *)-1) -+ report("Cannot attach shared memory"); -+ return p; -+} -+ -+void shm_detach(void *addr) -+{ -+ if (shmdt(addr) == -1) -+ report("Cannot detach shared memory"); -+} -+ -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/shm.h -=================================================================== ---- /dev/null -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/shm.h -@@ -0,0 +1,10 @@ -+#ifndef SHM_H_INCLUDE_GUARD -+#define SHM_H_INCLUDE_GUARD -+ -+#include -+ -+int shm_init(int project_id, size_t size); -+void *shm_addr(int id); -+void shm_detach(void *addr); -+ -+#endif // SHM_H_INCLUDE_GUARD diff --git a/e2fsprogs-1.40-be_swap_fix.patch b/e2fsprogs-1.40-be_swap_fix.patch deleted file mode 100644 index 2789624..0000000 --- a/e2fsprogs-1.40-be_swap_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit db9097caca17401313c0dc840b4ae683e5b5c1df -Author: Eric Sandeen -Date: Tue Jul 17 20:40:25 2007 -0500 - - Fix big-endian byte-swapping bug in ext2fs_swap_inode_full() - - We need to set t->i_file_acl before we test it in - ext2fs_inode_data_blocks() - - Signed-off-by: Eric Sandeen - Signed-off-by: "Theodore Ts'o" - -diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c -index a40caa9..6576c59 100644 ---- a/lib/ext2fs/swapfs.c -+++ b/lib/ext2fs/swapfs.c -@@ -150,6 +150,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t, - t->i_dtime = ext2fs_swab32(f->i_dtime); - t->i_gid = ext2fs_swab16(f->i_gid); - t->i_links_count = ext2fs_swab16(f->i_links_count); -+ t->i_file_acl = ext2fs_swab32(f->i_file_acl); - if (hostorder) - has_data_blocks = ext2fs_inode_data_blocks(fs, - (struct ext2_inode *) f); -@@ -158,7 +159,6 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t, - has_data_blocks = ext2fs_inode_data_blocks(fs, - (struct ext2_inode *) t); - t->i_flags = ext2fs_swab32(f->i_flags); -- t->i_file_acl = ext2fs_swab32(f->i_file_acl); - t->i_dir_acl = ext2fs_swab32(f->i_dir_acl); - if (!islnk || has_data_blocks ) { - for (i = 0; i < EXT2_N_BLOCKS; i++) diff --git a/e2fsprogs-1.40.2-open_fix.patch b/e2fsprogs-1.40.2-open_fix.patch deleted file mode 100644 index 1bc0260..0000000 --- a/e2fsprogs-1.40.2-open_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: e2fsprogs-1.40.2/lib/ext2fs/ismounted.c -=================================================================== ---- e2fsprogs-1.40.2.orig/lib/ext2fs/ismounted.c -+++ e2fsprogs-1.40.2/lib/ext2fs/ismounted.c -@@ -147,7 +147,7 @@ static errcode_t check_mntent_file(const - is_root: - #define TEST_FILE "/.ismount-test-file" - *mount_flags |= EXT2_MF_ISROOT; -- fd = open(TEST_FILE, O_RDWR|O_CREAT); -+ fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); - if (fd < 0) { - if (errno == EROFS) - *mount_flags |= EXT2_MF_READONLY; diff --git a/e2fsprogs-1.40.2.tar.bz2 b/e2fsprogs-1.40.2.tar.bz2 deleted file mode 100644 index 9b502f6..0000000 --- a/e2fsprogs-1.40.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88eb576688ec0c1e567fb19fd4b4cb8c8939258c50dbddd18d82536d1e9faf2f -size 3566530 diff --git a/e2fsprogs-1.40.4-uuid_null.patch b/e2fsprogs-1.40.4-uuid_null.patch new file mode 100644 index 0000000..c4f26c4 --- /dev/null +++ b/e2fsprogs-1.40.4-uuid_null.patch @@ -0,0 +1,13 @@ +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); diff --git a/e2fsprogs-1.40.4-uuidd_pid_path.patch b/e2fsprogs-1.40.4-uuidd_pid_path.patch new file mode 100644 index 0000000..7bcae03 --- /dev/null +++ b/e2fsprogs-1.40.4-uuidd_pid_path.patch @@ -0,0 +1,15 @@ +Index: e2fsprogs-1.40.4/lib/uuid/uuidd.h +=================================================================== +--- e2fsprogs-1.40.4.orig/lib/uuid/uuidd.h ++++ e2fsprogs-1.40.4/lib/uuid/uuidd.h +@@ -35,8 +35,8 @@ + #ifndef _UUID_UUIDD_H + #define _UUID_UUIDD_H + +-#define UUIDD_SOCKET_PATH "/var/lib/libuuid/request" +-#define UUIDD_PIDFILE_PATH "/var/lib/libuuid/uuidd.pid" ++#define UUIDD_SOCKET_PATH "/var/run/uuidd/request" ++#define UUIDD_PIDFILE_PATH "/var/run/uuidd/uuidd.pid" + #define UUIDD_PATH "/usr/sbin/uuidd" + + #define UUIDD_OP_GETPID 0 diff --git a/e2fsprogs-1.40.4.tar.bz2 b/e2fsprogs-1.40.4.tar.bz2 new file mode 100644 index 0000000..3ae0a2f --- /dev/null +++ b/e2fsprogs-1.40.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd033d3199d172130d38647d3a5f8003bd0719e6288e54889b00ccbadc52f783 +size 3642074 diff --git a/e2fsprogs-no_cmd_hiding.patch b/e2fsprogs-no_cmd_hiding.patch index 3fc0edc..c8964c3 100644 --- a/e2fsprogs-no_cmd_hiding.patch +++ b/e2fsprogs-no_cmd_hiding.patch @@ -1,675 +1,70 @@ -Index: debugfs/Makefile.in +Index: e2fsprogs-1.40.4/lib/Makefile.elf-lib =================================================================== ---- debugfs/Makefile.in.orig -+++ debugfs/Makefile.in -@@ -30,34 +30,29 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $( - DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) +--- e2fsprogs-1.40.4.orig/lib/Makefile.elf-lib ++++ e2fsprogs-1.40.4/lib/Makefile.elf-lib +@@ -15,7 +15,7 @@ all:: image - .c.o: -- @echo " CC $<" -- @$(CC) -c $(ALL_CFLAGS) $< -o $@ -+ $(CC) -c $(ALL_CFLAGS) $< -o $@ + real-subdirs:: Makefile + @echo " MKDIR elfshared" +- @mkdir -p elfshared ++ mkdir -p elfshared - all:: $(PROGS) $(MANPAGES) + ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION) + ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION) +@@ -24,28 +24,28 @@ image: $(ELF_LIB) - debugfs: $(DEBUG_OBJS) $(DEPLIBS) -- @echo " LD $@" -- @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) -+ $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) + $(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) - debug_cmds.c debug_cmds.h: debug_cmds.ct -- @echo " MK_CMDS $@" -- @$(MK_CMDS) $(srcdir)/debug_cmds.ct -+ $(MK_CMDS) $(srcdir)/debug_cmds.ct + installdirs-elf-lib:: + @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \ + $(DESTDIR)$(libdir) - debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 + installdirs:: installdirs-elf-lib - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) - - install: $(PROGS) $(MANPAGES) installdirs -- @for i in $(PROGS); do \ -+ for i in $(PROGS); do \ - echo " INSTALL $(root_sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done -- @for i in $(MANPAGES); do \ -+ for i in $(MANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ - done; \ -@@ -66,7 +61,7 @@ install: $(PROGS) $(MANPAGES) installdir - done - - install-strip: install -- @for i in $(PROGS); do \ -+ for i in $(PROGS); do \ - echo " STRIP $(root_sbindir)/$$i"; \ - $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ - done -Index: doc/Makefile.in + 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 =================================================================== ---- doc/Makefile.in.orig -+++ doc/Makefile.in -@@ -19,26 +19,22 @@ HTML=texi2html - all:: libext2fs.info libext2fs.dvi - - install-doc-libs: -- @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* -- @echo " MKINSTALLDIRS $(infodir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir) -- @for i in libext2fs.info* ; do \ -+ $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* -+ $(MKINSTALLDIRS) $(DESTDIR)$(infodir) -+ for i in libext2fs.info* ; do \ - echo " INSTALL_DATA $(infodir)/$$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ - done -- @echo " GZIP $(infodir)/libext2fs.info*" -- @gzip -9 $(DESTDIR)$(infodir)/libext2fs.info* -+ gzip -9 $(DESTDIR)$(infodir)/libext2fs.info* - - uninstall-doc-libs: - $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* - - libext2fs.info: $(srcdir)/libext2fs.texinfo -- @echo " MAKEINFO $@" -- -@$(INFO) $(srcdir)/libext2fs.texinfo -+ -$(INFO) $(srcdir)/libext2fs.texinfo - - libext2fs.dvi: $(srcdir)/libext2fs.texinfo -- @echo " TEXI2DVI $@" -- -@$(DVI) $(srcdir)/libext2fs.texinfo -+ -$(DVI) $(srcdir)/libext2fs.texinfo - - .PHONY: distclean - distclean:: clean -Index: e2fsck/Makefile.in -=================================================================== ---- e2fsck/Makefile.in.orig -+++ e2fsck/Makefile.in -@@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) - COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree - - .c.o: -- @echo " CC $<" -- @$(CC) -c $(ALL_CFLAGS) $< -o $@ --@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -+ $(CC) -c $(ALL_CFLAGS) $< -o $@ -+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - - # - # Flags for using Checker -@@ -109,107 +108,88 @@ all:: profiled $(PROGS) e2fsck.shared $( - @PROFILE_CMT@all:: e2fsck.profiled - - 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: e2fsck.@E2FSCK_TYPE@ -- @echo " CP $@" -- @$(CP) e2fsck.@E2FSCK_TYPE@ e2fsck -+ $(CP) e2fsck.@E2FSCK_TYPE@ e2fsck - - 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) \ -+ $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \ - $(PROFILED_LIBS) - - tst_refcount: ea_refcount.c -- @echo " LD $@" -- @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ -+ $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ - $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err - - tst_region: region.c -- @echo " LD $@" -- @$(CC) -o tst_region $(srcdir)/region.c \ -+ $(CC) -o tst_region $(srcdir)/region.c \ - $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err - - extend: extend.o -- @echo " LD $@" -- @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) -+ $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) - - flushb: flushb.o -- @echo " LD $@" -- @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) -+ $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) - - iscan: iscan.o util.o ehandler.o $(DEPLIBS) -- @echo " LD $@" -- @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) -+ $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) - - test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \ - prof_err.o profile.h $(STATIC_LIBCOM_ERR) -- @echo " LD $@" -- @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ -+ $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ - profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \ - $(ALL_CFLAGS) - - profiled: --@PROFILE_CMT@ @echo " MKDIR $@" --@PROFILE_CMT@ @mkdir profiled -+@PROFILE_CMT@@PROFILE_CMT@ mkdir profiled - - e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 - - e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.conf.5.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) - - install: $(PROGS) $(MANPAGES) installdirs -- @for i in $(PROGS); do \ -+ for i in $(PROGS); do \ - echo " INSTALL $(root_sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done -- @echo " LINK $(root_sbindir)/fsck.ext2" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext2 -- @echo " LINK $(root_sbindir)/fsck.ext3" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext3 -- @for i in $(MANPAGES); do \ -+ for i in $(MANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ - done; \ - echo " INSTALL_DATA $(man8dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ - done -- @for i in $(FMANPAGES); do \ -+ for i in $(FMANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \ - done; \ - echo " INSTALL_DATA $(man5dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ - done -- @echo " LINK $(man8dir)/fsck.ext2.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext2.8 -- @echo " LINK $(man8dir)/fsck.ext3.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext3.8 - - install-strip: install -- @for i in $(PROGS); do \ -+ for i in $(PROGS); do \ - echo " STRIP $(root_sbindir)/$$i"; \ - $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ - done -Index: intl/Makefile.in -=================================================================== ---- intl/Makefile.in.orig -+++ intl/Makefile.in -@@ -146,11 +146,9 @@ all-no-yes: libgnuintl.$la - all-no-no: - - libintl.a libgnuintl.a: $(OBJECTS) -- @rm -f $@ -- @echo " AR $@" -- @$(AR) cru $@ $(OBJECTS) -- @echo " RANLIB $@" -- @$(RANLIB) $@ -+ rm -f $@ -+ $(AR) cru $@ $(OBJECTS) -+ $(RANLIB) $@ - - libintl.la libgnuintl.la: $(OBJECTS) - $(LIBTOOL) --mode=link \ -@@ -173,8 +171,7 @@ LTV_AGE=4 - .SUFFIXES: .c .y .o .lo .sin .sed - - .c.o: -- @echo " CC $<" -- @$(COMPILE) $< -+ $(COMPILE) $< - - .y.c: - $(YACC) $(YFLAGS) --output $@ $< -@@ -228,32 +225,27 @@ intl-compat.lo: $(srcdir)/intl-compat.c - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c - - ref-add.sed: $(srcdir)/ref-add.sin -- @echo " SED ref-add.sed" -- @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed -- @mv t-ref-add.sed ref-add.sed -+ sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed -+ mv t-ref-add.sed ref-add.sed - ref-del.sed: $(srcdir)/ref-del.sin -- @echo " SED ref-del.sed" -- @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed -- @mv t-ref-del.sed ref-del.sed -+ sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed -+ mv t-ref-del.sed ref-del.sed - - INCLUDES = -I. -I$(srcdir) -I.. - - libgnuintl.h: $(srcdir)/libgnuintl.h.in -- @echo " SED libgnuintl.h " -- @sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ -+ sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ - -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ - -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ - -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ - < $(srcdir)/libgnuintl.h.in > libgnuintl.h - - libintl.h: libgnuintl.h -- @echo " CP libintl.h" -- @cp libgnuintl.h libintl.h -+ cp libgnuintl.h libintl.h - - charset.alias: $(srcdir)/config.charset -- @echo " CONFIG.CHARSET $@" -- @$(SHELL) $(srcdir)/config.charset '@host@' > t-$@ -- @mv t-$@ $@ -+ $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ -+ mv t-$@ $@ - - check: all - -@@ -264,7 +256,7 @@ check: all - # package, you have to use `configure --with-included-gettext'. - install: install-exec install-data - install-exec: all -- @if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ -+ if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ - && test '@USE_INCLUDED_LIBINTL@' = yes; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ - $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ -@@ -279,7 +271,7 @@ install-exec: all - else \ - : ; \ - fi -- @if test "$(PACKAGE)" = "gettext-tools" \ -+ if test "$(PACKAGE)" = "gettext-tools" \ - && test '@USE_INCLUDED_LIBINTL@' = no; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir); \ - $(LIBTOOL) --mode=install \ -@@ -321,7 +313,7 @@ install-exec: all - : ; \ - fi - install-data: all -- @if test "$(PACKAGE)" = "gettext-tools"; then \ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ - $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ -@@ -474,8 +466,6 @@ distclean: clean - fi - - maintainer-clean: distclean -- @echo "This command is intended for maintainers to use;" -- @echo "it deletes files that may require special tools to rebuild." - - - # GNU gettext needs not contain the file `VERSION' but contains some -Index: lib/blkid/Makefile.in -=================================================================== ---- lib/blkid/Makefile.in.orig -+++ lib/blkid/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile for libblkid -+ - # - # Copyright (C) 2001 Theodore Ts'o (tytso@mit.edu) - # -@@ -54,83 +54,64 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_ - DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) - - .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 $< -+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< - - all:: $(SMANPAGES) blkid.pc - - $(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status -- @echo " CONFIG.STATUS $@" -- @cd $(top_builddir); \ -+ cd $(top_builddir); \ - CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status - - libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3 - - tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID) -- @echo " LD $@" -- @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) -+ $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) - - tst_types: tst_types.o blkid_types.h -- @echo " LD $@" -- @$(CC) -o tst_types tst_types.o -+ $(CC) -o tst_types tst_types.o - - ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h -- @echo " CC $@" -- @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ -+ $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ - -o ../../misc/blkid.o - - blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID) -- @echo " LD $@" -- @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) -+ $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) - - test_probe: test_probe.in Makefile -- @echo "Creating test_probe..." -- @echo "#!/bin/sh" > test_probe -- @echo "SRCDIR=@srcdir@" >> test_probe -- @cat $(srcdir)/test_probe.in >> test_probe -- @chmod +x test_probe -+ cat $(srcdir)/test_probe.in >> test_probe -+ chmod +x test_probe - - check:: all tst_cache tst_dev tst_devname tst_devno tst_getsize tst_probe \ - tst_read tst_resolve tst_save tst_tag test_probe tst_types -@@ -138,33 +119,29 @@ check:: all tst_cache tst_dev tst_devnam - ./tst_types - - blkid.pc: $(srcdir)/blkid.pc.in $(top_builddir)/config.status -- @echo " CONFIG.STATUS $@" -- @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status -+ cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig - - install:: all installdirs -- @echo " INSTALL_DATA $(libdir)/libblkid.a" -- @$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a -- @-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a -- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a -- @set -e; for i in $(HFILES); do \ -+ $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a -+ -$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a -+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a -+ set -e; for i in $(HFILES); do \ - echo " INSTALL_DATA $(includedir)/blkid/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \ - done -- @set -e; for i in $(HFILES_IN); do \ -+ set -e; for i in $(HFILES_IN); do \ - echo " INSTALL_DATA $(includedir)/blkid/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \ - done -- @for i in $(SMANPAGES); do \ -+ for i in $(SMANPAGES); do \ - echo " INSTALL_DATA $(man3dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \ - done -- @echo " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc" -- @$(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc -+ $(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc - - uninstall:: - $(RM) -f $(DESTDIR)$(libdir)/libblkid.a \ -Index: lib/e2p/Makefile.in -=================================================================== ---- lib/e2p/Makefile.in.orig -+++ lib/e2p/Makefile.in -@@ -53,41 +53,35 @@ BSDLIB_INSTALL_DIR = $(root_libdir) - @MAKEFILE_CHECKER@ - - .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 $< -+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< - - e2p.pc: $(srcdir)/e2p.pc.in $(top_builddir)/config.status -- @echo " CONFIG.STATUS $@" -- @cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status -+ cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status - - tst_ostype: $(srcdir)/ostype.c -- @echo " LD $@" -- @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \ -+ $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \ - $(srcdir)/ostype.c $(ALL_CFLAGS) - - check:: tst_ostype - ./tst_ostype - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig - - install:: all installdirs -- @echo " INSTALL_DATA $(libdir)/libe2p.a" -- @$(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a -- @-$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a -- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a -- @set -e; for i in $(HFILES); do \ -+ $(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a -+ -$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a -+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a -+ set -e; for i in $(HFILES); do \ - echo " INSTALL_DATA $(includedir)/e2p/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \ - done -- @echo " INSTALL_DATA $(libdir)/pkgconfig/e2p.pc" -- @$(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc -+ $(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc - - uninstall:: - $(RM) -f $(DESTDIR)$(libdir)/libe2p.a \ -Index: lib/et/Makefile.in -=================================================================== ---- lib/et/Makefile.in.orig -+++ lib/et/Makefile.in -@@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) - # what to build... - # - .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 $< -+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< - - @MAKEFILE_LIBRARY@ - @MAKEFILE_ELF@ -@@ -55,16 +54,14 @@ BSDLIB_INSTALL_DIR = $(root_libdir) - @MAKEFILE_CHECKER@ - - compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in -- @echo " SUBST $@" -- @$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et -- @$(CHMOD) +x compile_et -+ $(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et -+ $(CHMOD) +x compile_et - - com_err.ps : com_err.dvi - com_err.dvi: com_err.texinfo - - com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status -- @echo " CONFIG.STATUS $@" -- @cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status -+ cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status - - #libcom_err.o: $(LIBOBJS) - # $(LD) -r -s -o libcom_err.o $(LIBOBJS) -@@ -74,34 +71,28 @@ TAGS: $(SRCS) - $(TAGS) $(SRCS) - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \ - $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \ - $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig - - install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc -- @echo " INSTALL_DATA $(libdir)/libcom_err.a" -- @$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a -- @-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a -- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a -- @for i in $(HFILES); do \ -+ $(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a -+ -$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a -+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a -+ for i in $(HFILES); do \ - echo " INSTALL_DATA $(includedir)/et/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \ - done -- @for i in $(SHARE_FILES); do \ -+ for i in $(SHARE_FILES); do \ - echo " INSTALL_DATA $(datadir)/et/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \ - done -- @echo " INSTALL_SCRIPT $(bindir)/compile_et" -- @$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et -- @echo " INSTALL_DATA $(man3dir)/com_err.3" -- @$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3 -- @echo " INSTALL_DATA $(man1dir)/compile_et.1" -- @$(INSTALL_DATA) $(srcdir)/compile_et.1 \ -+ $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et -+ $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3 -+ $(INSTALL_DATA) $(srcdir)/compile_et.1 \ - $(DESTDIR)$(man1dir)/compile_et.1 -- @echo " INSTALL_DATA $(libdir)/pkgconfig/com_err.pc" -- @$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc -+ $(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc - - uninstall:: - $(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \ -Index: lib/ext2fs/Makefile.in -=================================================================== ---- lib/ext2fs/Makefile.in.orig -+++ lib/ext2fs/Makefile.in -@@ -164,86 +164,70 @@ BSDLIB_INSTALL_DIR = $(root_libdir) +--- 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) 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 $< -+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< - - COMPILE_ET=../et/compile_et --build-tree - + @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 ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in @@ -759,7 +154,7 @@ Index: lib/ext2fs/Makefile.in check:: tst_bitops tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap \ tst_types tst_icount tst_super_size -@@ -256,25 +240,22 @@ check:: tst_bitops tst_badblocks tst_isc +@@ -256,13 +240,11 @@ check:: tst_bitops tst_badblocks tst_isc LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size installdirs:: @@ -771,56 +166,135 @@ Index: lib/ext2fs/Makefile.in install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc - @echo " INSTALL_DATA $(libdir)/libext2fs.a" - @$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a -- @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a -- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a -- @for i in $(HFILES); do \ + $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a -+ -$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a -+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a -+ for i in $(HFILES); do \ - echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \ - done -- @for i in $(HFILES_IN); do \ -+ for i in $(HFILES_IN); do \ - echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \ - done -- @echo " INSTALL_DATA $(libdir)/pkgconfig/ext2fs.pc" -- @$(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc -+ $(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc - - uninstall:: - $(RM) -f $(DESTDIR)$(libdir)/libext2fs.a \ -Index: lib/ss/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 =================================================================== ---- lib/ss/Makefile.in.orig -+++ lib/ss/Makefile.in -@@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds +--- e2fsprogs-1.40.4.orig/lib/blkid/Makefile.in ++++ e2fsprogs-1.40.4/lib/blkid/Makefile.in +@@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_ + DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) + + .c.o: +- @echo " CC $<" +- @$(CC) $(ALL_CFLAGS) -c $< -o $@ ++ $(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 $< +@@ -73,57 +72,44 @@ libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/ + @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3 + + tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID) +- @echo " LD $@" +- @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) + + tst_types: tst_types.o blkid_types.h +- @echo " LD $@" +- @$(CC) -o tst_types tst_types.o ++ $(CC) -o tst_types tst_types.o + + ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h +- @echo " CC $@" +- @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ ++ $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ + -o ../../misc/blkid.o + + blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID) +- @echo " LD $@" +- @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) ++ $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) + + test_probe: test_probe.in Makefile + @echo "Creating test_probe..." +Index: e2fsprogs-1.40.4/lib/e2p/Makefile.in +=================================================================== +--- e2fsprogs-1.40.4.orig/lib/e2p/Makefile.in ++++ e2fsprogs-1.40.4/lib/e2p/Makefile.in +@@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir) + @MAKEFILE_CHECKER@ + + .c.o: +- @echo " CC $<" +- @$(CC) $(ALL_CFLAGS) -c $< -o $@ ++ $(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 $< +@@ -65,8 +64,7 @@ e2p.pc: $(srcdir)/e2p.pc.in $(top_buildd + @cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status + + tst_ostype: $(srcdir)/ostype.c +- @echo " LD $@" +- @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \ ++ $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \ + $(srcdir)/ostype.c $(ALL_CFLAGS) + + check:: tst_ostype +Index: e2fsprogs-1.40.4/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 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 $< -+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< - - # for the library - -@@ -98,12 +97,10 @@ FILES= $(SRCS) $(MKCMDSFILES) $(HFILES) - all:: libss.a ss.pc # libss_p.a lint - - std_rqs.c: std_rqs.ct mk_cmds -- @echo " MK_CMDS $@" -- @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct -+ DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct + @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 $< +@@ -106,8 +105,7 @@ test_cmd.c: test_cmd.ct mk_cmds + @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct ss_err.c ss_err.h: ss_err.et - @echo " COMPILE_ET ss_err.et" @@ -829,7 +303,7 @@ Index: lib/ss/Makefile.in ct.tab.c ct.tab.h: ct.y $(RM) -f ct.tab.* y.* -@@ -116,42 +113,34 @@ ct.tab.c ct.tab.h: ct.y +@@ -120,9 +118,8 @@ ct.tab.c ct.tab.h: ct.y # $(CHMOD) -x $@ mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in @@ -840,57 +314,22 @@ Index: lib/ss/Makefile.in + $(CHMOD) +x mk_cmds ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status -- @echo " CONFIG.STATUS $@" -- @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status -+ cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status + @echo " CONFIG.STATUS $@" +@@ -164,8 +161,7 @@ uninstall:: + $(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \ - $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig + test_ss: test_ss.o test_cmd.o $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) +- @echo " LD $@" +- @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \ ++ $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \ + $(LIBSS) $(LIBCOM_ERR) - install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds ss.pc -- @echo " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a" -- @$(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a -- @-$(RANLIB) $(DESTDIR)$(libdir)/libss.a -- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a -- @$(RM) -f $(DESTDIR)$(includedir)/ss/* -- @for i in $(INSTALL_HFILES); do \ -+ $(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a -+ -$(RANLIB) $(DESTDIR)$(libdir)/libss.a -+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a -+ $(RM) -f $(DESTDIR)$(includedir)/ss/* -+ for i in $(INSTALL_HFILES); do \ - echo " INSTALL_DATA $(DESTDIR)$(includedir)/ss/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \ - done -- @echo " INSTALL_DATA $(includedir)/ss/ss_err.h" -- @$(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h -- @for i in $(SHARE_FILES); do \ -+ $(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h -+ for i in $(SHARE_FILES); do \ - echo " INSTALL_DATA $(DESTDIR)$(datadir)/ss/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \ - done -- @echo " INSTALL $(bindir)/mk_cmds" -- @$(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds -- @echo " INSTALL_DATA $(man1dir)/mk_cmds.1" -- @$(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1 -- @echo " INSTALL_DATA $(libdir)/pkgconfig/ss.pc" -- @$(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc -+ $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds -+ $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1 -+ $(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc - - uninstall:: - $(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds \ -Index: lib/uuid/Makefile.in + check:: all test_ss +Index: e2fsprogs-1.40.4/lib/uuid/Makefile.in =================================================================== ---- lib/uuid/Makefile.in.orig -+++ lib/uuid/Makefile.in -@@ -64,12 +64,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) +--- e2fsprogs-1.40.4.orig/lib/uuid/Makefile.in ++++ e2fsprogs-1.40.4/lib/uuid/Makefile.in +@@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ .c.o: @@ -908,7 +347,7 @@ Index: lib/uuid/Makefile.in all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc -@@ -77,84 +76,65 @@ $(top_builddir)/lib/uuid/uuid_types.h: $ +@@ -73,53 +72,41 @@ $(top_builddir)/lib/uuid/uuid_types.h: $ cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status tst_uuid.o: $(srcdir)/tst_uuid.c @@ -923,8 +362,8 @@ Index: lib/uuid/Makefile.in uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID) - @echo " LD $@" -- @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ -+ $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ +- @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ ++ $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ $(LIBUUID) uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in @@ -973,94 +412,304 @@ Index: lib/uuid/Makefile.in + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3 uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status -- @echo " CONFIG.STATUS $@" -- @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status -+ cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status + @echo " CONFIG.STATUS $@" +Index: e2fsprogs-1.40.4/e2fsck/Makefile.in +=================================================================== +--- e2fsprogs-1.40.4.orig/e2fsck/Makefile.in ++++ e2fsprogs-1.40.4/e2fsck/Makefile.in +@@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) + COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \ - $(DESTDIR)$(libdir)/pkgconfig + .c.o: +- @echo " CC $<" +- @$(CC) -c $(ALL_CFLAGS) $< -o $@ +-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< ++ $(CC) -c $(ALL_CFLAGS) $< -o $@ ++@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< - install:: all installdirs -- @echo " INSTALL_DATA $(libdir)/libuuid.a" -- @$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a -- @-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a -- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a -- @echo " INSTALL_DATA $(includedir)/uuid/uuid.h" -- @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h -- @for i in $(SMANPAGES); do \ -+ $(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a -+ -$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a -+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a -+ $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h -+ for i in $(SMANPAGES); do \ - $(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \ - echo " INSTALL_DATA $(man3dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \ + # + # Flags for using Checker +@@ -109,53 +108,43 @@ all:: profiled $(PROGS) e2fsck.shared $( + @PROFILE_CMT@all:: e2fsck.profiled + + 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: e2fsck.@E2FSCK_TYPE@ + @echo " CP $@" + @$(CP) e2fsck.@E2FSCK_TYPE@ e2fsck + + 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) \ ++ $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \ + $(PROFILED_LIBS) + + tst_refcount: ea_refcount.c +- @echo " LD $@" +- @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ ++ $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ + $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err + + tst_region: region.c +- @echo " LD $@" +- @$(CC) -o tst_region $(srcdir)/region.c \ ++ $(CC) -o tst_region $(srcdir)/region.c \ + $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err + + extend: extend.o +- @echo " LD $@" +- @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) ++ $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) + + flushb: flushb.o +- @echo " LD $@" +- @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) ++ $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) + + iscan: iscan.o util.o ehandler.o $(DEPLIBS) +- @echo " LD $@" +- @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) ++ $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) + + test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \ + prof_err.o profile.h $(STATIC_LIBCOM_ERR) +- @echo " LD $@" +- @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ ++ $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ + profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \ + $(ALL_CFLAGS) + +@@ -164,16 +153,13 @@ profiled: + @PROFILE_CMT@ @mkdir profiled + + e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in +- @echo " SUBST $@" +- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 ++ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 + + e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.conf.5.in +- @echo " SUBST $@" +- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 ++ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) + + install: $(PROGS) $(MANPAGES) installdirs +@@ -181,11 +167,9 @@ install: $(PROGS) $(MANPAGES) installdir + echo " INSTALL $(root_sbindir)/$$i"; \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ done -- @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ -+ $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \ - $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz -- @echo " LINK $(man3dir)/uuid_generate_random.3" -- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 -- @echo " LINK $(man3dir)/uuid_generate_time.3" -- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 -- @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" -- @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc -+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 -+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 -+ $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc +- @echo " LINK $(root_sbindir)/fsck.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext2 +- @echo " LINK $(root_sbindir)/fsck.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext3 + @for i in $(MANPAGES); do \ + for j in $(COMPRESS_EXT); do \ +@@ -201,11 +185,9 @@ install: $(PROGS) $(MANPAGES) installdir + echo " INSTALL_DATA $(man5dir)/$$i"; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ + done +- @echo " LINK $(man8dir)/fsck.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext2.8 +- @echo " LINK $(man8dir)/fsck.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext3.8 - uninstall:: - $(RM) -f $(DESTDIR)$(libdir)/libuuid.a \ -Index: Makefile.in + install-strip: install +Index: e2fsprogs-1.40.4/debugfs/Makefile.in =================================================================== ---- Makefile.in.orig -+++ Makefile.in -@@ -24,7 +24,7 @@ all:: subs - $(MAKE) docs +--- e2fsprogs-1.40.4.orig/debugfs/Makefile.in ++++ e2fsprogs-1.40.4/debugfs/Makefile.in +@@ -30,26 +30,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $( + DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) - subs: -- @for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done -+ for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done + .c.o: +- @echo " CC $<" +- @$(CC) -c $(ALL_CFLAGS) $< -o $@ ++ $(CC) -c $(ALL_CFLAGS) $< -o $@ - progs: subs all-progs-recursive - libs: subs all-libs-recursive -@@ -65,7 +65,7 @@ uninstall-libs: uninstall-libs-recursive + all:: $(PROGS) $(MANPAGES) - TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ - mostlyclean-recursive realclean-recursive: -- @for subdir in $(SUBDIRS); do \ -+ for subdir in $(SUBDIRS); do \ - if test -d $$subdir ; then \ - target=`echo $@|$(SED) 's/-recursive//'`; \ - echo making $$target in $$subdir; \ -@@ -75,7 +75,7 @@ TAGS clean-recursive distclean-recursive + debugfs: $(DEBUG_OBJS) $(DEPLIBS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) ++ $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) - all-progs-recursive install-progs-recursive install-strip-progs-recursive \ - uninstall-progs-recursive: -- @for subdir in $(PROG_SUBDIRS); do \ -+ for subdir in $(PROG_SUBDIRS); do \ - if test -d $$subdir ; then \ - target=`echo $@|$(SED) 's/-progs-recursive//'`; \ - echo making $$target in $$subdir; \ -@@ -86,7 +86,7 @@ all-progs-recursive install-progs-recurs - all-libs-recursive install-libs-recursive install-strip-libs-recursive \ - uninstall-libs-recursive install-shlibs-libs-recursive \ - install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive: -- @for subdir in $(LIB_SUBDIRS); do \ -+ for subdir in $(LIB_SUBDIRS); do \ - if test -d $$subdir ; then \ - target=`echo $@|$(SED) 's/-libs-recursive//'`; \ - echo making $$target in $$subdir; \ -Index: misc/Makefile.in + debug_cmds.c debug_cmds.h: debug_cmds.ct +- @echo " MK_CMDS $@" +- @$(MK_CMDS) $(srcdir)/debug_cmds.ct ++ $(MK_CMDS) $(srcdir)/debug_cmds.ct + + debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in +- @echo " SUBST $@" +- @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 ++ $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) + + install: $(PROGS) $(MANPAGES) installdirs +Index: e2fsprogs-1.40.4/resize/Makefile.in =================================================================== ---- misc/Makefile.in.orig -+++ misc/Makefile.in -@@ -67,174 +67,134 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) +--- e2fsprogs-1.40.4.orig/resize/Makefile.in ++++ e2fsprogs-1.40.4/resize/Makefile.in +@@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L + STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) + + .c.o: +- @echo " CC $<" +- @$(CC) -c $(ALL_CFLAGS) $< -o $@ ++ $(CC) -c $(ALL_CFLAGS) $< -o $@ + + all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) + + resize2fs: $(RESIZE_OBJS) $(DEPLIBS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) ++ $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) + + resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS) +- @echo " LD $@" +- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ ++ $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ + $(RESIZE_OBJS) $(STATIC_LIBS) + + resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in +- @echo " SUBST $@" +- @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 ++ $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 + + test_extent: $(TEST_EXTENT_OBJS) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) ++ $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) + + install: $(PROGS) $(MANPAGES) installdirs +Index: e2fsprogs-1.40.4/util/Makefile.in +=================================================================== +--- e2fsprogs-1.40.4.orig/util/Makefile.in ++++ e2fsprogs-1.40.4/util/Makefile.in +@@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c + @MCONFIG@ + + .c.o: +- @echo " CC $<" +- @$(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@ ++ $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@ + + PROGS= subst + + all:: $(PROGS) gen-tarball + + subst: subst.o +- @echo " LD $@" +- @$(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o ++ $(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o + + copy_sparse: copy_sparse.o +- @echo " LD $@" +- @$(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o ++ $(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o + + gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status + @echo " CONFIG.STATUS $@" +Index: e2fsprogs-1.40.4/tests/progs/Makefile.in +=================================================================== +--- e2fsprogs-1.40.4.orig/tests/progs/Makefile.in ++++ e2fsprogs-1.40.4/tests/progs/Makefile.in +@@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR + DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) + + .c.o: +- @echo " CC $<" +- @$(CC) -c $(ALL_CFLAGS) $< -o $@ ++ $(CC) -c $(ALL_CFLAGS) $< -o $@ + + all:: $(PROGS) + + test_rel: $(TEST_REL_OBJS) $(DEPLIBS) +- @echo " LD $@" +- @$(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) ++ $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) + + test_rel_cmds.c: test_rel_cmds.ct +- @echo " MK_CMDS $@" +- @$(MK_CMDS) $(srcdir)/test_rel_cmds.ct ++ $(MK_CMDS) $(srcdir)/test_rel_cmds.ct + + test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS) +- @echo " LD $@" +- @$(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) ++ $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) + + test_icount_cmds.c: test_icount_cmds.ct +- @echo " MK_CMDS $@" +- @$(MK_CMDS) $(srcdir)/test_icount_cmds.ct ++ $(MK_CMDS) $(srcdir)/test_icount_cmds.ct + + clean: + $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \ +Index: e2fsprogs-1.40.4/lib/et/Makefile.in +=================================================================== +--- e2fsprogs-1.40.4.orig/lib/et/Makefile.in ++++ e2fsprogs-1.40.4/lib/et/Makefile.in +@@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) + # what to build... + # + .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 $< ++@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + + @MAKEFILE_LIBRARY@ + @MAKEFILE_ELF@ +Index: e2fsprogs-1.40.4/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) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree .c.o: @@ -1077,7 +726,7 @@ Index: misc/Makefile.in + $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk -- @echo " PROFILE_TO_C mke2fs.conf" + @echo " PROFILE_TO_C mke2fs.conf" $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \ > default_profile.c profile.o: @@ -1156,6 +805,11 @@ Index: misc/Makefile.in - @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) + uuidd: $(UUIDD_OBJS) $(DEPLIBUUID) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) ++ $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) + dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ @@ -1183,298 +837,4 @@ Index: misc/Makefile.in + $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8 - - mklost+found.8: $(DEP_SUBSTITUTE) $(srcdir)/mklost+found.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8 - - mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8 - - mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5 - - e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8 - - findfs.8: $(DEP_SUBSTITUTE) $(srcdir)/findfs.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8 - - e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8 - - dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8 - - badblocks.8: $(DEP_SUBSTITUTE) $(srcdir)/badblocks.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8 - - fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 - - blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8 - - logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8 - - chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 - - lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 - - uuidgen.1: $(DEP_SUBSTITUTE) $(srcdir)/uuidgen.1.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 - - blkid.1: $(DEP_SUBSTITUTE) $(srcdir)/blkid.1.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 - - filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 - - installdirs: -- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ - $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ -Index: resize/Makefile.in -=================================================================== ---- resize/Makefile.in.orig -+++ resize/Makefile.in -@@ -34,39 +34,33 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L - STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) - - .c.o: -- @echo " CC $<" -- @$(CC) -c $(ALL_CFLAGS) $< -o $@ -+ $(CC) -c $(ALL_CFLAGS) $< -o $@ - - all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) - - resize2fs: $(RESIZE_OBJS) $(DEPLIBS) -- @echo " LD $@" -- @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) -+ $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) - - resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS) -- @echo " LD $@" -- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ -+ $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ - $(RESIZE_OBJS) $(STATIC_LIBS) - - resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in -- @echo " SUBST $@" -- @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 -+ $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 - - test_extent: $(TEST_EXTENT_OBJS) -- @echo " LD $@" -- @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) -+ $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) - - install: $(PROGS) $(MANPAGES) installdirs -- @for i in $(PROGS); do \ -+ for i in $(PROGS); do \ - echo " INSTALL $(root_sbindir)/$$i"; \ - $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ - done -- @for i in $(MANPAGES); do \ -+ for i in $(MANPAGES); do \ - for j in $(COMPRESS_EXT); do \ - $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ - done; \ -@@ -75,7 +69,7 @@ install: $(PROGS) $(MANPAGES) installdir - done - - install-strip: install -- @for i in $(PROGS); do \ -+ for i in $(PROGS); do \ - echo " STRIP $(root_sbindir)/$$i"; \ - $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ - done -@@ -93,7 +87,7 @@ test_extent.out: test_extent $(srcdir)/t - > test_extent.out - - check:: test_extent.out -- @if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \ -+ if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \ - echo "Test succeeded." ; \ - else \ - echo "Test failed!" ; \ -Index: tests/Makefile.in -=================================================================== ---- tests/Makefile.in.orig -+++ tests/Makefile.in -@@ -14,22 +14,14 @@ INSTALL = @INSTALL@ - all:: @DO_TEST_SUITE@ - - test_script: test_script.in Makefile -- @echo "Creating test_script..." -- @echo "#!/bin/sh" > test_script --@HTREE_CMT@ @echo "HTREE=y" >> test_script -- @echo 'EGREP="@EGREP@"' >> test_script -- @echo "SRCDIR=@srcdir@" >> test_script -- @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_script -- @cat $(srcdir)/test_script.in >> test_script -- @chmod +x test_script -+@HTREE_CMT@ cat $(srcdir)/test_script.in >> test_script -+ chmod +x test_script - - check:: test_script -- @echo "Running e2fsprogs test suite..." -- @echo " " -- @./test_script -+ ./test_script - - check-failed: -- @a=`/bin/ls *.failed 2> /dev/null | sed -e 's/.failed//'`; \ -+ a=`/bin/ls *.failed 2> /dev/null | sed -e 's/.failed//'`; \ - if test "$$a"x == x ; then \ - echo "No failed tests" ; \ - else \ -@@ -40,27 +32,18 @@ check-failed: - TDIR=f_testnew - # Target which creates a new testcase to simplify adding new regression tests. - testnew: -- @echo "Creating a new e2fsck testcase in ${TDIR}" -- @mkdir -p ${TDIR} -+ mkdir -p ${TDIR} - dd if=/dev/zero of=${TDIR}/image bs=1k count=8k - mke2fs -j -F -N 256 ${TDIR}/image -- @echo "new test description" > ${TDIR}/name -- @echo; echo; echo "New test filesystem at ${TDIR}/image." -- @echo "Now, break the filesystem as appropriate, and run 'make testend'" - - EXPECT1=${TDIR}/expect.1 - EXPECT2=${TDIR}/expect.2 - # Target which generates the expect files for the new testcase. - testend: test_script ${TDIR}/image - gzip -9 ${TDIR}/image -- @OUT1=${EXPECT1} OUT2=${EXPECT2} ./test_script ${TDIR} -- @echo; echo; echo "*** output from first e2fsck run (${EXPECT1}) ***" -- @cat ${EXPECT1} -- @echo "*** output from second e2fsck run (${EXPECT2}) ***" -- @cat ${EXPECT2} -- @echo "*** end of e2fsck output ***" -- @echo; echo "Hopefully e2fsck now fixes this problem properly." -- @echo "If all is well, edit ${TDIR}/name and rename ${TDIR}." -+ OUT1=${EXPECT1} OUT2=${EXPECT2} ./test_script ${TDIR} -+ cat ${EXPECT1} -+ cat ${EXPECT2} - - clean:: - $(RM) -f *~ *.log *.new *.failed *.ok test.img test_script -Index: tests/progs/Makefile.in -=================================================================== ---- tests/progs/Makefile.in.orig -+++ tests/progs/Makefile.in -@@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR - DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) - - .c.o: -- @echo " CC $<" -- @$(CC) -c $(ALL_CFLAGS) $< -o $@ -+ $(CC) -c $(ALL_CFLAGS) $< -o $@ - - all:: $(PROGS) - - test_rel: $(TEST_REL_OBJS) $(DEPLIBS) -- @echo " LD $@" -- @$(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) -+ $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) - - test_rel_cmds.c: test_rel_cmds.ct -- @echo " MK_CMDS $@" -- @$(MK_CMDS) $(srcdir)/test_rel_cmds.ct -+ $(MK_CMDS) $(srcdir)/test_rel_cmds.ct - - test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS) -- @echo " LD $@" -- @$(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) -+ $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) - - test_icount_cmds.c: test_icount_cmds.ct -- @echo " MK_CMDS $@" -- @$(MK_CMDS) $(srcdir)/test_icount_cmds.ct -+ $(MK_CMDS) $(srcdir)/test_icount_cmds.ct - - clean: - $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \ -Index: util/Makefile.in -=================================================================== ---- util/Makefile.in.orig -+++ util/Makefile.in -@@ -14,25 +14,21 @@ SRCS = $(srcdir)/subst.c - @MCONFIG@ - - .c.o: -- @echo " CC $<" -- @$(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@ -+ $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@ - - PROGS= subst - - all:: $(PROGS) gen-tarball - - subst: subst.o -- @echo " LD $@" -- @$(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o -+ $(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o - - copy_sparse: copy_sparse.o -- @echo " LD $@" -- @$(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o -+ $(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o - - gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status -- @echo " CONFIG.STATUS $@" -- @cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status -- @chmod +x gen-tarball -+ cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status -+ chmod +x gen-tarball - - tarballs: gen-tarball - sh gen-tarball debian + @echo " SUBST $@" diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 0a0799d..b6e33fe 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Wed Jan 16 11:03:14 CET 2008 - mkoenig@suse.de + +- update to version 1.40.4: + * Fix potential security vulnerability (CVE-2007-5497) + * Fix big-endian byte-swapping bug in ext2fs_swap_inode_full() + * Fix a bug in ext2fs_initialize() which causes mke2fs to fail while + allocating inode tables for some relatively rare odd disk sizes. + * Fix bug in ext2fs_check_desc() which will cause e2fsck to complain + about (valid) filesystems where the inode table extends to the last + block of the block group + * Change e2fsck so it will not complain if a file has blocks reallocated + up to the next multiple of a system's page size + * Change e2fsck so it uses sscanf() instead of atoi() so it non-numeric + arguments are detected as such and the parse error is reported to the + user + * Make the e2fsprogs program more robust so that they will not crash + when opening a corrupt filesystem where s_inode_size is zero. + * Fix e2fsck so that if the superblock is corrupt, but still looks + vaguely like an ext2/3/4 superblock, that it automatically tries to + fall back to the backup superblock, instead of failing with a hard + error + * Fix fsck to ignore /etc/fstab entries for bind mounts + * E2fsck will no longer mark a filesystem as invalid if it has time + errors and the user refuses to fix the problem. + * Enhance blkid's detection of FAT filesystems + * Enhance e2fsck so it will force the backup superblocks to be backed up + if the filesystem is consistent and key constants have been changed + (i.e., by an on-line resize) or by e2fsck in the course of its + operations. + * Enhance the blkid library so it will recognize squashfs filesystems + * Fix e2image so that in raw mode it does not create an image file which + is one byte too large + * Fix heuristics in blkid which could cause a disk without partitions to + be incorrectly skipped when a loopback device is present + * Avoid division by zero error when probing an invalid FAT filesystem in + the blkid library + * Fix sign-extension problem on 64-bit systems in in the com_err + library + * Format control characters and characters with the high eighth bit set + when printing the contents of the blkid cache, to prevent filesystems + with garbage labels from sending escape sequences + * Fix fsck to only treat the '#' character as a comment at the beginning + of the line in /etc/fstab + * Filter out the NEEDS_RECOVERY feature flag when writing out the backup + superblocks + * Improve time-based UUID generation. A new daemon uuidd, is started + automatically by libuuid if necessary +- new subpackage: uuid-runtime + containing uuidd and uuidgen +- removed obsolete patches + e2fsprogs-1.39-uuid_duplicates.patch + e2fsprogs-1.40.2-open_fix.patch + e2fsprogs-1.40-be_swap_fix.patch + ------------------------------------------------------------------- Mon Nov 26 14:39:17 CET 2007 - mkoenig@suse.de diff --git a/e2fsprogs.spec b/e2fsprogs.spec index b1f5e03..5dca6dc 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,7 +1,7 @@ # -# spec file for package e2fsprogs (Version 1.40.2) +# spec file for package e2fsprogs (Version 1.40.4) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,22 +11,21 @@ # norootforbuild Name: e2fsprogs -# This breaks make check and changes the Makefiles at other places too, -# do not use for production builds until it's carefully reviewed: -%define no_command_hiding 0 +%define no_command_hiding 1 BuildRequires: libvolume_id-devel License: GPL v2 or later Group: System/Filesystems Supplements: filesystem(ext2) filesystem(ext3) PreReq: %install_info_prereq AutoReqProv: on -Version: 1.40.2 -Release: 30 +Version: 1.40.4 +Release: 1 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net 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 @@ -40,13 +39,12 @@ Patch10: close.patch Patch11: fsck-ignore-mounted.patch Patch12: e2fsprogs-mkinstalldirs.patch Patch13: e2fsprogs-special_make_targets.patch -Patch15: e2fsprogs-1.39-uuid_duplicates.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-be_swap_fix.patch -Patch23: e2fsprogs-1.40.2-open_fix.patch +Patch22: e2fsprogs-1.40.4-uuidd_pid_path.patch +Patch23: e2fsprogs-1.40.4-uuid_null.patch # libcom_err patches Patch30: libcom_err-no-static-buffer.patch Patch31: libcom_err-no-init_error_table.patch @@ -177,6 +175,24 @@ detection. +Authors: +-------- + Remy Card + Theodore Ts'o + +%package -n uuid-runtime +Summary: Utilities for the Second Extended File System +Group: System/Filesystems +AutoReqProv: on +PreReq: %insserv_prereq permissions pwdutils + +%description -n uuid-runtime +Utilities needed to create and maintain ext2 and ext3 file systems +under Linux. Included in this package are: chattr, lsattr, mke2fs, +mklost+found, tune2fs, e2fsck, resize2fs, and badblocks. + + + Authors: -------- Remy Card @@ -186,6 +202,7 @@ Authors: Summary: Library to generate UUIDs Group: System/Filesystems AutoReqProv: on +Recommends: uuid-runtime %description -n libuuid1 A library to generate universally unique IDs (UUIDs). @@ -229,7 +246,6 @@ Authors: %patch10 -p1 %patch11 %patch12 -%patch15 -p1 %patch16 %patch17 -p1 %patch20 -p1 @@ -243,7 +259,7 @@ Authors: %patch33 -p1 %patch34 -p1 %if %{no_command_hiding} -%patch99 +%patch99 -p1 %endif cp %{S:1} po cp %{SOURCE2} . @@ -262,7 +278,6 @@ patch -p0 -i %{P:13} --mandir=%{_mandir} --infodir=%{_infodir} --libdir=%{_libdir} \ --enable-elf-shlibs \ --disable-evms \ - --with-ldopts=-pthread \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char" make @@ -270,13 +285,16 @@ make make install install-libs DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} %{find_lang} %{name} rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper +mkdir -p $RPM_BUILD_ROOT/var/lib/libuuid/ +mkdir -p $RPM_BUILD_ROOT/var/run/uuidd/ +# init script for 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 %check -%if !%{no_command_hiding} -# always run make check when e2fsprogs-no_cmd_hiding.patch is fixed! make check make gcc-wall -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -307,12 +325,28 @@ rm -rf $RPM_BUILD_ROOT %postun -n libblkid1 /sbin/ldconfig +%pre -n uuid-runtime +/usr/sbin/groupadd -r uuidd 2>/dev/null || : +/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd 2>/dev/null || : + +%preun -n uuid-runtime +%{stop_on_removal uuidd} + +%post -n uuid-runtime +%run_permissions + +%postun -n uuid-runtime +%{restart_on_update uuidd} +%{insserv_cleanup} + %post -n libuuid1 /sbin/ldconfig %postun -n libuuid1 /sbin/ldconfig -# e2fsprogs +%verifyscript -n uuid-runtime +%verify_permissions -e /usr/sbin/uuidd %files -f %{name}.lang %defattr(-, root, root) @@ -337,7 +371,6 @@ rm -rf $RPM_BUILD_ROOT /sbin/findfs /usr/bin/chattr /usr/bin/lsattr -/usr/bin/uuidgen /usr/sbin/mklost+found /usr/sbin/filefrag %{_infodir}/libext2fs.info.gz @@ -347,12 +380,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/e2fsck.conf.5.gz %{_mandir}/man5/mke2fs.conf.5.gz %{_mandir}/man8/*.8.gz -# dummy devel package %files devel %defattr(-,root,root) %doc README.SUSE -# libblkid %files -n libblkid1 %defattr(-, root, root) @@ -365,7 +396,15 @@ rm -rf $RPM_BUILD_ROOT /usr/include/blkid %_libdir/pkgconfig/blkid.pc %{_mandir}/man3/libblkid.3.gz -# libuuid + +%files -n uuid-runtime +%defattr(-, root, root) +/usr/bin/uuidgen +%verify(not mode) %attr(0755,root,root) /usr/sbin/uuidd +%attr(-,uuidd,uuidd) %dir /var/lib/libuuid +%attr(-,uuidd,uuidd) %dir /var/run/uuidd +/etc/init.d/uuidd +/usr/sbin/rcuuidd %files -n libuuid1 %defattr(-, root, root) @@ -378,7 +417,6 @@ rm -rf $RPM_BUILD_ROOT /usr/include/uuid %_libdir/pkgconfig/uuid.pc %{_mandir}/man3/uuid* -# libext2fs %files -n libext2fs2 %defattr(-, root, root) @@ -395,7 +433,6 @@ rm -rf $RPM_BUILD_ROOT /usr/include/e2p %_libdir/pkgconfig/e2p.pc %_libdir/pkgconfig/ext2fs.pc -# libcom_err %files -n libcom_err2 %defattr(-, root, root) @@ -421,83 +458,135 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/com_err.3.gz %changelog -* Mon Nov 26 2007 - mkoenig@suse.de +* Wed Jan 16 2008 mkoenig@suse.de +- update to version 1.40.4: + * Fix potential security vulnerability (CVE-2007-5497) + * Fix big-endian byte-swapping bug in ext2fs_swap_inode_full() + * Fix a bug in ext2fs_initialize() which causes mke2fs to fail while + allocating inode tables for some relatively rare odd disk sizes. + * Fix bug in ext2fs_check_desc() which will cause e2fsck to complain + about (valid) filesystems where the inode table extends to the last + block of the block group + * Change e2fsck so it will not complain if a file has blocks reallocated + up to the next multiple of a system's page size + * Change e2fsck so it uses sscanf() instead of atoi() so it non-numeric + arguments are detected as such and the parse error is reported to the + user + * Make the e2fsprogs program more robust so that they will not crash + when opening a corrupt filesystem where s_inode_size is zero. + * Fix e2fsck so that if the superblock is corrupt, but still looks + vaguely like an ext2/3/4 superblock, that it automatically tries to + fall back to the backup superblock, instead of failing with a hard + error + * Fix fsck to ignore /etc/fstab entries for bind mounts + * E2fsck will no longer mark a filesystem as invalid if it has time + errors and the user refuses to fix the problem. + * Enhance blkid's detection of FAT filesystems + * Enhance e2fsck so it will force the backup superblocks to be backed up + if the filesystem is consistent and key constants have been changed + (i.e., by an on-line resize) or by e2fsck in the course of its + operations. + * Enhance the blkid library so it will recognize squashfs filesystems + * Fix e2image so that in raw mode it does not create an image file which + is one byte too large + * Fix heuristics in blkid which could cause a disk without partitions to + be incorrectly skipped when a loopback device is present + * Avoid division by zero error when probing an invalid FAT filesystem in + the blkid library + * Fix sign-extension problem on 64-bit systems in in the com_err + library + * Format control characters and characters with the high eighth bit set + when printing the contents of the blkid cache, to prevent filesystems + with garbage labels from sending escape sequences + * Fix fsck to only treat the '#' character as a comment at the beginning + of the line in /etc/fstab + * Filter out the NEEDS_RECOVERY feature flag when writing out the backup + superblocks + * Improve time-based UUID generation. A new daemon uuidd, is started + automatically by libuuid if necessary +- new subpackage: uuid-runtime + containing uuidd and uuidgen +- removed obsolete patches + e2fsprogs-1.39-uuid_duplicates.patch + e2fsprogs-1.40.2-open_fix.patch + e2fsprogs-1.40-be_swap_fix.patch +* Mon Nov 26 2007 mkoenig@suse.de - fix build: missing third argument to open - do not remove buildroot in install section -* Fri Jul 27 2007 - mkoenig@suse.de +* Fri Jul 27 2007 mkoenig@suse.de - fix typo in specfile -* Thu Jul 26 2007 - mkoenig@suse.de +* Thu Jul 26 2007 mkoenig@suse.de - Fix big-endian byte-swapping bug in ext2fs_swap_inode_full() e2fsprogs-1.40-be_swap_fix.patch -* Wed Jul 25 2007 - bk@suse.de +* Wed Jul 25 2007 bk@suse.de - e2fsprogs requires libext2fs2 of the same version number to work - enable make check and make gcc-wall in %%check (executed last) - shut up bogus gcc warning for use of uninitialised variables -* Wed Jul 25 2007 - mkoenig@suse.de +* Wed Jul 25 2007 mkoenig@suse.de - remove e2fsprogs-blkid_probe_ext4.patch broken and it is way too early to support -* Wed Jul 18 2007 - mkoenig@suse.de +* Wed Jul 18 2007 mkoenig@suse.de - update to version 1.40.2 bugfix release -* Mon Jul 09 2007 - mkoenig@suse.de +* Mon Jul 09 2007 mkoenig@suse.de - update to version 1.40.1: * Bugfix release - removed patch (merged upstream) e2fsprogs-1.39-cleanup.patch -* Wed Jul 04 2007 - mkoenig@suse.de +* Wed Jul 04 2007 mkoenig@suse.de - update to version 1.40 - branch off libraries: libblkid1 libuuid1 libext2fs2 - renaming libcom_err to libcom_err2 -* Tue Jun 19 2007 - mkoenig@suse.de +* Tue Jun 19 2007 mkoenig@suse.de - fix e2fsprogs-1.39-uuid_duplicates.patch [#189640] * detach shm segment after use * set SEM_UNDO for semaphore operations, otherwise we do not get a clean state after interruption by a signal -* Wed Apr 25 2007 - pth@suse.de +* Wed Apr 25 2007 pth@suse.de - Fix German translations. -* Wed Apr 11 2007 - mkoenig@suse.de +* Wed Apr 11 2007 mkoenig@suse.de - blkid: fix hfsplus probing to detect HFS+ volumes embedded in a HFS volume -* Wed Apr 04 2007 - mkoenig@suse.de +* Wed Apr 04 2007 mkoenig@suse.de - add Supplements line [FATE#301966] -* Fri Mar 30 2007 - mkoenig@suse.de +* Fri Mar 30 2007 mkoenig@suse.de - update to current hg version from 29-03-2007 * Fixes a lot of memory leaks and other bugs - remove merged patch: e2fsprogs-1.39-check_fs_open-in-dump_unused.patch -* Wed Mar 28 2007 - mkoenig@suse.de +* Wed Mar 28 2007 mkoenig@suse.de - blkid: add hfsplus volume detection (FATE#302071) - blkid: add experimental detection of ext4dev (FATE#301897) -* Thu Jan 25 2007 - mkoenig@suse.de +* Thu Jan 25 2007 mkoenig@suse.de - fix segfault in debugfs when using without open fs [#238140] -* Mon Jan 22 2007 - mkoenig@suse.de +* Mon Jan 22 2007 mkoenig@suse.de - don't chmod -w headers in compile_et to avoid build problems with some packages -* Fri Jan 19 2007 - mkoenig@suse.de +* Fri Jan 19 2007 mkoenig@suse.de - update to version 1.40-WIP-1114 (FATE#301897) * support for ext4 * several bugfixes - remove ext2resize from package, because the online resizing functionality has been merged into resize2fs since version 1.39 and ext2resize is unmaintained. -* Tue Dec 19 2006 - meissner@suse.de +* Tue Dec 19 2006 meissner@suse.de - fixed build -* Wed Nov 08 2006 - ro@suse.de +* Wed Nov 08 2006 ro@suse.de - provide libcom_err-devel in libcom_err -* Thu Oct 19 2006 - mkoenig@suse.de +* Thu Oct 19 2006 mkoenig@suse.de - fix bug in uuid patch -* Mon Oct 16 2006 - mkoenig@suse.de +* Mon Oct 16 2006 mkoenig@suse.de - fix build of shared lib -* Thu Oct 12 2006 - mkoenig@suse.de +* Thu Oct 12 2006 mkoenig@suse.de - fix uuid bug [#189640] - fix blkid problem with empty FAT labels [#211110] - fix small typo in resize2fs man page -* Tue Sep 26 2006 - mkoenig@suse.de +* Tue Sep 26 2006 mkoenig@suse.de - fix bug in fsck udev/libvolume_id patch [#205671] -* Wed Sep 20 2006 - mkoenig@suse.de +* Wed Sep 20 2006 mkoenig@suse.de - update to version 1.39: * Fix 32-bit cleanliness * Change mke2fs to use /etc/mke2fs.conf @@ -536,185 +625,185 @@ rm -rf $RPM_BUILD_ROOT * Make the resize inode part of the fs struct * Add the FL_IOCTL flag * Bugfixes -* Fri Aug 11 2006 - pth@suse.de +* 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 +* Fri Aug 04 2006 kay.sievers@suse.de - update libvolume_id integration to match util-linux -* Fri Jun 16 2006 - ro@suse.de +* Fri Jun 16 2006 ro@suse.de - added libvolume_id-devel to BuildRequires - updated e2fsprogs-udev.patch to match header rename -* Wed Feb 08 2006 - hare@suse.de +* Wed Feb 08 2006 hare@suse.de - Fix fsck -m (#146606) to really check filesystems. -* Mon Jan 30 2006 - hvogel@suse.de +* Mon Jan 30 2006 hvogel@suse.de - Document -I inode-size [#145445] -* Sun Jan 29 2006 - hvogel@suse.de +* Sun Jan 29 2006 hvogel@suse.de - fix hares patch -* Fri Jan 27 2006 - hare@suse.de +* Fri Jan 27 2006 hare@suse.de - Add option to not return an error code for mounted filesystems (#145400). -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 - hvogel@suse.de +* Fri Jan 20 2006 hvogel@suse.de - Support ext2/ext3 online resize -* Mon Dec 12 2005 - hvogel@suse.de +* Mon Dec 12 2005 hvogel@suse.de - remove lib/et/test_cases/imap_err* from the tarball because they are not distributeable. -* Tue Dec 06 2005 - pth@suse.de +* Tue Dec 06 2005 pth@suse.de - remove unnecessary type-punning - reduce compiler warnings -* Tue Nov 15 2005 - jblunck@suse.de +* Tue Nov 15 2005 jblunck@suse.de - added close.patch provided by Ted Tso (IBM) to fix bug #132708 -* Mon Nov 14 2005 - hare@suse.de +* Mon Nov 14 2005 hare@suse.de - Use devt when comparing devices - fsck: Use information provided by udev for detecting devices -* Wed Oct 05 2005 - hvogel@suse.de +* Wed Oct 05 2005 hvogel@suse.de - fix too few arguments to a *printf function - require libcom_err on e2fsprogs-devel -* Fri Sep 09 2005 - hvogel@suse.de +* Fri Sep 09 2005 hvogel@suse.de - add gross hack to avoid divide by zero in probe_reiserfs [#115827] -* Mon Aug 08 2005 - hvogel@suse.de +* Mon Aug 08 2005 hvogel@suse.de - added environment variable BLKID_SKIP_CHECK_MDRAID to work around broken software raid detection [Bug #100530] -* Tue Jul 05 2005 - hvogel@suse.de +* Tue Jul 05 2005 hvogel@suse.de - update to version 1.38 - mt reworked his patches a bit. See Bug #66534 -* Thu Jun 23 2005 - hvogel@suse.de +* Thu Jun 23 2005 hvogel@suse.de - call ldconfig in post/postun - add version to devel package dependencie - readd missing patch (7) -* Thu Apr 28 2005 - hvogel@suse.de +* Thu Apr 28 2005 hvogel@suse.de - update to version 1.37 - mt reworked one libcom_err patch a bit to provide more meaningfull error handling - fix retuen value in inode.c -* Thu Mar 31 2005 - hvogel@suse.de +* Thu Mar 31 2005 hvogel@suse.de - split libcom_err to a subpackage - add mutex synchronization to e2fsprogs/lib/et - removed usage of a static buffer in error_message() - disabled init_error_table function - disabled build of unused e2fsck.static -* Fri Mar 18 2005 - hvogel@suse.de +* Fri Mar 18 2005 hvogel@suse.de - fix endian unsafeness in getopt (#73855) -* Tue Feb 08 2005 - hvogel@suse.de +* Tue Feb 08 2005 hvogel@suse.de - Update to 1.36 final -* Tue Aug 10 2004 - pth@suse.de +* Tue Aug 10 2004 pth@suse.de - Update to 1.35 RC5 -* Wed Mar 17 2004 - pth@suse.de +* Wed Mar 17 2004 pth@suse.de - Don't build the EVMS plugin because it's out of date for EVMS in kernel 2.6. -* Thu Mar 04 2004 - pth@suse.de +* Thu Mar 04 2004 pth@suse.de - Add patch from Olaf Hering that makes fsck read a different blkid file via BLKID_FILE environment var (#35156) -* Thu Feb 19 2004 - kukuk@suse.de +* Thu Feb 19 2004 kukuk@suse.de - Remove obsolete recode call -* Mon Jan 12 2004 - ro@suse.de +* Mon Jan 12 2004 ro@suse.de - removed run_ldconfig again -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - add %%run_ldconfig -* Thu Oct 02 2003 - pthomas@suse.de +* Thu Oct 02 2003 pthomas@suse.de - Add patch from Kurt Garloff to make e2fsprogs compile with latest kernel headers (SCSI_BLK_MAJOR undefined). -* Mon Sep 15 2003 - pthomas@suse.de +* Mon Sep 15 2003 pthomas@suse.de - Fix czech message catalog which has been transformed twice from latin2 to utf-8 and add an iconv call to the spec file that will make building fail if the file is corrected upstream. -* Sat Aug 30 2003 - agruen@suse.de +* Sat Aug 30 2003 agruen@suse.de - Fix an endianness bug in ext2fs_swap_inode: Fast symlinks that have extended attributes are acidentally byte swapped on big-endian machines. -* Fri Aug 01 2003 - pthomas@suse.de +* Fri Aug 01 2003 pthomas@suse.de - Apply patch from Ted T'so for badblocks. -* Thu Jul 31 2003 - pthomas@suse.de +* Thu Jul 31 2003 pthomas@suse.de - Update to 1.34. - Various fixes to libcom_err to make it really compatible to the heimdal version. - Fix int<->pointer casts. - Fix places that may break strict aliasing. -* Fri Jun 20 2003 - ro@suse.de +* Fri Jun 20 2003 ro@suse.de - added directory to filelist -* Wed May 14 2003 - pthomas@suse.de +* Wed May 14 2003 pthomas@suse.de - Use %%defattr - Include all installed files. -* Tue Apr 29 2003 - mfabian@suse.de +* Tue Apr 29 2003 mfabian@suse.de - add libblkid.so* and libblkid.a to file lists -* Thu Apr 24 2003 - pthomas@suse.de +* Thu Apr 24 2003 pthomas@suse.de - Update to 1.33 and adapt patches. - Add missing headers where necessary. -* Thu Apr 24 2003 - ro@suse.de +* Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Fri Feb 07 2003 - ro@suse.de +* Fri Feb 07 2003 ro@suse.de - added install_info macros -* Tue Oct 01 2002 - garloff@suse.de +* Tue Oct 01 2002 garloff@suse.de - Fix segfault in display of real device in presence of volume name. #20422 -* Tue Sep 03 2002 - mls@suse.de +* Tue Sep 03 2002 mls@suse.de - remove duplicate evms scan (already included in 1.28) - fix volume group scan bug -* Mon Sep 02 2002 - agruen@suse.de +* Mon Sep 02 2002 agruen@suse.de - Update to 1.28. Includes very minor fixes in htree, which we have disabled anyway, one fix that we had in a separate patch, and has additional release notes. -* Mon Aug 19 2002 - agruen@suse.de +* Mon Aug 19 2002 agruen@suse.de - Update to 1.28-WIP-0817, which includes Extended Attribute and several smaller fixes. We disable htree support and don't install the evms library for now. - Remove `make gcc-wall' for now (as it does a `make clean' in doc/). -* Thu Aug 15 2002 - mls@suse.de +* Thu Aug 15 2002 mls@suse.de - support jfs, reiserfs, evms in label/uuid scan (code stolen from util-linux:mount) -* Sun Jul 28 2002 - kukuk@suse.de +* Sun Jul 28 2002 kukuk@suse.de - Remove unused tetex from neededforbuild -* Fri Jul 19 2002 - olh@suse.de +* Fri Jul 19 2002 olh@suse.de - use a better method for finding missed filelist entries -* Fri Apr 12 2002 - sf@suse.de +* Fri Apr 12 2002 sf@suse.de - added %%{_libdir} - added fix for lib/lib64 -* Thu Mar 28 2002 - bk@suse.de +* Thu Mar 28 2002 bk@suse.de - fix man pages, filelist and add check for missing files in packs -* Wed Mar 27 2002 - bk@suse.de +* Wed Mar 27 2002 bk@suse.de - Update to 1.27, fixes resource limit problem for other archs and merges many patches -* Thu Mar 07 2002 - pthomas@suse.de +* Thu Mar 07 2002 pthomas@suse.de - Add patch from Ted T'so to keep e2fsck from dumping core when the journal inode is missing. -* Mon Mar 04 2002 - pthomas@suse.de +* Mon Mar 04 2002 pthomas@suse.de - Fix implicit function declarations and some other gcc warnings. - Include patch from Kurt Garloff to make e2fsck display the device name in addition to the volume label. Adapt it to 1.26. - Adapt BSD_disklables.diff to new code. - Set LC_CTYPE in addition to LC_MESSAGES. - Repack with bzip2. -* Fri Mar 01 2002 - bk@suse.de +* Fri Mar 01 2002 bk@suse.de - Update to 1.26. This release has a number of critical bug fixes over the previous release, version 1.25: -* Fri Feb 15 2002 - pthomas@suse.de +* Fri Feb 15 2002 pthomas@suse.de - Use %%{_lib} and %%{_libdir}. -* Wed Feb 13 2002 - pthomas@suse.de +* Wed Feb 13 2002 pthomas@suse.de - Make heimdal-devel conflict e2fsprogs-devel. Temporary solution for bug #13145 -* Thu Dec 13 2001 - pthomas@suse.de +* Thu Dec 13 2001 pthomas@suse.de - Add mkfs.ext2.8 because mkfs.8 from util-linux references it. Fixes bug #12613. -* Fri Nov 23 2001 - pthomas@suse.de +* Fri Nov 23 2001 pthomas@suse.de - Add accidently left out e2image to file list. Fixes bug [#12009] -* Wed Oct 31 2001 - ro@suse.de +* Wed Oct 31 2001 ro@suse.de - fix for axp: should malloc buffer _before_ use -* Wed Oct 10 2001 - pthomas@suse.de +* Wed Oct 10 2001 pthomas@suse.de - Update to 1.25. - Remove patches not needed anymore. - Change mke2fs to output warnings to stderr not stdout. - Repack as bz2. -* Mon Sep 24 2001 - olh@suse.de +* Mon Sep 24 2001 olh@suse.de - replace ext2fs_d -* Fri Sep 21 2001 - pthomas@suse.de +* Fri Sep 21 2001 pthomas@suse.de - Add patch for mke2fs from 1.25 as that bug seems to be the reason for the mk_initrd warning. -* Wed Sep 12 2001 - pthomas@suse.de +* Wed Sep 12 2001 pthomas@suse.de - Update to 1.24a: - Fix brown-paper bug in mke2fs which caused it to segfault. - Revert the BLKGETSIZE64 support as this ioctl has been used @@ -729,84 +818,84 @@ rm -rf $RPM_BUILD_ROOT specifiers when specifying the external journal device. tune2fs will also search devices looking for the external journal device when removing. -* Fri Aug 17 2001 - ro@suse.de +* Fri Aug 17 2001 ro@suse.de - update to 1.23 to enable external journals on ext3 -* Wed Aug 15 2001 - pthomas@suse.de +* Wed Aug 15 2001 pthomas@suse.de - Update to 1.22. - Drop fsck Patch as code changed. - Use LD_LIBRARY_PATH to run test programs. -* Fri Jun 08 2001 - pthomas@suse.de +* Fri Jun 08 2001 pthomas@suse.de - Remove incorrect use of AC_REQUIRE (fails with autoconf 2.5) - Recompress tarball with bzip2. -* Thu Jan 18 2001 - schwab@suse.de +* Thu Jan 18 2001 schwab@suse.de - Add Obsoletes: ext2fs_d and Requires: e2fsprogs to devel subpackage. -* Mon Nov 06 2000 - pthomas@suse.de +* Mon Nov 06 2000 pthomas@suse.de - use _mandir and _infodir more consistently in spec file. -* Sun Nov 05 2000 - ro@suse.de +* Sun Nov 05 2000 ro@suse.de - renamed packages to e2fsprogs/e2fsprogs-devel -* Fri Jun 09 2000 - kasal@suse.cz +* Fri Jun 09 2000 kasal@suse.cz - Build dynamic libraries. Partition Surprise requires them. - Make /usr/lib/*.so symlinks relative. -* Thu Mar 23 2000 - kukuk@suse.de +* Thu Mar 23 2000 kukuk@suse.de - Don't erase BSD labels on Alpha - Add Y2K fix to debugfs -* Wed Mar 22 2000 - kukuk@suse.de +* Wed Mar 22 2000 kukuk@suse.de - Fix ifdefs for gcc 2.95.2 -* Tue Feb 22 2000 - garloff@suse.de +* 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 +* Sun Feb 20 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 do. (e2fsck only displays the label, nowadays :-( ) -* Thu Feb 10 2000 - kukuk@suse.de +* Thu Feb 10 2000 kukuk@suse.de - Use autoconf to create new configure -* Wed Jan 19 2000 - ro@suse.de +* Wed Jan 19 2000 ro@suse.de - man,info -> /usr/share -* Mon Jan 17 2000 - ro@suse.de +* Mon Jan 17 2000 ro@suse.de - fixed to build on kernels >= 2.3.39 -* Sat Nov 13 1999 - kukuk@suse.de +* Sat Nov 13 1999 kukuk@suse.de - Update to e2fsprogs 1.18 - Create new sub-package ext2fs_d which includes libs and headers -* Mon Nov 08 1999 - ro@suse.de +* Mon Nov 08 1999 ro@suse.de -fixed coredump in e2fsck -* Fri Oct 29 1999 - ro@suse.de +* Fri Oct 29 1999 ro@suse.de -e2fsprogs: 1.17 vital bugfix in e2fsck -* Sun Oct 24 1999 - ro@suse.de +* Sun Oct 24 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 +* Fri Oct 15 1999 garloff@suse.de - Disabled flushb again. (Moved to ddrescue.) -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Sep 01 1999 - ro@suse.de +* Wed Sep 01 1999 ro@suse.de - mke2fs: sparse superblocks default back to "off" -* Tue Aug 31 1999 - ro@suse.de +* Tue Aug 31 1999 ro@suse.de - update to 1.15 - cleanup diff and specfile -* Sun Jul 18 1999 - garloff@suse.de +* Sun Jul 18 1999 garloff@suse.de - Enabled flushb compilation -* Sat Jun 26 1999 - kukuk@suse.de +* Sat Jun 26 1999 kukuk@suse.de - Add fix for fsck core dump from beta list -* Tue Mar 16 1999 - ro@suse.de +* Tue Mar 16 1999 ro@suse.de - fixed configure call -* Fri Mar 12 1999 - ro@suse.de +* Fri Mar 12 1999 ro@suse.de - update to 1.14 -* Thu Oct 29 1998 - ro@suse.de +* Thu Oct 29 1998 ro@suse.de - respect change in 2.1.126 SCSI_DISK_MAJOR -* Tue Sep 01 1998 - ro@suse.de +* Tue Sep 01 1998 ro@suse.de - update to 1.12 -* Sat Apr 26 1997 - florian@suse.de +* Sat Apr 26 1997 florian@suse.de - update to new version 1.10 -* Sun Apr 13 1997 - florian@suse.de +* Sun Apr 13 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 +* Thu Jan 02 1997 florian@suse.de - update to new version 1.06 -* Thu Jan 02 1997 - florian@suse.de +* Thu Jan 02 1997 florian@suse.de - update to newer version - use now static libs instead of 4 small shared libs -* Thu Jan 02 1997 - florian@suse.de +* Thu Jan 02 1997 florian@suse.de update to version 1.0.4 diff --git a/libcom_err-mutex.patch b/libcom_err-mutex.patch index 01132f7..909a7c3 100644 --- a/libcom_err-mutex.patch +++ b/libcom_err-mutex.patch @@ -1,7 +1,7 @@ -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/com_err.pc.in +Index: e2fsprogs-1.40.4/lib/et/com_err.pc.in =================================================================== ---- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/com_err.pc.in -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/com_err.pc.in +--- e2fsprogs-1.40.4.orig/lib/et/com_err.pc.in ++++ e2fsprogs-1.40.4/lib/et/com_err.pc.in @@ -7,5 +7,5 @@ Name: com_err Description: Common error description library Version: @E2FSPROGS_VERSION@ @@ -10,10 +10,10 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/com_err.pc.in -Libs: -L${libdir} -lcom_err +Cflags: -I${includedir} -pthread +Libs: -L${libdir} -lcom_err -pthread -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c +Index: e2fsprogs-1.40.4/lib/et/error_message.c =================================================================== ---- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/error_message.c -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c +--- e2fsprogs-1.40.4.orig/lib/et/error_message.c ++++ e2fsprogs-1.40.4/lib/et/error_message.c @@ -20,6 +20,7 @@ #include #include @@ -22,7 +22,7 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c #ifdef HAVE_SYS_PRCTL_H #include #else -@@ -35,6 +36,17 @@ +@@ -41,6 +42,17 @@ struct et_list * _et_list = (struct et_list *) NULL; struct et_list * _et_dynamic_list = (struct et_list *) NULL; @@ -40,13 +40,13 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c const char * error_message (errcode_t code) { -@@ -59,22 +71,32 @@ const char * error_message (errcode_t co +@@ -66,22 +78,32 @@ const char * error_message (errcode_t co goto oops; #endif } + et_list_lock(); for (et = _et_list; et; et = et->next) { - if (et->table->base == table_num) { + if ((et->table->base & 0xffffffL) == (table_num & 0xffffffL)) { /* This is the right table */ - if (et->table->n_msgs <= offset) - goto oops; @@ -61,7 +61,7 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c } } for (et = _et_dynamic_list; et; et = et->next) { - if (et->table->base == table_num) { + if ((et->table->base & 0xffffffL) == (table_num & 0xffffffL)) { /* This is the right table */ - if (et->table->n_msgs <= offset) - goto oops; @@ -79,7 +79,7 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c oops: return "Unknown code"; } -@@ -143,6 +165,9 @@ errcode_t add_error_table(const struct e +@@ -150,6 +172,9 @@ errcode_t add_error_table(const struct e if (!(el = (struct et_list *) malloc(sizeof(struct et_list)))) return ENOMEM; @@ -89,7 +89,7 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c el->table = et; el->next = _et_dynamic_list; _et_dynamic_list = el; -@@ -153,6 +178,7 @@ errcode_t add_error_table(const struct e +@@ -160,6 +185,7 @@ errcode_t add_error_table(const struct e error_table_name(et->base), (const void *) et); @@ -97,7 +97,7 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c return 0; } -@@ -161,9 +187,13 @@ errcode_t add_error_table(const struct e +@@ -168,9 +194,13 @@ errcode_t add_error_table(const struct e */ errcode_t remove_error_table(const struct error_table * et) { @@ -112,7 +112,7 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c init_debug(); while (el) { if (el->table->base == et->base) { -@@ -177,6 +207,7 @@ errcode_t remove_error_table(const struc +@@ -184,6 +214,7 @@ errcode_t remove_error_table(const struc "remove_error_table: %s (0x%p)\n", error_table_name(et->base), (const void *) et); @@ -120,7 +120,7 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c return 0; } el2 = el; -@@ -186,6 +217,7 @@ errcode_t remove_error_table(const struc +@@ -193,6 +224,7 @@ errcode_t remove_error_table(const struc fprintf(debug_f, "remove_error_table FAILED: %s (0x%p)\n", error_table_name(et->base), (const void *) et); @@ -128,10 +128,10 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c return ENOENT; } -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_table.h +Index: e2fsprogs-1.40.4/lib/et/error_table.h =================================================================== ---- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/error_table.h -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_table.h +--- e2fsprogs-1.40.4.orig/lib/et/error_table.h ++++ e2fsprogs-1.40.4/lib/et/error_table.h @@ -19,6 +19,8 @@ struct et_list { const struct error_table *table; }; @@ -141,10 +141,10 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_table.h #define ERRCODE_RANGE 8 /* # of bits to shift table number */ #define BITS_PER_CHAR 6 /* # bits to shift per character in name */ -Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/et_c.awk +Index: e2fsprogs-1.40.4/lib/et/et_c.awk =================================================================== ---- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/et_c.awk -+++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/et_c.awk +--- e2fsprogs-1.40.4.orig/lib/et/et_c.awk ++++ e2fsprogs-1.40.4/lib/et/et_c.awk @@ -225,6 +225,8 @@ END { print " const struct error_table * table;" > outfile print "};" > outfile diff --git a/uuidd.rc b/uuidd.rc new file mode 100644 index 0000000..cece1d8 --- /dev/null +++ b/uuidd.rc @@ -0,0 +1,78 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: uuidd +# Required-Start: $time $local_fs $remote_fs +# Should-Start: +# Required-Stop: $time $local_fs $remote_fs +# Should-Stop: +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: UUID generating daemon +# Description: UUID generating daemon +### END INIT INFO +# + + +# Check for missing binaries (stale symlinks should not happen) +# Note: Special treatment of stop for LSB conformance +UUIDD_BIN=/usr/sbin/uuidd +test -x $UUIDD_BIN || { echo "$UUIDD_BIN not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } + +. /etc/rc.status + +# Reset status of this service +rc_reset + +case "$1" in + start) + echo -n "Starting uuidd " + /sbin/startproc $UUIDD_BIN + + rc_status -v + ;; + stop) + echo -n "Shutting down uuidd " + /sbin/killproc -TERM $UUIDD_BIN + + rc_status -v + ;; + try-restart|condrestart|force-reload) + ## Do a restart only if the service was active before. + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + # Remember status and be quiet + rc_status + ;; + restart) + $0 stop + $0 start + + rc_status + ;; + reload) + rc_failed 3 + rc_status -v + ;; + status) + echo -n "Checking for service uuidd " + /sbin/checkproc $UUIDD_BIN + + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" + exit 1 + ;; +esac +rc_exit