Bug#692341: unblock: libsysactivity/0.6.4-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libsysactivity
Upstream fixed a bug on Linux, where libsysactivty would not report
"new" network activity. As I understand it, it will simply keep
returning the "initial" network stats without this patch.
The bug has not been filed in Debian, but it got filed in Ubuntu (LP:
#1072398[0]) and against upstream [1] - in both cases against
"sentinella" instead of libsysactivity (which is the primary consumer
of the library).
I have decided to package the entire new upstream release as this bug
fix (+4 lines) is the only change.
unblock libsysactivity/0.6.4-1
[0] https://bugs.launchpad.net/bugs/1072398
[1] https://sourceforge.net/tracker/?func=detail&aid=3578869&group_id=277778&atid=1179456
*** d libsysactivity
Base version: libsysactivity_0.6.3-1 from testing
Target version: libsysactivity_0.6.4-1 from unstable
No hints in place.
CHANGELOG | 3 +++
CMakeLists.txt | 2 +-
Doxyfile | 2 +-
cmake/libsysactivityConfigVersion.cmake | 4 ++--
debian/changelog | 8 ++++++++
src/Linux/network.c | 4 ++++
src/common/global.h | 2 +-
7 files changed, 20 insertions(+), 5 deletions(-)
diff -Nru libsysactivity-0.6.3/CHANGELOG libsysactivity-0.6.4/CHANGELOG
--- libsysactivity-0.6.3/CHANGELOG 2012-05-21 17:27:55.000000000 +0000
+++ libsysactivity-0.6.4/CHANGELOG 2012-10-22 16:16:21.000000000 +0000
@@ -1,4 +1,7 @@
+libsysactivity 0.6.4 (released 2012-10-22)
+* Linux version of sa_reset_net_interfaces() was not realoading data.
+
libsysactivity 0.6.3 (released 2012-05-21)
* Minor fixes in linux/network and test code.
diff -Nru libsysactivity-0.6.3/cmake/libsysactivityConfigVersion.cmake libsysactivity-0.6.4/cmake/libsysactivityConfigVersion.cmake
--- libsysactivity-0.6.3/cmake/libsysactivityConfigVersion.cmake 2012-05-21 17:27:55.000000000 +0000
+++ libsysactivity-0.6.4/cmake/libsysactivityConfigVersion.cmake 2012-10-22 16:16:21.000000000 +0000
@@ -9,9 +9,9 @@
if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 0) # == 0.y.z
if ("${PACKAGE_FIND_VERSION_MINOR}" GREATER 5) # > 0.5.z
set(PACKAGE_VERSION_COMPATIBLE true)
- if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 6 AND "${PACKAGE_FIND_VERSION_PATCH}" EQUAL 3) # == 0.6.3
+ if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 6 AND "${PACKAGE_FIND_VERSION_PATCH}" EQUAL 4) # == 0.6.4
set(PACKAGE_VERSION_EXACT true)
- endif ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 6 AND "${PACKAGE_FIND_VERSION_PATCH}" EQUAL 3)
+ endif ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 6 AND "${PACKAGE_FIND_VERSION_PATCH}" EQUAL 4)
endif ("${PACKAGE_FIND_VERSION_MINOR}" GREATER 5)
endif ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 0)
diff -Nru libsysactivity-0.6.3/CMakeLists.txt libsysactivity-0.6.4/CMakeLists.txt
--- libsysactivity-0.6.3/CMakeLists.txt 2012-05-21 17:27:55.000000000 +0000
+++ libsysactivity-0.6.4/CMakeLists.txt 2012-10-22 16:16:21.000000000 +0000
@@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 2.6.0)
project(libsysactivity C)
-set(LIBSA_VERSION "0.6.3")
+set(LIBSA_VERSION "0.6.4")
set(CMAKE_VERBOSE_MAKEFILE TRUE)
enable_testing()
diff -Nru libsysactivity-0.6.3/debian/changelog libsysactivity-0.6.4/debian/changelog
--- libsysactivity-0.6.3/debian/changelog 2012-06-04 15:12:12.000000000 +0000
+++ libsysactivity-0.6.4/debian/changelog 2012-11-02 10:35:02.000000000 +0000
@@ -1,3 +1,11 @@
+libsysactivity (0.6.4-1) unstable; urgency=low
+
+ * New upstream release.
+ - Made Linux version of sa_reset_net_interfaces reload data.
+ (LP: #1072398)
+
+ -- Niels Thykier <niels@thykier.net> Fri, 02 Nov 2012 11:35:00 +0100
+
libsysactivity (0.6.3-1) unstable; urgency=low
* New upstream release.
diff -Nru libsysactivity-0.6.3/Doxyfile libsysactivity-0.6.4/Doxyfile
--- libsysactivity-0.6.3/Doxyfile 2012-05-21 17:27:55.000000000 +0000
+++ libsysactivity-0.6.4/Doxyfile 2012-10-22 16:16:21.000000000 +0000
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.6.3
+PROJECT_NUMBER = 0.6.4
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff -Nru libsysactivity-0.6.3/src/common/global.h libsysactivity-0.6.4/src/common/global.h
--- libsysactivity-0.6.3/src/common/global.h 2012-05-21 17:27:55.000000000 +0000
+++ libsysactivity-0.6.4/src/common/global.h 2012-10-22 16:16:21.000000000 +0000
@@ -27,7 +27,7 @@
#define SA_VERSION_MAJOR 0
#define SA_VERSION_SMALL 6
-#define SA_VERSION_MINOR 3
+#define SA_VERSION_MINOR 4
#if __GNUC__ >= 4
#define SA_EXPORT __attribute__ ((visibility("default")))
diff -Nru libsysactivity-0.6.3/src/Linux/network.c libsysactivity-0.6.4/src/Linux/network.c
--- libsysactivity-0.6.3/src/Linux/network.c 2012-05-21 17:27:55.000000000 +0000
+++ libsysactivity-0.6.4/src/Linux/network.c 2012-10-22 16:16:21.000000000 +0000
@@ -76,6 +76,10 @@
}
int sa_reset_net_interfaces() {
+ fclose(file_net_dev);
+ file_net_dev = fopen("/proc/net/dev", "r");
+ if (file_net_dev == NULL)
+ return EIO;
if (fseek(file_net_dev, pos_useful_data, SEEK_SET) != 0)
return ENOSYS;
return 0;
Hints needed:
unblock libsysactivity/0.6.4-1
Reply to: