From f796c3682d91a36f1f1a43dbafb8453afa708579 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 May 2011 12:12:18 +0100 Subject: [PATCH] New upstream version 1.2.6. --- .gitignore | 1 + ...thon-fix-for-i386-integer-size-issue.patch | 164 ------------------ hivex.spec | 12 +- sources | 2 +- 4 files changed, 8 insertions(+), 171 deletions(-) delete mode 100644 hivex-1.2.5-python-fix-for-i386-integer-size-issue.patch diff --git a/.gitignore b/.gitignore index 7d68e39..a0792be 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ hivex-1.2.2.tar.gz /hivex-1.2.3.tar.gz /hivex-1.2.4.tar.gz /hivex-1.2.5.tar.gz +/hivex-1.2.6.tar.gz diff --git a/hivex-1.2.5-python-fix-for-i386-integer-size-issue.patch b/hivex-1.2.5-python-fix-for-i386-integer-size-issue.patch deleted file mode 100644 index bec6169..0000000 --- a/hivex-1.2.5-python-fix-for-i386-integer-size-issue.patch +++ /dev/null @@ -1,164 +0,0 @@ ---- python/hivex-py.c.orig 2011-04-28 09:46:43.687712232 +0100 -+++ python/hivex-py.c 2011-04-28 09:46:45.843757332 +0100 -@@ -3,7 +3,7 @@ - * generator/generator.ml - * ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST. - * -- * Copyright (C) 2009-2010 Red Hat Inc. -+ * Copyright (C) 2009-2011 Red Hat Inc. - * Derived from code by Petter Nordahl-Hagen under a compatible license: - * Copyright (c) 1997-2007 Petter Nordahl-Hagen. - * Derived from code by Markus Stephany under a compatible license: -@@ -290,7 +290,7 @@ - PyObject *py_h; - long node; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_node_name", &py_h, &node)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_node_name", &py_h, &node)) - return NULL; - h = get_handle (py_h); - r = hivex_node_name (h, node); -@@ -313,7 +313,7 @@ - PyObject *py_h; - long node; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_node_children", &py_h, &node)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_node_children", &py_h, &node)) - return NULL; - h = get_handle (py_h); - r = hivex_node_children (h, node); -@@ -339,7 +339,7 @@ - long node; - char *name; - -- if (!PyArg_ParseTuple (args, (char *) "OLs:hivex_node_get_child", &py_h, &node, &name)) -+ if (!PyArg_ParseTuple (args, (char *) "Ols:hivex_node_get_child", &py_h, &node, &name)) - return NULL; - h = get_handle (py_h); - r = hivex_node_get_child (h, node, name); -@@ -367,7 +367,7 @@ - PyObject *py_h; - long node; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_node_parent", &py_h, &node)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_node_parent", &py_h, &node)) - return NULL; - h = get_handle (py_h); - r = hivex_node_parent (h, node); -@@ -390,7 +390,7 @@ - PyObject *py_h; - long node; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_node_values", &py_h, &node)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_node_values", &py_h, &node)) - return NULL; - h = get_handle (py_h); - r = hivex_node_values (h, node); -@@ -415,7 +415,7 @@ - long node; - char *key; - -- if (!PyArg_ParseTuple (args, (char *) "OLs:hivex_node_get_value", &py_h, &node, &key)) -+ if (!PyArg_ParseTuple (args, (char *) "Ols:hivex_node_get_value", &py_h, &node, &key)) - return NULL; - h = get_handle (py_h); - r = hivex_node_get_value (h, node, key); -@@ -438,7 +438,7 @@ - PyObject *py_h; - long val; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_value_key", &py_h, &val)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_value_key", &py_h, &val)) - return NULL; - h = get_handle (py_h); - r = hivex_value_key (h, val); -@@ -463,7 +463,7 @@ - PyObject *py_h; - long val; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_value_type", &py_h, &val)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_value_type", &py_h, &val)) - return NULL; - h = get_handle (py_h); - r = hivex_value_type (h, val, &t, &len); -@@ -488,7 +488,7 @@ - PyObject *py_h; - long val; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_value_value", &py_h, &val)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_value_value", &py_h, &val)) - return NULL; - h = get_handle (py_h); - r = hivex_value_value (h, val, &t, &len); -@@ -512,7 +512,7 @@ - PyObject *py_h; - long val; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_value_string", &py_h, &val)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_value_string", &py_h, &val)) - return NULL; - h = get_handle (py_h); - r = hivex_value_string (h, val); -@@ -535,7 +535,7 @@ - PyObject *py_h; - long val; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_value_multiple_strings", &py_h, &val)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_value_multiple_strings", &py_h, &val)) - return NULL; - h = get_handle (py_h); - r = hivex_value_multiple_strings (h, val); -@@ -560,7 +560,7 @@ - PyObject *py_h; - long val; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_value_dword", &py_h, &val)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_value_dword", &py_h, &val)) - return NULL; - h = get_handle (py_h); - r = hivex_value_dword (h, val); -@@ -584,7 +584,7 @@ - PyObject *py_h; - long val; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_value_qword", &py_h, &val)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_value_qword", &py_h, &val)) - return NULL; - h = get_handle (py_h); - r = hivex_value_qword (h, val); -@@ -632,7 +632,7 @@ - long parent; - char *name; - -- if (!PyArg_ParseTuple (args, (char *) "OLs:hivex_node_add_child", &py_h, &parent, &name)) -+ if (!PyArg_ParseTuple (args, (char *) "Ols:hivex_node_add_child", &py_h, &parent, &name)) - return NULL; - h = get_handle (py_h); - r = hivex_node_add_child (h, parent, name); -@@ -655,7 +655,7 @@ - PyObject *py_h; - long node; - -- if (!PyArg_ParseTuple (args, (char *) "OL:hivex_node_delete_child", &py_h, &node)) -+ if (!PyArg_ParseTuple (args, (char *) "Ol:hivex_node_delete_child", &py_h, &node)) - return NULL; - h = get_handle (py_h); - r = hivex_node_delete_child (h, node); -@@ -681,7 +681,7 @@ - py_set_values values; - PyObject *py_values; - -- if (!PyArg_ParseTuple (args, (char *) "OLO:hivex_node_set_values", &py_h, &node, &py_values)) -+ if (!PyArg_ParseTuple (args, (char *) "OlO:hivex_node_set_values", &py_h, &node, &py_values)) - return NULL; - h = get_handle (py_h); - if (get_values (py_values, &values) == -1) -@@ -710,7 +710,7 @@ - hive_set_value val; - PyObject *py_val; - -- if (!PyArg_ParseTuple (args, (char *) "OLO:hivex_node_set_value", &py_h, &node, &py_val)) -+ if (!PyArg_ParseTuple (args, (char *) "OlO:hivex_node_set_value", &py_h, &node, &py_val)) - return NULL; - h = get_handle (py_h); - if (get_value (py_val, &val) == -1) diff --git a/hivex.spec b/hivex.spec index 5406e50..468cdf3 100644 --- a/hivex.spec +++ b/hivex.spec @@ -6,8 +6,8 @@ %endif Name: hivex -Version: 1.2.5 -Release: 2%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: Read and write Windows Registry binary hive files Group: Development/Libraries @@ -38,9 +38,6 @@ Conflicts: libguestfs <= 1:1.0.84 # Fix Perl directory install path. Patch0: %{name}-1.2.3-dirs.patch -# Fix Python bindings on 32 bit arch (patch is upstream). -Patch1: hivex-1.2.5-python-fix-for-i386-integer-size-issue.patch - %description Hive files are the undocumented binary blobs that Windows uses to @@ -147,7 +144,6 @@ python-%{name} contains Python bindings for %{name}. %setup -q %patch0 -p1 -b .dirs -%patch1 -p0 -b .32bit %build @@ -256,6 +252,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 12 2011 Richard W.M. Jones - 1.2.6-1 +- New upstream version 1.2.6. +- Removed patch which is now upstream. + * Thu Apr 28 2011 Richard W.M. Jones - 1.2.5-2 - Fix Python bindings on 32 bit arch with upstream patch. diff --git a/sources b/sources index b1cc7a3..1f47732 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a15c388afd46a791e9d94b70cb16e76 hivex-1.2.5.tar.gz +6eba5c9f119a592562e7bb1a96629e08 hivex-1.2.6.tar.gz