[gentoo-commits] gentoo-x86 commit in app-misc/hivex/files: incorrect_format.patch autoconf_fix-1.3.0.patch

[Maxim Koltsov (maksbotan)]

maksbotan    11/09/06 17:17:33

  Added:                incorrect_format.patch autoconf_fix-1.3.0.patch
  Log:
  Add app-misc/hivex, bug #342217
  
  (Portage version: 2.1.10.12/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-misc/hivex/files/incorrect_format.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/incorrect_format.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/incorrect_format.patch?rev=1.1&content-type=text/plain

Index: incorrect_format.patch
===================================================================
From: Richard W.M. Jones <rjones@××××××.com>
Date: Mon, 15 Aug 2011 09:52:00 +0000 (+0100)
Subject: Fix incorrect printf format specifier in error string.
X-Git-Url: http://git.annexia.org/?p=hivex.git;a=commitdiff_plain;h=5a4fd441d23f96ca618e55d4e54471d2e0fa94af

Fix incorrect printf format specifier in error string.
---

diff --git a/lib/hivex.c b/lib/hivex.c
index dceea73..a3f5171 100644
--- a/lib/hivex.c
+++ b/lib/hivex.c
@@ -621,7 +621,8 @@ timestamp_check (hive_h *h, hive_node_h node, int64_t timestamp)
   if (timestamp < 0) {
     if (h->msglvl >= 2)
       fprintf (stderr, "hivex: timestamp_check: "
-               "negative time reported at %z: %" PRIi64 "\n", node, timestamp);
+               "negative time reported at %zu: %" PRIi64 "\n",
+               node, timestamp);
     errno = EINVAL;
     return -1;
   }



1.1                  app-misc/hivex/files/autoconf_fix-1.3.0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/autoconf_fix-1.3.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/autoconf_fix-1.3.0.patch?rev=1.1&content-type=text/plain

Index: autoconf_fix-1.3.0.patch
===================================================================
--- configure.ac.orig	2011-08-15 22:29:28.309745342 +0300
+++ configure.ac	2011-08-15 22:34:54.324549151 +0300
@@ -170,11 +170,18 @@
 AC_SUBST([LIBXML2_CFLAGS])
 AC_SUBST([LIBXML2_LIBS])
 
+
+dnl ////////////////////////////////////////////////////////////////////////////
 dnl Check for OCaml (optional, for OCaml bindings).
+
+AC_ARG_ENABLE([ocaml],
+       AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
+
+
 AC_PROG_OCAML
 AC_PROG_FINDLIB
 AM_CONDITIONAL([HAVE_OCAML],
-    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
+    [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"])
 AM_CONDITIONAL([HAVE_OCAMLOPT],
     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
 
@@ -207,6 +214,8 @@
     rm -f conftest conftest.* conftest_ml.*
 fi
 
+dnl ///////////////////////////////////////////////////////////////////////////////////////
+
 dnl Check for Perl (optional, for Perl bindings).
 dnl XXX This isn't quite right, we should check for Perl devel library.
 AC_CHECK_PROG([PERL],[perl],[perl],[no])
@@ -214,21 +223,35 @@
 dnl Check for Perl modules that must be present to compile and
 dnl test the Perl bindings.
 missing_perl_modules=no
-for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-    AC_MSG_CHECKING([for $pm])
-    if ! perl -M$pm -e1 >/dev/null 2>&1; then
-        AC_MSG_RESULT([no])
-        missing_perl_modules=yes
-    else
-        AC_MSG_RESULT([yes])
-    fi
-done
-if test "x$missing_perl_modules" = "xyes"; then
-    AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
-fi
+
+AC_ARG_ENABLE([perl],
+       AS_HELP_STRING([--with-perl],[build Perl binding]))
+
+
+PERL=
+AS_IF([test "x$enable_perl" != "xno" ],[
+       AC_CHECK_PROG([PERL],[perl],[yes],[no])
+
+    for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
+        AC_MSG_CHECKING([for $pm])
+        if ! perl -M$pm -e1 >/dev/null 2>&1; then
+            AC_MSG_RESULT([no])
+            missing_perl_modules=yes
+        else
+            AC_MSG_RESULT([yes])
+        fi
+    done
+
+    AS_IF([test "x$missing_perl_modules" = "xyes"],
+        [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
+        )
+])
+
 
 AM_CONDITIONAL([HAVE_PERL],
-    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
+    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
+
+dnl //////////////////////////////////////////////////////////////////////////////////////////////////
 
 dnl Check for Python (optional, for Python bindings).
 AC_CHECK_PROG([PYTHON],[python],[python],[no])
@@ -266,15 +289,21 @@
 AC_SUBST(PYTHON_INCLUDEDIR)
 AC_SUBST(PYTHON_SITE_PACKAGES)
 
+AC_ARG_ENABLE([python],
+       AS_HELP_STRING([--with-python],[build Python binding]))
+
 AM_CONDITIONAL([HAVE_PYTHON],
-    [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"])
+    [test "x$PYTHON_INCLUDEDIR" != "x" -a  "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
 
 dnl Check for Ruby and rake (optional, for Ruby bindings).
 AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
 AC_CHECK_PROG([RAKE],[rake],[rake],[no])
 
+AC_ARG_ENABLE([ruby],
+       AS_HELP_STRING([--with-ruby],[build Ruby binding]))
+
 AM_CONDITIONAL([HAVE_RUBY],
-    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
+    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"])
 
 dnl dnl Check for Java.
 dnl AC_ARG_WITH(java_home,