Bug#990939: unblock: newlisp/10.7.5-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package newlisp
* d/p/0009-Fix-shared-library-loading-for-modules.patch:
Adjust patch so that the modules don't try to load a versioned shared
library.
* d/control: Don't recommend hardcoded ABI versions in library packages.
We should recommend the '-dev' packages instead, which will install
the proper .so files that will get loaded by the modules. (Closes: #984686)
* d/p/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch:
Inform newlisp that the common files are installed under
/usr/share/newlisp, not /usr/local/share.
(changes by Sergio Durigan Junior)
Recommending no longer existing shared libraries is bad,
even worse is trying to open them at runtime.
Depending on the -dev packages instead is not nice,
but it is actually the fix with the smallest change.
The NEWLISPDIR change looks correct to me.
diff -Nru newlisp-10.7.5/debian/changelog newlisp-10.7.5/debian/changelog
--- newlisp-10.7.5/debian/changelog 2019-07-21 02:47:33.000000000 +0300
+++ newlisp-10.7.5/debian/changelog 2021-03-07 22:17:34.000000000 +0200
@@ -1,3 +1,17 @@
+newlisp (10.7.5-2) unstable; urgency=medium
+
+ * d/p/0009-Fix-shared-library-loading-for-modules.patch:
+ Adjust patch so that the modules don't try to load a versioned shared
+ library.
+ * d/control: Don't recommend hardcoded ABI versions in library packages.
+ We should recommend the '-dev' packages instead, which will install
+ the proper .so files that will get loaded by the modules. (Closes: #984686)
+ * d/p/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch:
+ Inform newlisp that the common files are installed under
+ /usr/share/newlisp, not /usr/local/share.
+
+ -- Sergio Durigan Junior <sergiodj@debian.org> Sun, 07 Mar 2021 15:17:34 -0500
+
newlisp (10.7.5-1) unstable; urgency=medium
* New upstream version 10.7.5.
diff -Nru newlisp-10.7.5/debian/control newlisp-10.7.5/debian/control
--- newlisp-10.7.5/debian/control 2019-07-21 02:46:32.000000000 +0300
+++ newlisp-10.7.5/debian/control 2021-03-07 22:08:21.000000000 +0200
@@ -17,11 +17,11 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
# For newLISP modules.
Recommends:
- libcrypto++6,
- libmysqlclient18,
- libpq5,
- libsqlite3-0,
- zlib1g,
+ libssl-dev,
+ default-libmysqlclient-dev,
+ libpq-dev,
+ libsqlite3-dev,
+ zlib1g-dev,
sensible-utils,
Description: LISP like, general purpose scripting language
newLISP is a scripting language for developing web applications and
diff -Nru newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch
--- newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch 2019-07-21 02:46:32.000000000 +0300
+++ newlisp-10.7.5/debian/patches/0009-Fix-shared-library-loading-for-modules.patch 2021-03-07 22:16:26.000000000 +0200
@@ -22,7 +22,7 @@
8 files changed, 9 insertions(+), 126 deletions(-)
diff --git a/modules/crypto.lsp b/modules/crypto.lsp
-index 26d7bda..e52af3a 100644
+index 26d7bda..289a027 100644
--- a/modules/crypto.lsp
+++ b/modules/crypto.lsp
@@ -41,28 +41,7 @@
@@ -51,7 +51,7 @@
- (throw-error "cannot find crypto library"))))
-
-(set 'option (if (= ostype "Windows") "cdecl"))
-+(set 'library "libcrypto.so.1")
++(set 'library "libcrypto.so")
(import library "MD5" option)
(import library "RIPEMD160" option)
@@ -85,7 +85,7 @@
; structs are defined but only needed for debugging, instead use "void*"
(struct 'complex "double" "double") ; complex numbers
diff --git a/modules/mysql.lsp b/modules/mysql.lsp
-index 05faded..bd93a21 100644
+index 05faded..20a6093 100644
--- a/modules/mysql.lsp
+++ b/modules/mysql.lsp
@@ -118,20 +118,7 @@
@@ -106,7 +106,7 @@
-(set 'library (files (or
- (find true (map file? files))
- (throw-error "cannot find libmysqlclient library"))))
-+(set 'library "libmysqlclient.so.18")
++(set 'library "libmysqlclient.so")
(import library "mysql_init")
(import library "mysql_real_connect")
@@ -125,7 +125,7 @@
; Constants used, make sure these constants are Ok on your Operating System or Platform.
; Note, that (define var value) is the same as as saying (set 'var value), it is here more
diff --git a/modules/postgres.lsp b/modules/postgres.lsp
-index 0fe5ec5..c620f92 100644
+index 0fe5ec5..5af0c6c 100644
--- a/modules/postgres.lsp
+++ b/modules/postgres.lsp
@@ -128,34 +128,7 @@
@@ -160,7 +160,7 @@
-(delete 'pg_config)
-(delete 'pg_lib_dir)
-(delete 'files)
-+(set 'library "libpq.so.5")
++(set 'library "libpq.so")
; import functions and throw error if not found
(define (pg_import fun_name)
@@ -198,7 +198,7 @@
(import library "sqlite3_open" "cdecl")
(import library "sqlite3_close" "cdecl")
diff --git a/modules/unix.lsp b/modules/unix.lsp
-index 07de71e..13a23bd 100644
+index 07de71e..1d800e7 100644
--- a/modules/unix.lsp
+++ b/modules/unix.lsp
@@ -39,21 +39,7 @@
@@ -220,12 +220,12 @@
- (find true (map file? files))
- (throw-error "cannot find standard C library (libc)"))))
-
-+(set 'library "libc.so.6")
++(set 'library "libc.so")
(unless module-is-loaded
(import library "getuid")
diff --git a/modules/zlib.lsp b/modules/zlib.lsp
-index 6bdf360..3cf985c 100644
+index 6bdf360..4f12a8e 100644
--- a/modules/zlib.lsp
+++ b/modules/zlib.lsp
@@ -31,20 +31,7 @@
@@ -246,7 +246,7 @@
-(set 'library (files (or
- (find true (map file? files))
- (throw-error "cannot find zlib compression library"))))
-+(set 'library "libz.so.1")
++(set 'library "libz.so")
(import library "compress")
(import library "uncompress")
diff -Nru newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch
--- newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch 1970-01-01 02:00:00.000000000 +0200
+++ newlisp-10.7.5/debian/patches/0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch 2021-03-07 22:17:24.000000000 +0200
@@ -0,0 +1,25 @@
+From: Sergio Durigan Junior <sergiodj@debian.org>
+Date: Sun, 7 Mar 2021 15:15:31 -0500
+Subject: Set NEWLISPDIR to /usr/share/newlisp
+
+NEWLISPDIR is hardcoded to /usr/local/share/newlisp, which is wrong
+for our case.
+
+Forwarded: not-needed
+---
+ newlisp.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/newlisp.h b/newlisp.h
+index 867908c..4cfc279 100644
+--- a/newlisp.h
++++ b/newlisp.h
+@@ -37,7 +37,7 @@
+ #ifdef NEWCONFIG
+ #include "config.h"
+ #else
+-#define NEWLISPDIR "/usr/local/share/newlisp"
++#define NEWLISPDIR "/usr/share/newlisp"
+ #endif
+
+ /* force ISO_C90 restrictions */
diff -Nru newlisp-10.7.5/debian/patches/series newlisp-10.7.5/debian/patches/series
--- newlisp-10.7.5/debian/patches/series 2019-07-21 02:41:45.000000000 +0300
+++ newlisp-10.7.5/debian/patches/series 2021-03-07 22:17:24.000000000 +0200
@@ -6,3 +6,4 @@
0006-Do-not-use-m32-m64-when-building.patch
0007-Support-GNU-kFreeBSD-builds.patch
0009-Fix-shared-library-loading-for-modules.patch
+0009-Set-NEWLISPDIR-to-usr-share-newlisp.patch
Reply to: