diff --git a/e2fsprogs-1.40.5-blkid_cache_file_env.patch b/e2fsprogs-1.40.5-blkid_cache_file_env.patch deleted file mode 100644 index a361feb..0000000 --- a/e2fsprogs-1.40.5-blkid_cache_file_env.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: e2fsprogs-1.40.5/lib/blkid/libblkid.3.in -=================================================================== ---- e2fsprogs-1.40.5.orig/lib/blkid/libblkid.3.in -+++ e2fsprogs-1.40.5/lib/blkid/libblkid.3.in -@@ -29,6 +29,8 @@ and is verified to still be valid before - (if the user has read permission on the raw block device, otherwise not). - The cache file also allows unprivileged users (normally anyone other - than root, or those not in the "disk" group) to locate devices by label/id. -+The standard location of the cache file can be overridden by the -+environment variable BLKID_FILE. - .P - In situations where one is getting information about a single known device, - it does not impact performance whether the cache is used or not (unless you diff --git a/e2fsprogs-1.40.5.tar.bz2 b/e2fsprogs-1.40.5.tar.bz2 deleted file mode 100644 index 310481a..0000000 --- a/e2fsprogs-1.40.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5da54aa4324d78438bcf3d0de24b6a8045426cb63acf5a003a8f8d8c21c2d9bb -size 3635871 diff --git a/e2fsprogs-1.40.6.tar.bz2 b/e2fsprogs-1.40.6.tar.bz2 new file mode 100644 index 0000000..47e72f8 --- /dev/null +++ b/e2fsprogs-1.40.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29c72055c3f79b0fe41556b1dc887a0806a4e7b1670c345dc10f0582294ced04 +size 3663614 diff --git a/e2fsprogs-no_cmd_hiding.patch b/e2fsprogs-no_cmd_hiding.patch index 60579b9..2760fec 100644 --- a/e2fsprogs-no_cmd_hiding.patch +++ b/e2fsprogs-no_cmd_hiding.patch @@ -1,7 +1,7 @@ -Index: e2fsprogs-1.40.5/lib/Makefile.elf-lib +Index: e2fsprogs-1.40.6/lib/Makefile.elf-lib =================================================================== ---- e2fsprogs-1.40.5.orig/lib/Makefile.elf-lib -+++ e2fsprogs-1.40.5/lib/Makefile.elf-lib +--- e2fsprogs-1.40.6.orig/lib/Makefile.elf-lib ++++ e2fsprogs-1.40.6/lib/Makefile.elf-lib @@ -15,7 +15,7 @@ all:: image real-subdirs:: Makefile @@ -11,11 +11,11 @@ Index: e2fsprogs-1.40.5/lib/Makefile.elf-lib ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION) ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION) -Index: e2fsprogs-1.40.5/lib/ext2fs/Makefile.in +Index: e2fsprogs-1.40.6/lib/ext2fs/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/lib/ext2fs/Makefile.in -+++ e2fsprogs-1.40.5/lib/ext2fs/Makefile.in -@@ -162,12 +162,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) +--- e2fsprogs-1.40.6.orig/lib/ext2fs/Makefile.in ++++ e2fsprogs-1.40.6/lib/ext2fs/Makefile.in +@@ -164,12 +164,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) all:: ext2fs.pc .c.o: @@ -33,15 +33,15 @@ Index: e2fsprogs-1.40.5/lib/ext2fs/Makefile.in COMPILE_ET=../et/compile_et --build-tree -@@ -187,61 +186,49 @@ ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_ +@@ -189,61 +188,49 @@ ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_ - tst_badblocks: tst_badblocks.o freefs.o bitmaps.o rw_bitmaps.o \ + tst_badblocks: tst_badblocks.o freefs.o \ read_bb_file.o write_bb_file.o badblocks.o - @echo " LD $@" - @$(CC) -o tst_badblocks tst_badblocks.o freefs.o \ + $(CC) -o tst_badblocks tst_badblocks.o freefs.o \ - read_bb_file.o write_bb_file.o badblocks.o rw_bitmaps.o \ - inline.o bitops.o gen_bitmap.o bitmaps.o $(LIBCOM_ERR) + read_bb_file.o write_bb_file.o badblocks.o \ + inline.o bitops.o gen_bitmap.o $(LIBCOM_ERR) tst_icount: icount.c initialize.o $(STATIC_LIBEXT2FS) - @echo " LD $@" @@ -105,9 +105,9 @@ Index: e2fsprogs-1.40.5/lib/ext2fs/Makefile.in - @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS) + $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS) - check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops -@@ -252,13 +239,11 @@ check:: tst_bitops tst_badblocks tst_isc + check:: tst_bitops tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap \ + tst_types tst_icount tst_super_size +@@ -256,13 +243,11 @@ check:: tst_bitops tst_badblocks tst_isc LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size installdirs:: @@ -123,10 +123,10 @@ Index: e2fsprogs-1.40.5/lib/ext2fs/Makefile.in @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a @for i in $(HFILES); do \ -Index: e2fsprogs-1.40.5/lib/blkid/Makefile.in +Index: e2fsprogs-1.40.6/lib/blkid/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/lib/blkid/Makefile.in -+++ e2fsprogs-1.40.5/lib/blkid/Makefile.in +--- e2fsprogs-1.40.6.orig/lib/blkid/Makefile.in ++++ e2fsprogs-1.40.6/lib/blkid/Makefile.in @@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) @@ -208,10 +208,10 @@ Index: e2fsprogs-1.40.5/lib/blkid/Makefile.in test_probe: test_probe.in Makefile @echo "Creating test_probe..." -Index: e2fsprogs-1.40.5/lib/e2p/Makefile.in +Index: e2fsprogs-1.40.6/lib/e2p/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/lib/e2p/Makefile.in -+++ e2fsprogs-1.40.5/lib/e2p/Makefile.in +--- e2fsprogs-1.40.6.orig/lib/e2p/Makefile.in ++++ e2fsprogs-1.40.6/lib/e2p/Makefile.in @@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ @@ -232,10 +232,10 @@ Index: e2fsprogs-1.40.5/lib/e2p/Makefile.in $(srcdir)/ostype.c $(ALL_CFLAGS) check:: tst_ostype -Index: e2fsprogs-1.40.5/lib/ss/Makefile.in +Index: e2fsprogs-1.40.6/lib/ss/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/lib/ss/Makefile.in -+++ e2fsprogs-1.40.5/lib/ss/Makefile.in +--- e2fsprogs-1.40.6.orig/lib/ss/Makefile.in ++++ e2fsprogs-1.40.6/lib/ss/Makefile.in @@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds XTRA_CFLAGS= -I$(srcdir)/../et @@ -287,10 +287,10 @@ Index: e2fsprogs-1.40.5/lib/ss/Makefile.in $(LIBSS) $(LIBCOM_ERR) check:: all test_ss -Index: e2fsprogs-1.40.5/lib/uuid/Makefile.in +Index: e2fsprogs-1.40.6/lib/uuid/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/lib/uuid/Makefile.in -+++ e2fsprogs-1.40.5/lib/uuid/Makefile.in +--- e2fsprogs-1.40.6.orig/lib/uuid/Makefile.in ++++ e2fsprogs-1.40.6/lib/uuid/Makefile.in @@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ @@ -375,10 +375,10 @@ Index: e2fsprogs-1.40.5/lib/uuid/Makefile.in uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status @echo " CONFIG.STATUS $@" -Index: e2fsprogs-1.40.5/e2fsck/Makefile.in +Index: e2fsprogs-1.40.6/e2fsck/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/e2fsck/Makefile.in -+++ e2fsprogs-1.40.5/e2fsck/Makefile.in +--- e2fsprogs-1.40.6.orig/e2fsck/Makefile.in ++++ e2fsprogs-1.40.6/e2fsck/Makefile.in @@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree @@ -391,7 +391,7 @@ Index: e2fsprogs-1.40.5/e2fsck/Makefile.in # # Flags for using Checker -@@ -112,45 +111,36 @@ prof_err.c prof_err.h: prof_err.et +@@ -113,45 +112,36 @@ prof_err.c prof_err.h: prof_err.et @$(COMPILE_ET) $(srcdir)/prof_err.et e2fsck: $(OBJS) $(DEPLIBS) @@ -446,7 +446,7 @@ Index: e2fsprogs-1.40.5/e2fsck/Makefile.in profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \ $(ALL_CFLAGS) -@@ -159,16 +149,13 @@ profiled: +@@ -160,16 +150,13 @@ profiled: @PROFILE_CMT@ @mkdir profiled e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in @@ -466,7 +466,7 @@ Index: e2fsprogs-1.40.5/e2fsck/Makefile.in $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) install: $(PROGS) $(MANPAGES) installdirs -@@ -176,11 +163,9 @@ install: $(PROGS) $(MANPAGES) installdir +@@ -177,11 +164,9 @@ install: $(PROGS) $(MANPAGES) installdir echo " INSTALL $(root_sbindir)/$$i"; \ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ done @@ -480,7 +480,7 @@ Index: e2fsprogs-1.40.5/e2fsck/Makefile.in $(DESTDIR)$(root_sbindir)/fsck.ext3 @for i in $(MANPAGES); do \ for j in $(COMPRESS_EXT); do \ -@@ -196,11 +181,9 @@ install: $(PROGS) $(MANPAGES) installdir +@@ -197,11 +182,9 @@ install: $(PROGS) $(MANPAGES) installdir echo " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done @@ -494,10 +494,10 @@ Index: e2fsprogs-1.40.5/e2fsck/Makefile.in $(DESTDIR)$(man8dir)/fsck.ext3.8 install-strip: install -Index: e2fsprogs-1.40.5/debugfs/Makefile.in +Index: e2fsprogs-1.40.6/debugfs/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/debugfs/Makefile.in -+++ e2fsprogs-1.40.5/debugfs/Makefile.in +--- e2fsprogs-1.40.6.orig/debugfs/Makefile.in ++++ e2fsprogs-1.40.6/debugfs/Makefile.in @@ -30,26 +30,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $( DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) @@ -530,10 +530,10 @@ Index: e2fsprogs-1.40.5/debugfs/Makefile.in $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs -Index: e2fsprogs-1.40.5/resize/Makefile.in +Index: e2fsprogs-1.40.6/resize/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/resize/Makefile.in -+++ e2fsprogs-1.40.5/resize/Makefile.in +--- e2fsprogs-1.40.6.orig/resize/Makefile.in ++++ e2fsprogs-1.40.6/resize/Makefile.in @@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) @@ -572,10 +572,10 @@ Index: e2fsprogs-1.40.5/resize/Makefile.in $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs -Index: e2fsprogs-1.40.5/util/Makefile.in +Index: e2fsprogs-1.40.6/util/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/util/Makefile.in -+++ e2fsprogs-1.40.5/util/Makefile.in +--- e2fsprogs-1.40.6.orig/util/Makefile.in ++++ e2fsprogs-1.40.6/util/Makefile.in @@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c @MCONFIG@ @@ -600,10 +600,10 @@ Index: e2fsprogs-1.40.5/util/Makefile.in gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status @echo " CONFIG.STATUS $@" -Index: e2fsprogs-1.40.5/tests/progs/Makefile.in +Index: e2fsprogs-1.40.6/tests/progs/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/tests/progs/Makefile.in -+++ e2fsprogs-1.40.5/tests/progs/Makefile.in +--- e2fsprogs-1.40.6.orig/tests/progs/Makefile.in ++++ e2fsprogs-1.40.6/tests/progs/Makefile.in @@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) @@ -636,10 +636,10 @@ Index: e2fsprogs-1.40.5/tests/progs/Makefile.in clean: $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \ -Index: e2fsprogs-1.40.5/lib/et/Makefile.in +Index: e2fsprogs-1.40.6/lib/et/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/lib/et/Makefile.in -+++ e2fsprogs-1.40.5/lib/et/Makefile.in +--- e2fsprogs-1.40.6.orig/lib/et/Makefile.in ++++ e2fsprogs-1.40.6/lib/et/Makefile.in @@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) # what to build... # @@ -658,10 +658,10 @@ Index: e2fsprogs-1.40.5/lib/et/Makefile.in @MAKEFILE_LIBRARY@ @MAKEFILE_ELF@ -Index: e2fsprogs-1.40.5/misc/Makefile.in +Index: e2fsprogs-1.40.6/misc/Makefile.in =================================================================== ---- e2fsprogs-1.40.5.orig/misc/Makefile.in -+++ e2fsprogs-1.40.5/misc/Makefile.in +--- e2fsprogs-1.40.6.orig/misc/Makefile.in ++++ e2fsprogs-1.40.6/misc/Makefile.in @@ -71,8 +71,7 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree @@ -673,7 +673,7 @@ Index: e2fsprogs-1.40.5/misc/Makefile.in all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \ $(FMANPAGES) $(LPROGS) @@ -86,91 +85,71 @@ default_profile.c: $(srcdir)/mke2fs.conf - @$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \ + $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \ > default_profile.c profile.o: - @echo " CC $<" diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 1dc0426..c4af923 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Feb 27 15:52:04 CET 2008 - mkoenig@suse.de + +- update to version 1.40.6 + * Add support for returning labels for UDF filesystems in the blkid + library + * Fix bug in the blkid library where cached filesystems was not being + flushed + * Added logic to the blkid library to automatically choose whether a + filesystem should be mounted as ext4 or ext4dev, as appropriate + * Allow tune2fs to set and clear the test_fs flag on ext4 filesystems +- removed patches: + e2fsprogs-1.40.5-blkid_cache_file_env.patch (merged) + libcom_err-no-static-buffer.patch (fixed upstream with TLS) + ------------------------------------------------------------------- Tue Jan 29 15:45:09 CET 2008 - mkoenig@suse.de diff --git a/e2fsprogs.spec b/e2fsprogs.spec index ea95bb3..82a59fb 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,5 +1,5 @@ # -# spec file for package e2fsprogs (Version 1.40.5) +# spec file for package e2fsprogs (Version 1.40.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,6 +10,7 @@ # norootforbuild + Name: e2fsprogs %define no_command_hiding 1 BuildRequires: libvolume_id-devel @@ -18,7 +19,7 @@ Group: System/Filesystems Supplements: filesystem(ext2) filesystem(ext3) PreReq: %install_info_prereq AutoReqProv: on -Version: 1.40.5 +Version: 1.40.6 Release: 1 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net @@ -30,8 +31,6 @@ Source4: sysconfig.uuidd # # e2fsprogs patches # -#Patch21: e2fsprogs-uninitialized.diff -# # 100530 - not all installed partitions offered for upgrade Patch1: e2fsprogs-mdraid.patch Patch2: e2fsprogs-base_devt.patch @@ -40,10 +39,8 @@ Patch3: e2fsprogs-libvolume_id-support.patch # 146606 - /boot and other file systems mounted, not check-able after installation Patch4: fsck-ignore-mounted.patch Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch -Patch6: e2fsprogs-1.40.5-blkid_cache_file_env.patch # libcom_err patches # 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict -Patch30: libcom_err-no-static-buffer.patch Patch31: libcom_err-no-init_error_table.patch Patch32: libcom_err-disable_test.patch Patch33: libcom_err-mutex.patch @@ -236,9 +233,7 @@ Authors: %patch3 -p0 %patch4 %patch5 -p1 -%patch6 -p1 # libcom_err patches -%patch30 -p1 %patch31 -p1 %patch32 -p1 %patch33 -p1 @@ -448,6 +443,18 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/com_err.3.gz %changelog +* Wed Feb 27 2008 mkoenig@suse.de +- update to version 1.40.6 + * Add support for returning labels for UDF filesystems in the blkid + library + * Fix bug in the blkid library where cached filesystems was not being + flushed + * Added logic to the blkid library to automatically choose whether a + filesystem should be mounted as ext4 or ext4dev, as appropriate + * Allow tune2fs to set and clear the test_fs flag on ext4 filesystems +- removed patches: + e2fsprogs-1.40.5-blkid_cache_file_env.patch (merged) + libcom_err-no-static-buffer.patch (fixed upstream with TLS) * Tue Jan 29 2008 mkoenig@suse.de - update to version 1.40.5: * Fix a potential overflow big in e2image diff --git a/libcom_err-no-static-buffer.patch b/libcom_err-no-static-buffer.patch deleted file mode 100644 index 1958ccd..0000000 --- a/libcom_err-no-static-buffer.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- e2fsprogs-1.39/lib/et/error_message.c -+++ e2fsprogs-1.39/lib/et/error_message.c -@@ -24,8 +24,6 @@ - #include "error_table.h" - #include "internal.h" - --static char buffer[25]; -- - struct et_list * _et_list = (struct et_list *) NULL; - struct et_list * _et_dynamic_list = (struct et_list *) NULL; - -@@ -70,25 +68,7 @@ - } - } - oops: -- strcpy (buffer, "Unknown code "); -- if (table_num) { -- strcat (buffer, error_table_name (table_num)); -- strcat (buffer, " "); -- } -- for (cp = buffer; *cp; cp++) -- ; -- if (offset >= 100) { -- *cp++ = '0' + offset / 100; -- offset %= 100; -- started++; -- } -- if (started || offset >= 10) { -- *cp++ = '0' + offset / 10; -- offset %= 10; -- } -- *cp++ = '0' + offset; -- *cp = '\0'; -- return(buffer); -+ return "Unknown code"; - } - - /*