ishcherb / rpms / dionaea

Forked from rpms/dionaea 6 years ago
Clone

Blame dionaea-08_modules_libdir.patch

Michal Ambroz aea04ba
fix hardcoded /lib dir
Michal Ambroz aea04ba
on 64 platform the RedHat based distrubutions prefer the lib directories to 
Michal Ambroz aea04ba
have different names for 64 bit (lib64) and 32 bit (lib).
Michal Ambroz aea04ba
This fix allows to configure that at compile time.
Michal Ambroz aea04ba
Michal Ambroz aea04ba
https://github.com/DinoTools/dionaea/pull/181
Michal Ambroz aea04ba
Michal Ambroz aea04ba
diff -ru dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/modules/python/module.c dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/modules/python/module.c
Michal Ambroz aea04ba
--- dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/modules/python/module.c	2018-03-26 22:14:31.519330709 +0200
Michal Ambroz aea04ba
+++ dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/modules/python/module.c	2018-03-26 22:15:40.311274663 +0200
Michal Ambroz aea04ba
@@ -348,7 +348,7 @@
Michal Ambroz aea04ba
 
Michal Ambroz aea04ba
 	Py_Initialize();
Michal Ambroz aea04ba
 
Michal Ambroz aea04ba
-	runtime.sys_path = g_string_new(PREFIX"/lib/dionaea/python/");
Michal Ambroz aea04ba
+	runtime.sys_path = g_string_new(LIBDIR"/dionaea/python/");
Michal Ambroz aea04ba
 
Michal Ambroz aea04ba
 	PyObject *name = PyUnicode_FromString("traceback");
Michal Ambroz aea04ba
 	runtime.traceback.module = PyImport_Import(name);
Michal Ambroz aea04ba
@@ -366,7 +366,7 @@
Michal Ambroz aea04ba
 
Michal Ambroz aea04ba
 	for (sys_path = sys_paths; *sys_path; sys_path++) {
Michal Ambroz aea04ba
 		if( strcmp(*sys_path, "default") == 0 ) {
Michal Ambroz aea04ba
-			sprintf(relpath, "sys.path.insert(%i, '%s/lib/dionaea/python/')", i, PREFIX);
Michal Ambroz aea04ba
+			sprintf(relpath, "sys.path.insert(%i, '%s/dionaea/python/')", i, LIBDIR);
Michal Ambroz aea04ba
 		} else {
Michal Ambroz aea04ba
 			// ToDO
Michal Ambroz aea04ba
 		/*	if( *sys_path == '/' )
Michal Ambroz aea04ba
diff -ru dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/src/modules.c dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/src/modules.c
Michal Ambroz aea04ba
--- dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/src/modules.c	2018-03-26 22:14:31.504330721 +0200
Michal Ambroz aea04ba
+++ dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/src/modules.c	2018-03-26 22:21:08.852001664 +0200
Michal Ambroz aea04ba
@@ -114,7 +114,7 @@
Michal Ambroz aea04ba
   for (name = names; *name; name++) {
Michal Ambroz aea04ba
 
Michal Ambroz aea04ba
 		gchar module_path[1024];
Michal Ambroz aea04ba
-		if( g_snprintf(module_path, 1023, PREFIX"/lib/dionaea/%s.so", *name) == -1 )
Michal Ambroz aea04ba
+		if( g_snprintf(module_path, 1023, LIBDIR"/dionaea/%s.so", *name) == -1 )
Michal Ambroz aea04ba
 			return;
Michal Ambroz aea04ba
 
Michal Ambroz aea04ba
 		g_message("loading module %s (%s)", *name, module_path);