Tomas Hrcka
2e36e1ba67
This reverts commit 345cdb4184.
Unretirement request: https://pagure.io/releng/issue/10092
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
51 lines
2.4 KiB
Diff
51 lines
2.4 KiB
Diff
fix hardcoded /lib dir
|
|
on 64 platform the RedHat based distrubutions prefer the lib directories to
|
|
have different names for 64 bit (lib64) and 32 bit (lib).
|
|
This fix allows to configure that at compile time.
|
|
|
|
https://github.com/DinoTools/dionaea/pull/181
|
|
|
|
diff -ru dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/modules/python/module.c dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/modules/python/module.c
|
|
--- dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/modules/python/module.c 2018-03-26 22:14:31.519330709 +0200
|
|
+++ dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/modules/python/module.c 2018-03-26 22:15:40.311274663 +0200
|
|
@@ -348,7 +348,7 @@
|
|
|
|
Py_Initialize();
|
|
|
|
- runtime.sys_path = g_string_new(PREFIX"/lib/dionaea/python/");
|
|
+ runtime.sys_path = g_string_new(LIBDIR"/dionaea/python/");
|
|
|
|
PyObject *name = PyUnicode_FromString("traceback");
|
|
runtime.traceback.module = PyImport_Import(name);
|
|
@@ -366,7 +366,7 @@
|
|
|
|
for (sys_path = sys_paths; *sys_path; sys_path++) {
|
|
if( strcmp(*sys_path, "default") == 0 ) {
|
|
- sprintf(relpath, "sys.path.insert(%i, '%s/lib/dionaea/python/')", i, PREFIX);
|
|
+ sprintf(relpath, "sys.path.insert(%i, '%s/dionaea/python/')", i, LIBDIR);
|
|
} else {
|
|
// ToDO
|
|
/* if( *sys_path == '/' )
|
|
diff -ru dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/src/modules.c dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/src/modules.c
|
|
--- dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.orig/src/modules.c 2018-03-26 22:14:31.504330721 +0200
|
|
+++ dionaea-d2efb768e753a7f1ddca6dbf402548d741f33574.new/src/modules.c 2018-03-26 22:21:08.852001664 +0200
|
|
@@ -114,7 +114,7 @@
|
|
for (name = names; *name; name++) {
|
|
|
|
gchar module_path[1024];
|
|
- if( g_snprintf(module_path, 1023, PREFIX"/lib/dionaea/%s.so", *name) == -1 )
|
|
+ if( g_snprintf(module_path, 1023, LIBDIR"/dionaea/%s.so", *name) == -1 )
|
|
return;
|
|
|
|
g_message("loading module %s (%s)", *name, module_path);
|
|
diff -ru dionaea-0.7.0.orig/config.h.cmake dionaea-0.7.0.new/config.h.cmake
|
|
--- dionaea-0.7.0.orig/config.h.cmake 2018-05-11 01:20:46.645826049 +0200
|
|
+++ dionaea-0.7.0.new/config.h.cmake 2018-05-11 01:18:51.860064505 +0200
|
|
@@ -8,6 +8,7 @@
|
|
#define DEBUG "${DEBUG}"
|
|
|
|
#define PREFIX "${CMAKE_INSTALL_PREFIX}"
|
|
+#define LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}"
|
|
#define SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}"
|
|
#define LOCALSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}"
|
|
#define LOCALESTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}"
|