add packaging

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644 (file)
index 0000000..f51716c
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1,10 @@
+libext2fs
+       targetarch ia64 block!
+libcom_err
+  targetarch ia64 block!
+e2fsprogs
+e2fsprogs-devel
+libext2fs-devel
+  requires "libext2fs-<targettype> = <version>"
+libcom_err-devel
+  requires "libcom_err-<targettype> = <version>"

diff --git a/packaging/e2fsck.conf b/packaging/e2fsck.conf
new file mode 100644 (file)
index 0000000..489668f
--- /dev/null
+++ b/packaging/e2fsck.conf
@@ -0,0 +1,4 @@
+[options]
+# This will prevent e2fsck from stopping boot just because the clock is wrong
+broken_system_clock = 1
+

diff --git a/packaging/e2fsprogs-1.41.1-splash_support.patch b/packaging/e2fsprogs-1.41.1-splash_support.patch
new file mode 100644 (file)
index 0000000..6b4357f
--- /dev/null
+++ b/packaging/e2fsprogs-1.41.1-splash_support.patch
@@ -0,0 +1,188 @@
+Index: e2fsck/Makefile.in
+===================================================================
+--- e2fsck/Makefile.in.orig    2012-06-04 18:49:33.000000000 +0200
++++ e2fsck/Makefile.in 2012-06-14 09:50:56.344425761 +0200
+@@ -68,7 +68,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup
+       pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
+       dx_dirinfo.o ehandler.o problem.o message.o quota.o recovery.o \
+       region.o revoke.o ea_refcount.o rehash.o profile.o prof_err.o \
+-      logfile.o sigcatcher.o $(MTRACE_OBJ)
++      logfile.o sigcatcher.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 \
+@@ -107,6 +107,7 @@ SRCS= $(srcdir)/e2fsck.c \
+       $(srcdir)/rehash.c \
+       $(srcdir)/region.c \
+       $(srcdir)/profile.c \
++      $(srcdir)/splash.c \
+       $(srcdir)/sigcatcher.c \
+       $(srcdir)/logfile.c \
+       prof_err.c \
+@@ -539,6 +540,7 @@ region.o: $(srcdir)/region.c $(top_build
+  $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \
+  $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
+  $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
++splash.o: $(srcdir)/splash.c $(srcdir)/splash.h
+ profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
+  $(srcdir)/profile.h prof_err.h
+Index: e2fsck/splash.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ e2fsck/splash.c    2012-06-14 09:50:21.834048298 +0200
+@@ -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: e2fsck/splash.h
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ e2fsck/splash.h    2012-06-14 09:50:21.834048298 +0200
+@@ -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: e2fsck/unix.c
+===================================================================
+--- e2fsck/unix.c.orig 2012-06-12 04:12:50.000000000 +0200
++++ e2fsck/unix.c      2012-06-14 09:50:21.834048298 +0200
+@@ -51,6 +51,7 @@ extern int optind;
+ #include "e2p/e2p.h"
+ #include "e2fsck.h"
+ #include "problem.h"
++#include "splash.h"
+ #include "../version.h"
+ 
+ /* Command line options */
+@@ -1141,6 +1142,7 @@ int main (int argc, char *argv[])
+       __u32 features[3];
+       char *cp;
+       int qtype;  /* quota type */
++      struct splash_ops *sops;
+ 
+       clear_problem_context(&pctx);
+       sigcatcher_setup();
+@@ -1172,6 +1174,7 @@ int main (int argc, char *argv[])
+               exit(FSCK_ERROR);
+       }
+       reserve_stdio_fds();
++      splash_init(&sops);
+ 
+       set_up_logging(ctx);
+       if (ctx->logf) {
+@@ -1548,6 +1551,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)

diff --git a/packaging/e2fsprogs-1.42-ext2fsh_implicit.patch b/packaging/e2fsprogs-1.42-ext2fsh_implicit.patch
new file mode 100644 (file)
index 0000000..d995ff0
--- /dev/null
+++ b/packaging/e2fsprogs-1.42-ext2fsh_implicit.patch
@@ -0,0 +1,12 @@
+Index: lib/ext2fs/ext2fs.h
+===================================================================
+--- lib/ext2fs/ext2fs.h.orig   2012-06-04 18:42:23.000000000 +0200
++++ lib/ext2fs/ext2fs.h        2012-06-14 09:53:19.190709779 +0200
+@@ -53,6 +53,7 @@ extern "C" {
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ #if EXT2_FLAT_INCLUDES
+ #include "e2_types.h"

diff --git a/packaging/e2fsprogs-1.42-implicit_fortify_decl.patch b/packaging/e2fsprogs-1.42-implicit_fortify_decl.patch
new file mode 100644 (file)
index 0000000..c67d75b
--- /dev/null
+++ b/packaging/e2fsprogs-1.42-implicit_fortify_decl.patch
@@ -0,0 +1,18 @@
+Index: lib/ext2fs/mmp.c
+===================================================================
+--- lib/ext2fs/mmp.c.orig
++++ lib/ext2fs/mmp.c
+@@ -27,6 +27,13 @@
+ #include "ext2fs/ext2_fs.h"
+ #include "ext2fs/ext2fs.h"
+ 
++#if _BSD_SOURCE || _XOPEN_SOURCE >= 500
++#include <netdb.h>
++#endif
++
++#include <string.h>
++#include <stdio.h>
++
+ #ifndef O_DIRECT
+ #define O_DIRECT 0
+ #endif

diff --git a/packaging/e2fsprogs-1.42-voidreturn_value_declared.patch b/packaging/e2fsprogs-1.42-voidreturn_value_declared.patch
new file mode 100644 (file)
index 0000000..d30ba75
--- /dev/null
+++ b/packaging/e2fsprogs-1.42-voidreturn_value_declared.patch
@@ -0,0 +1,15 @@
+Index: lib/quota/quotaio.c
+===================================================================
+--- lib/quota/quotaio.c.orig   2012-03-18 19:18:33.000000000 +0100
++++ lib/quota/quotaio.c        2012-04-13 12:57:21.261673322 +0200
+@@ -142,8 +142,8 @@ errcode_t quota_inode_truncate(ext2_fils
+               return err;
+ 
+       inode.i_dtime = fs->now ? fs->now : time(0);
+-      if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
+-              return 0;
++      if (!(err = ext2fs_inode_has_valid_blocks2(fs, &inode)) )
++              return err;
+ 
+       ext2fs_block_iterate3(fs, ino, BLOCK_FLAG_READ_ONLY, NULL,
+                             release_blocks_proc, NULL);

diff --git a/packaging/libcom_err-compile_et_permissions.patch b/packaging/libcom_err-compile_et_permissions.patch
new file mode 100644 (file)
index 0000000..528f303
--- /dev/null
+++ b/packaging/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