Rev filesystems/1 Md5 0a9b2d7c17d6ffe39ed509c9240daa9b 2009-12-10 13:16:55 michal-m None

2009-12-10 13:16:55 +00:00 · 2009-12-10 13:16:55 +00:00 · 5d9b694fb0
commit 5d9b694fb0
parent f277a747a4
12 changed files with 1841 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,25 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+e2fsprogs-1.41.4.de.po filter=lfs diff=lfs merge=lfs -text
--- a/README.SUSE
+++ b/README.SUSE
@ -0,0 +1,11 @@
+e2fsprogs-devel
+---------------
+Since the e2fsprogs libraries has been split out into own packages,
+each having its own devel package
+libext2fs-devel
+libblkid-devel
+libuuid-devel
+libcom_err-devel
+the e2fsprogs-devel package is deprecated and is provided for temporary
+backwards compatibility only.
+
--- a/baselibs.conf
+++ b/baselibs.conf
@ -0,0 +1,11 @@
+libext2fs2
+libcom_err2
+  obsoletes "libcom_err-<targettype> <= <version>"
+e2fsprogs
+e2fsprogs-devel
+libext2fs-devel
+  requires -libext2fs-<targettype>
+  requires "libext2fs2-<targettype> = <version>"
+libcom_err-devel
+  requires -libcom_err-<targettype>
+  requires "libcom_err2-<targettype> = <version>"
--- a/e2fsprogs-1.41.1-splash_support.patch
+++ b/e2fsprogs-1.41.1-splash_support.patch
@ -0,0 +1,186 @@
+Index: e2fsprogs-1.41.7/e2fsck/splash.c
+===================================================================
+--- /dev/null
+++ e2fsprogs-1.41.7/e2fsck/splash.c
+@@ -0,0 +1,100 @@
+/*
+ * add support for switching the splash screen on boot
+ */
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include "splash.h"
+
+static int verbose = 0;
+
+/* nop implementation
+ */
+static void nop(void)
+{
+}
+
+static struct splash_ops nop_ops = {
+	.splash_on = nop,
+	.splash_off = nop
+};
+
+/*
+ *  bootsplash implementation
+ */
+#define BOOTSPLASH_CTL	"/proc/splash"
+
+static int bootsplash_exists(void)
+{
+	struct stat sb;
+
+	if (stat(BOOTSPLASH_CTL, &sb) == -1)
+		return 0;
+
+	if (S_ISREG(sb.st_mode))
+		return 1;
+
+	return 0;
+}
+
+/* write msg to splash control */
+static void bootsplash_msg(const char *msg, size_t size)
+{
+	int fd;
+	size_t written;
+
+	fd = open(BOOTSPLASH_CTL, O_WRONLY);
+	if (fd == -1) {
+		if (verbose)
+			printf("cannot open %s\n", BOOTSPLASH_CTL);
+		return;
+	}
+
+	written = write(fd, msg, size);
+	if (written != size) {
+		if (verbose)
+			printf("size = %i, written = %i\n", size, written);
+	}
+
+	close(fd);
+}
+
+static void bootsplash_on(void)
+{
+	if (verbose)
+		printf("setting bootsplash silent\n");
+	bootsplash_msg("silent\n", 7);
+}
+
+static void bootsplash_off(void)
+{
+	if (verbose)
+		printf("setting bootsplash verbose\n");
+	bootsplash_msg("verbose\n", 8);
+}
+
+static struct splash_ops bootsplash_ops = {
+	.splash_on = bootsplash_on,
+	.splash_off = bootsplash_off
+};
+
+/*
+ * Initialisation
+ */
+void splash_init(struct splash_ops **ops)
+{
+	if (bootsplash_exists())
+		*ops = &bootsplash_ops;
+	else
+		*ops = &nop_ops;
+}
+
+void splash_set_verbose(void)
+{
+	verbose = 1;
+}
+
+Index: e2fsprogs-1.41.7/e2fsck/splash.h
+===================================================================
+--- /dev/null
+++ e2fsprogs-1.41.7/e2fsck/splash.h
+@@ -0,0 +1,13 @@
+#ifndef _SPLASH_H
+#define _SPLASH_H
+
+struct splash_ops {
+	void (*splash_on)(void);
+	void (*splash_off)(void);
+};
+
+void splash_init(struct splash_ops **ops);
+void splash_set_verbose(void);
+
+#endif /* _SPLASH_H */
+
+Index: e2fsprogs-1.41.7/e2fsck/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.7.orig/e2fsck/Makefile.in
+++ e2fsprogs-1.41.7/e2fsck/Makefile.in
+@@ -63,7 +63,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil
+ OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \
+ 	pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
+ 	dx_dirinfo.o ehandler.o problem.o message.o recovery.o region.o \
+-	revoke.o ea_refcount.o rehash.o profile.o prof_err.o $(MTRACE_OBJ)
+	revoke.o ea_refcount.o rehash.o profile.o prof_err.o splash.o $(MTRACE_OBJ)
+ 
+ PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
+ 	profiled/super.o profiled/pass1.o profiled/pass1b.o \
+@@ -101,6 +101,7 @@ SRCS= $(srcdir)/e2fsck.c \
+ 	$(srcdir)/rehash.c \
+ 	$(srcdir)/region.c \
+ 	$(srcdir)/profile.c \
+	$(srcdir)/splash.c \
+ 	prof_err.c \
+ 	$(MTRACE_SRC)
+ 
+@@ -475,3 +476,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e
+ profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \
+  $(srcdir)/profile.h prof_err.h
+ prof_err.o: prof_err.c
+splash.o: splash.c splash.h
+
+Index: e2fsprogs-1.41.7/e2fsck/unix.c
+===================================================================
+--- e2fsprogs-1.41.7.orig/e2fsck/unix.c
+++ e2fsprogs-1.41.7/e2fsck/unix.c
+@@ -53,6 +53,7 @@ extern int optind;
+ #include "e2p/e2p.h"
+ #include "e2fsck.h"
+ #include "problem.h"
+#include "splash.h"
+ #include "../version.h"
+ 
+ /* Command line options */
+@@ -941,6 +942,7 @@ int main (int argc, char *argv[])
+ 	int sysval, sys_page_size = 4096;
+ 	__u32 features[3];
+ 	char *cp;
+	struct splash_ops *sops;
+ 
+ 	clear_problem_context(&pctx);
+ #ifdef MTRACE
+@@ -970,6 +972,7 @@ int main (int argc, char *argv[])
+ 		exit(FSCK_ERROR);
+ 	}
+ 	reserve_stdio_fds();
+	splash_init(&sops);
+ 
+ 	init_resource_track(&ctx->global_rtrack, NULL);
+ 	if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
+@@ -1284,6 +1287,7 @@ print_unsupp_features:
+ 		fatal_error(ctx, 0);
+ 	check_if_skip(ctx);
+ 	check_resize_inode(ctx);
+	sops->splash_off();
+ 	if (bad_blocks_file)
+ 		read_bad_blocks_file(ctx, bad_blocks_file, replace_bad_blocks);
+ 	else if (cflag)
--- a/e2fsprogs-1.41.4.de.po
+++ b/e2fsprogs-1.41.4.de.po
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8af170d4e7648a4fbdb4fdd5d17e46d05dbf695944e8b6099df2a26aecc617c5
+size 144931
--- a/e2fsprogs-1.41.9-fixsuper.patch
+++ b/e2fsprogs-1.41.9-fixsuper.patch
@ -0,0 +1,32 @@
+See http://marc.info/?t=125258740600003&r=1&w=2
+
+diff --git a/e2fsck/super.c b/e2fsck/super.c
+index 2202967..76390af 100644
+--- a/e2fsck/super.c
+++ b/e2fsck/super.c
+@@ -821,9 +821,9 @@ void check_super_block(e2fsck_t ctx)
+ 	 */
+ 	if (fs->super->s_mtime > (__u32) ctx->now) {
+ 		pctx.num = fs->super->s_mtime;
+-		problem = PR_0_FUTURE_SB_LAST_MOUNT;
+-		if (fs->super->s_mtime <= (__u32) ctx->now + ctx->time_fudge)
+-			problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED;
+		problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED;
+		if (ctx->time_fudge && fs->super->s_mtime > (__u32) ctx->now + ctx->time_fudge)
+			problem = PR_0_FUTURE_SB_LAST_MOUNT;
+ 		if (fix_problem(ctx, problem, &pctx)) {
+ 			fs->super->s_mtime = ctx->now;
+ 			ext2fs_mark_super_dirty(fs);
+@@ -831,9 +831,9 @@ void check_super_block(e2fsck_t ctx)
+ 	}
+ 	if (fs->super->s_wtime > (__u32) ctx->now) {
+ 		pctx.num = fs->super->s_wtime;
+-		problem = PR_0_FUTURE_SB_LAST_WRITE;
+-		if (fs->super->s_wtime <= (__u32) ctx->now + ctx->time_fudge)
+-			problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED;
+		problem = PR_0_FUTURE_SB_LAST_WRITE_FUDGED;
+		if (ctx->time_fudge && fs->super->s_wtime > (__u32) ctx->now + ctx->time_fudge)
+			problem = PR_0_FUTURE_SB_LAST_WRITE;
+ 		if (fix_problem(ctx, problem, &pctx)) {
+ 			fs->super->s_wtime = ctx->now;
+ 			ext2fs_mark_super_dirty(fs);
--- a/e2fsprogs-1.41.9.tar.bz2
+++ b/e2fsprogs-1.41.9.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35ded53051d01229cdefd2fdfa81f88aaac74d693afee441832d6d0d8f8e132a
+size 3918520
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@ -0,0 +1,258 @@
+#
+# spec file for package e2fsprogs (Version 1.41.9)
+#
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+
+Name:           e2fsprogs
+License:        GPL v2 or later
+Group:          System/Filesystems
+Supplements:    filesystem(ext2) filesystem(ext3) filesystem(ext4)
+BuildRequires:  libblkid-devel libuuid-devel pkg-config
+PreReq:         %install_info_prereq
+AutoReqProv:    on
+# bug437293
+%ifarch ppc64
+Obsoletes:      e2fsprogs-64bit
+%endif
+#
+Version:        1.41.9
+Release:        2
+Summary:        Utilities for the Second Extended File System
+Url:            http://e2fsprogs.sourceforge.net
+Source:         %{name}-%{version}.tar.bz2
+Source2:        README.SUSE
+Source6:        %{name}-1.41.4.de.po
+#
+# e2fsprogs patches
+#
+Patch7:         e2fsprogs-1.41.1-splash_support.patch
+# UPSTREAM
+Patch8:         e2fsprogs-1.41.9-fixsuper.patch
+# libcom_err patches
+Patch34:        libcom_err-compile_et_permissions.patch
+Patch35:        libcom_err-readline.patch
+# Do not suppress make commands
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+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.
+
+%package devel
+License:        GPL v2 or later
+Summary:        Dummy development package
+Group:          Development/Libraries/C and C++
+AutoReqProv:    on
+# bug437293
+%ifarch ppc64
+Obsoletes:      e2fsprogs-devel-64bit
+%endif
+#
+Requires:       libext2fs-devel = %version libblkid-devel libuuid-devel
+
+%description devel
+Dummy development package for backwards compatibility.
+
+%package -n libext2fs2
+License:        GPL v2 or later
+Summary:        Ext2fs libray
+Group:          System/Filesystems
+AutoReqProv:    on
+
+%description -n libext2fs2
+The basic Ext2fs shared library.
+
+%package -n libext2fs-devel
+License:        GPL v2 or later
+Summary:        Development files for libext2fs
+Group:          Development/Libraries/C and C++
+AutoReqProv:    on
+Requires:       libext2fs2 = %version libcom_err-devel
+
+%description -n libext2fs-devel
+Development files for libext2fs.
+
+%package -n libcom_err2
+License:        GPL v2 or later
+Summary:        E2fsprogs error reporting library
+Group:          System/Filesystems
+# bug437293
+%ifarch ppc64
+Obsoletes:      libcom_err-64bit
+Obsoletes:      libcom_err2-64bit
+%endif
+#
+Provides:       libcom_err = %{version}
+Obsoletes:      libcom_err <= 1.40
+AutoReqProv:    on
+
+%description -n libcom_err2
+com_err is an error message display library.
+
+%package -n libcom_err-devel
+License:        GPL v2 or later
+Summary:        Development files for libcom_err
+Group:          Development/Libraries/C and C++
+AutoReqProv:    on
+# bug437293
+%ifarch ppc64
+Obsoletes:      libcom_err-devel-64bit
+%endif
+#
+Requires:       libcom_err2 = %version
+
+%description -n libcom_err-devel
+Development files for the com_err error message display library.
+
+%prep
+%setup -q
+# e2fsprogs patches
+%patch7 -p1
+%patch8 -p1
+# libcom_err patches
+%patch34 -p1
+%patch35 -p1
+cp %{SOURCE2} .
+cp %{S:6} po/de.po
+
+%build
+autoreconf --force --install
+./configure --prefix=%{_prefix} \
+  --with-root-prefix=''   \
+  --mandir=%{_mandir} \
+  --infodir=%{_infodir} \
+  --libdir=%{_libdir} \
+  --enable-elf-shlibs \
+  --disable-evms \
+  --disable-libblkid \
+  --disable-libuuid \
+  --disable-uuidd \
+  --disable-fsck \
+  CFLAGS="$RPM_OPT_FLAGS"
+make V=1
+
+%install
+make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}
+%{find_lang} %{name}
+rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
+rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4dev
+rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4dev
+rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8*
+rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
+
+%postun
+/sbin/ldconfig
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
+
+%post -n libext2fs2
+/sbin/ldconfig
+
+%postun -n libext2fs2
+/sbin/ldconfig
+
+%post -n libcom_err2
+/sbin/ldconfig
+
+%postun -n libcom_err2
+/sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-, root, root)
+%doc RELEASE-NOTES README
+%config /etc/mke2fs.conf
+/sbin/badblocks
+/sbin/debugfs
+/sbin/dumpe2fs
+/sbin/e2undo
+/sbin/e2fsck
+/sbin/e2label
+/sbin/fsck.ext2
+/sbin/fsck.ext3
+/sbin/fsck.ext4
+/sbin/mke2fs
+/sbin/mkfs.ext2
+/sbin/mkfs.ext3
+/sbin/mkfs.ext4
+/sbin/resize2fs
+/sbin/tune2fs
+/sbin/e2image
+/sbin/logsave
+/usr/bin/chattr
+/usr/bin/lsattr
+/usr/sbin/mklost+found
+/usr/sbin/filefrag
+/usr/sbin/e2freefrag
+%{_infodir}/libext2fs.info.gz
+%{_mandir}/man1/chattr.1.gz
+%{_mandir}/man1/lsattr.1.gz
+%{_mandir}/man5/e2fsck.conf.5.gz
+%{_mandir}/man5/mke2fs.conf.5.gz
+%{_mandir}/man8/*.8.gz
+
+%files devel
+%defattr(-,root,root)
+%doc README.SUSE
+
+%files -n libext2fs2
+%defattr(-, root, root)
+/%{_lib}/libext2fs.so.*
+/%{_lib}/libe2p.so.*
+
+%files -n libext2fs-devel
+%defattr(-, root, root)
+%{_libdir}/libext2fs.so
+%{_libdir}/libext2fs.a
+%{_libdir}/libe2p.a
+%{_libdir}/libe2p.so
+/usr/include/ext2fs
+/usr/include/e2p
+%_libdir/pkgconfig/e2p.pc
+%_libdir/pkgconfig/ext2fs.pc
+
+%files -n libcom_err2
+%defattr(-, root, root)
+/%{_lib}/libcom_err.so.*
+/%{_lib}/libss.so.*
+
+%files -n libcom_err-devel
+%defattr(-, root, root)
+%_bindir/compile_et
+%_bindir/mk_cmds
+%{_libdir}/libcom_err.so
+%{_libdir}/libcom_err.a
+%{_libdir}/libss.a
+%{_libdir}/libss.so
+%_libdir/pkgconfig/com_err.pc
+%_libdir/pkgconfig/ss.pc
+%_includedir/et
+%_includedir/ss
+%_datadir/et
+%_datadir/ss
+%{_mandir}/man1/compile_et.1.gz
+%{_mandir}/man1/mk_cmds.1.gz
+%{_mandir}/man3/com_err.3.gz
+
+%changelog
--- a/libcom_err-compile_et_permissions.patch
+++ b/libcom_err-compile_et_permissions.patch
@ -0,0 +1,13 @@
+Index: e2fsprogs-1.41.7/lib/et/compile_et.sh.in
+===================================================================
+--- e2fsprogs-1.41.7.orig/lib/et/compile_et.sh.in
+++ e2fsprogs-1.41.7/lib/et/compile_et.sh.in
+@@ -51,7 +51,7 @@ if test -f ${BASE}.h && cmp -s ${BASE}.h
+     rm -f ${BASE}.h.$$
+ else
+     mv -f ${BASE}.h.$$ ${BASE}.h
+-    chmod -w ${BASE}.h
+#    chmod -w ${BASE}.h
+ fi
+ $AWK -f "${DIR}/et_c.awk" "outfile=${BASE}.c.$$" "outfn=${BASE}.c" "$ROOT.et"
+ if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then
--- a/libcom_err-readline.patch
+++ b/libcom_err-readline.patch
@ -0,0 +1,13 @@
+Index: e2fsprogs-1.41.7/lib/ss/get_readline.c
+===================================================================
+--- e2fsprogs-1.41.7.orig/lib/ss/get_readline.c
+++ e2fsprogs-1.41.7/lib/ss/get_readline.c
+@@ -36,7 +36,7 @@ static void ss_release_readline(ss_data
+ }
+ 
+ /* Libraries we will try to use for readline/editline functionality */
+-#define DEFAULT_LIBPATH "libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
+#define DEFAULT_LIBPATH "libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
+ 
+ void ss_get_readline(int sci_idx)
+ {
--- a/0
+++ b/0