Patchwork [04/10] libmbus: bump to version 0.7.0

login
register
mail settings
Submitter Gustavo Zacarias
Date May 11, 2012, 7:37 p.m.
Message ID <1336765059-20673-4-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/158577/
State Accepted
Commit 92c24094240f75b44023f6a2611f66c8d1db9656
Headers show

Comments

Gustavo Zacarias - May 11, 2012, 7:37 p.m.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libmbus/libmbus-0.6.1-bcopy.patch |   15 ---------------
 package/libmbus/libmbus-bcopy.patch       |   16 ++++++++++++++++
 package/libmbus/libmbus.mk                |    4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 package/libmbus/libmbus-0.6.1-bcopy.patch
 create mode 100644 package/libmbus/libmbus-bcopy.patch

Patch

diff --git a/package/libmbus/libmbus-0.6.1-bcopy.patch b/package/libmbus/libmbus-0.6.1-bcopy.patch
deleted file mode 100644
index 8b8310c..0000000
--- a/package/libmbus/libmbus-0.6.1-bcopy.patch
+++ /dev/null
@@ -1,15 +0,0 @@ 
-Drop bcopy since it's deprecated.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-diff -Nura libmbus-0.6.1/mbus/mbus-tcp.c libmbus-0.6.1-bcopy/mbus/mbus-tcp.c
---- libmbus-0.6.1/mbus/mbus-tcp.c	2011-11-06 02:34:28.000000000 -0300
-+++ libmbus-0.6.1-bcopy/mbus/mbus-tcp.c	2012-05-03 08:11:39.680346347 -0300
-@@ -78,7 +78,7 @@
-         return NULL;
-     }
- 
--    bcopy((void *)(host_addr->h_addr), (void *)(&s_addr.sin_addr), host_addr->h_length);
-+    memmove((void *)(&s_addr.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
- 
-     if (connect(handle->sock, (struct sockaddr *)&s_addr, sizeof(s_addr)) < 0)
-     {
diff --git a/package/libmbus/libmbus-bcopy.patch b/package/libmbus/libmbus-bcopy.patch
new file mode 100644
index 0000000..660cc37
--- /dev/null
+++ b/package/libmbus/libmbus-bcopy.patch
@@ -0,0 +1,16 @@ 
+Drop bcopy since it's deprecated.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libmbus-0.7.0/mbus/mbus-tcp.c libmbus-0.7.0-bcopy/mbus/mbus-tcp.c
+--- libmbus-0.7.0/mbus/mbus-tcp.c	2011-12-08 13:21:19.000000000 -0300
++++ libmbus-0.7.0-bcopy/mbus/mbus-tcp.c	2012-05-03 09:08:36.987106612 -0300
+@@ -78,7 +78,7 @@
+         return NULL;
+     }
+ 
+-    bcopy((void *)(host_addr->h_addr), (void *)(&s.sin_addr), host_addr->h_length);
++    memmove((void *)(&s.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
+ 
+     if (connect(handle->sock, (struct sockaddr *)&s, sizeof(s)) < 0)
+     {
diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk
index 9abb2bf..17954b9 100644
--- a/package/libmbus/libmbus.mk
+++ b/package/libmbus/libmbus.mk
@@ -4,8 +4,8 @@ 
 #
 #############################################################
 
-LIBMBUS_VERSION = 0.6.1
-LIBMBUS_SITE = http://www.freescada.com/public-dist/
+LIBMBUS_VERSION = 0.7.0
+LIBMBUS_SITE = http://www.freescada.com/public-dist
 LIBMBUS_INSTALL_STAGING = YES
 
 # Without this the build yields an error: