Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-release-src > by-pkgid > 7d928033b3d8b4d40d8ab11b67a91396 > files > 3

nut-2.6.5-15.mga5.src.rpm

diff -up nut-2.7.1/tools/nut-scanner/scan_avahi.c.dlfix nut-2.7.1/tools/nut-scanner/scan_avahi.c
--- nut-2.7.1/tools/nut-scanner/scan_avahi.c.dlfix	2013-07-31 22:41:31.000000000 +0200
+++ nut-2.7.1/tools/nut-scanner/scan_avahi.c	2014-02-27 11:25:57.610869514 +0100
@@ -36,7 +36,7 @@
 #include <ltdl.h>
 
 /* dynamic link library stuff */
-static char * libname = "libavahi-client";
+static char * libname = LIBAVAHI_CLIENT_PATH;
 static lt_dlhandle dl_handle = NULL;
 static const char *dl_error = NULL;
 
@@ -99,7 +99,7 @@ int nutscan_load_avahi_library()
                 return 0;
         }
 
-        dl_handle = lt_dlopenext(libname);
+        dl_handle = lt_dlopen(libname);
         if (!dl_handle) {
                 dl_error = lt_dlerror();
                 goto err;
diff -up nut-2.7.1/tools/nut-scanner/scan_ipmi.c.dlfix nut-2.7.1/tools/nut-scanner/scan_ipmi.c
--- nut-2.7.1/tools/nut-scanner/scan_ipmi.c.dlfix	2013-07-31 22:41:31.000000000 +0200
+++ nut-2.7.1/tools/nut-scanner/scan_ipmi.c	2014-02-27 11:32:20.393015238 +0100
@@ -30,7 +30,7 @@
 #define NUT_IPMI_DRV_NAME	"nut-ipmipsu"
 
 /* dynamic link library stuff */
-static char * libname = "libfreeipmi";
+static char * libname = LIBFREEIPMI_PATH;
 static lt_dlhandle dl_handle = NULL;
 static const char *dl_error = NULL;
 
@@ -109,7 +109,7 @@
 		return 0;
 	}
 
-	dl_handle = lt_dlopenext(libname);
+	dl_handle = lt_dlopen(libname);
 	if (!dl_handle) {
 		dl_error = lt_dlerror();
 		goto err;
diff -up nut-2.7.1/tools/nut-scanner/scan_nut.c.dlfix nut-2.7.1/tools/nut-scanner/scan_nut.c
--- nut-2.7.1/tools/nut-scanner/scan_nut.c.dlfix	2013-10-30 14:47:15.000000000 +0100
+++ nut-2.7.1/tools/nut-scanner/scan_nut.c	2014-02-27 11:25:57.611869522 +0100
@@ -26,7 +26,7 @@
 #include <ltdl.h>
 
 /* dynamic link library stuff */
-static char * libname = "libupsclient";
+static char * libname = LIBUPSCLIENT_PATH;
 static lt_dlhandle dl_handle = NULL;
 static const char *dl_error = NULL;
 
@@ -67,7 +67,7 @@ int nutscan_load_upsclient_library()
                 return 0;
         }
 
-        dl_handle = lt_dlopenext(libname);
+        dl_handle = lt_dlopen(libname);
         if (!dl_handle) {
                 dl_error = lt_dlerror();
                 goto err;
diff -up nut-2.7.1/tools/nut-scanner/scan_snmp.c.dlfix nut-2.7.1/tools/nut-scanner/scan_snmp.c
--- nut-2.7.1/tools/nut-scanner/scan_snmp.c.dlfix	2013-07-31 22:41:31.000000000 +0200
+++ nut-2.7.1/tools/nut-scanner/scan_snmp.c	2014-02-27 11:25:57.611869522 +0100
@@ -74,7 +74,7 @@ static int thread_count = 0;
 long g_usec_timeout ;
 
 /* dynamic link library stuff */
-static char * libname = "libnetsnmp";
+static char * libname = LIBNETSNMP_PATH;
 static lt_dlhandle dl_handle = NULL;
 static const char *dl_error = NULL;
 
@@ -119,7 +119,7 @@ int nutscan_load_snmp_library()
                 return 0;
         }
 
-	dl_handle = lt_dlopenext(libname);
+	dl_handle = lt_dlopen(libname);
 	if (!dl_handle) {
 		dl_error = lt_dlerror();
 		goto err;
diff -up nut-2.7.1/tools/nut-scanner/scan_usb.c.dlfix nut-2.7.1/tools/nut-scanner/scan_usb.c
--- nut-2.7.1/tools/nut-scanner/scan_usb.c.dlfix	2013-07-31 22:41:31.000000000 +0200
+++ nut-2.7.1/tools/nut-scanner/scan_usb.c	2014-02-27 11:25:57.611869522 +0100
@@ -28,7 +28,7 @@
 #include <ltdl.h>
 
 /* dynamic link library stuff */
-static char * libname = "libusb";
+static char * libname = LIBUSB_PATH;
 static lt_dlhandle dl_handle = NULL;
 static const char *dl_error = NULL;
 static int (*nut_usb_close)(usb_dev_handle *dev);
@@ -58,7 +58,7 @@ int nutscan_load_usb_library()
 		return 0;
 	}
 
-        dl_handle = lt_dlopenext(libname);
+        dl_handle = lt_dlopen(libname);
         if (!dl_handle) {
                 dl_error = lt_dlerror();
                 goto err;
diff -up nut-2.7.1/tools/nut-scanner/scan_xml_http.c.dlfix nut-2.7.1/tools/nut-scanner/scan_xml_http.c
--- nut-2.7.1/tools/nut-scanner/scan_xml_http.c.dlfix	2013-07-31 22:41:31.000000000 +0200
+++ nut-2.7.1/tools/nut-scanner/scan_xml_http.c	2014-02-27 11:25:57.611869522 +0100
@@ -33,7 +33,7 @@
 #include <ltdl.h>
 
 /* dynamic link library stuff */
-static char * libname = "libneon";
+static char * libname = LIBNEON_PATH;
 static lt_dlhandle dl_handle = NULL;
 static const char *dl_error = NULL;
 
@@ -64,7 +64,7 @@ int nutscan_load_neon_library()
                 return 0;
         }
 
-        dl_handle = lt_dlopenext(libname);
+        dl_handle = lt_dlopen(libname);
         if (!dl_handle) {
                 dl_error = lt_dlerror();
                 goto err;