Hilko Bengen
2014-Jun-13 20:52 UTC
[Libguestfs] [libldm 1/3] relax uuid, zlib version requirements
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 469ea96..0e7e2ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,14 +85,14 @@ PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.32.0],
]
)
-PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5],
+PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2],
[
AC_SUBST([ZLIB_CFLAGS])
AC_SUBST([ZLIB_LIBS])
]
)
-PKG_CHECK_MODULES([UUID], [uuid >= 2.21.0],
+PKG_CHECK_MODULES([UUID], [uuid],
[
AC_SUBST([UUID_CFLAGS])
AC_SUBST([UUID_LIBS])
--
2.0.0
Hilko Bengen
2014-Jun-13 20:52 UTC
[Libguestfs] [libldm 2/3] easy fix for compiling with -Werror=format-security
error: format not a string literal and no format arguments
[-Werror=format-security]
---
src/ldm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ldm.c b/src/ldm.c
index 4897de9..539c562 100644
--- a/src/ldm.c
+++ b/src/ldm.c
@@ -2762,7 +2762,7 @@ _dm_create_mirrored(const LDMVolumePrivate * const vol,
GError ** const err)
GString * chunk = _dm_create_part(part, cookie, err);
if (chunk == NULL) {
if (err && (*err)->code == LDM_ERROR_MISSING_DISK) {
- g_warning((*err)->message);
+ g_warning("%s", (*err)->message);
g_error_free(*err); *err = NULL;
g_string_append(target.params, " - -");
continue;
@@ -2807,7 +2807,7 @@ out:
for (int i = devices->len; i > 0; i--) {
GString *device = g_array_index(devices, GString *, i - 1);
if (!_dm_remove(device->str, 0, &cleanup_err)) {
- g_warning(cleanup_err->message);
+ g_warning("%s", cleanup_err->message);
g_error_free(cleanup_err); cleanup_err = NULL;
}
}
@@ -2850,7 +2850,7 @@ _dm_create_raid5(const LDMVolumePrivate * const vol,
GError ** const err)
GString * chunk = _dm_create_part(part, cookie, err);
if (chunk == NULL) {
if (err && (*err)->code == LDM_ERROR_MISSING_DISK) {
- g_warning((*err)->message);
+ g_warning("%s", (*err)->message);
g_error_free(*err); *err = NULL;
g_string_append(target.params, " - -");
continue;
@@ -2895,7 +2895,7 @@ out:
for (int i = devices->len; i > 0; i--) {
GString *device = g_array_index(devices, GString *, i - 1);
if (!_dm_remove(device->str, 0, &cleanup_err)) {
- g_warning(cleanup_err->message);
+ g_warning("%s", cleanup_err->message);
g_error_free(cleanup_err); cleanup_err = NULL;
}
}
--
2.0.0
Hilko Bengen
2014-Jun-13 20:52 UTC
[Libguestfs] [libldm 3/3] Don't call g_type_init when compiling with newer glib versions
---
src/ldmtool.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/ldmtool.c b/src/ldmtool.c
index 48043e8..9f89861 100644
--- a/src/ldmtool.c
+++ b/src/ldmtool.c
@@ -779,7 +779,9 @@ main(int argc, char *argv[])
}
g_option_context_free(context);
+#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init();
+#endif
LDM * const ldm = ldm_new(&err);
--
2.0.0
Richard W.M. Jones
2014-Jun-13 21:38 UTC
Re: [Libguestfs] [libldm 1/3] relax uuid, zlib version requirements
On Fri, Jun 13, 2014 at 10:52:10PM +0200, Hilko Bengen wrote:> --- > configure.ac | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 469ea96..0e7e2ea 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -85,14 +85,14 @@ PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.32.0], > ] > ) > > -PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5], > +PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2], > [ > AC_SUBST([ZLIB_CFLAGS]) > AC_SUBST([ZLIB_LIBS]) > ] > ) > > -PKG_CHECK_MODULES([UUID], [uuid >= 2.21.0], > +PKG_CHECK_MODULES([UUID], [uuid], > [ > AC_SUBST([UUID_CFLAGS]) > AC_SUBST([UUID_LIBS]) > -- > 2.0.0ACK to all 3 patches. Now the question is if you have access to the libldm source repository. I suspect you may need Matt Booth (CC'd) to give it to you. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
Matthew Booth
2014-Jun-16 08:24 UTC
Re: [Libguestfs] [libldm 1/3] relax uuid, zlib version requirements
On 13/06/14 22:38, Richard W.M. Jones wrote:> On Fri, Jun 13, 2014 at 10:52:10PM +0200, Hilko Bengen wrote: >> --- >> configure.ac | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/configure.ac b/configure.ac >> index 469ea96..0e7e2ea 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -85,14 +85,14 @@ PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.32.0], >> ] >> ) >> >> -PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5], >> +PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2], >> [ >> AC_SUBST([ZLIB_CFLAGS]) >> AC_SUBST([ZLIB_LIBS]) >> ] >> ) >> >> -PKG_CHECK_MODULES([UUID], [uuid >= 2.21.0], >> +PKG_CHECK_MODULES([UUID], [uuid], >> [ >> AC_SUBST([UUID_CFLAGS]) >> AC_SUBST([UUID_LIBS]) >> -- >> 2.0.0 > > ACK to all 3 patches.Yup, they will have been set because they were whatever I had on my box at the time.> Now the question is if you have access to the libldm source > repository. I suspect you may need Matt Booth (CC'd) to give it to > you.I'm happy to add anybody on Rich's recommendation. In fact, Rich, aren't you an admin? Matt -- Matthew Booth Red Hat Engineering, Virtualisation Team Phone: +442070094448 (UK) GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490