update to 2.49.95+20250504git.f6622093 [release 2.49.95+20250504git.f6622093-1mamba;Fri Dec 26 2025]

This commit is contained in:
2025-12-27 18:38:49 +01:00
parent 76d0f41a54
commit 11a37aae26
6 changed files with 39 additions and 225 deletions

View File

@@ -1,46 +0,0 @@
--- a/modules/berkeley-db/bdb.c
+++ b/modules/berkeley-db/bdb.c
@@ -351,40 +351,10 @@
DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRYPT :HOST CLIENT-TIMEOUT SERVER-TIMEOUT)
{ /* Create an environment handle */
DB_ENV *dbe, *dbe_cl;
- bool remote_p = boundp(STACK_2); /* host ==> remote */
+ if (boundp(STACK_2)) /* :HOST */
+ error(error_condition, GETTEXT("RPC support has been dropped in Berkeley DB 5.1"));
int cl_timeout = 0, sv_timeout = 0;
-# if defined(DB_RPCCLIENT) /* 4.2 and later */
- SYSCALL(db_env_create,(&dbe,remote_p ? DB_RPCCLIENT : 0));
-# elif defined(DB_CLIENT) /* 4.1 and before */
- SYSCALL(db_env_create,(&dbe,remote_p ? DB_CLIENT : 0));
-# else
-# error how does your Berkeley DB create a remote client?
-# endif
- if (remote_p) {
- if (uint_p(STACK_0)) sv_timeout = I_to_uint(STACK_0);
- if (uint_p(STACK_1)) cl_timeout = I_to_uint(STACK_1);
- host_restart:
- if (stringp(STACK_2)) { /* string host */
- with_string_0(STACK_2,GLO(misc_encoding),hostz, {
- SYSCALL(dbe->set_rpc_server,(dbe,NULL,hostz,cl_timeout,sv_timeout,0));
- });
- } else if ((dbe_cl = (DB_ENV*)bdb_handle(STACK_2,`BDB::DBE`,
- BH_NIL_IS_NULL))) {
- /* reuse client */
- SYSCALL(dbe->set_rpc_server,(dbe,dbe_cl->cl_handle,NULL,
- cl_timeout,sv_timeout,0));
- } else { /* bad host */
- pushSTACK(NIL); /* no PLACE */
- pushSTACK(STACK_(2+1)); /* TYPE-ERROR slot DATUM */
- pushSTACK(`(OR STRING BDB::DBE)`); /* TYPE-ERROR slot EXPECTED-TYPE */
- pushSTACK(STACK_2); /* host */
- pushSTACK(`BDB::DBE`); pushSTACK(S(string)); pushSTACK(S(Khost));
- pushSTACK(TheSubr(subr_self)->name);
- check_value(type_error,GETTEXT("~S: ~S should be a ~S or a ~S, not ~S"));
- STACK_2 = value1;
- goto host_restart;
- }
- }
+ SYSCALL(db_env_create,(&dbe,0));
if (!missingp(STACK_4)) /* :PASSWD */
dbe_set_encryption(dbe,&STACK_3,&STACK_4);
skipSTACK(5);

View File

@@ -1,20 +0,0 @@
--- ./modules/bindings/glibc/linux.lisp.orig 2008-10-08 10:36:19.000000000 -0600
+++ ./modules/bindings/glibc/linux.lisp 2012-07-25 19:05:07.014592097 -0600
@@ -86,7 +86,7 @@
(def-c-type __key_t) ; int
-(c-lines "#include <bits/ipctypes.h>~%")
+(c-lines "#include <sys/ipc.h>~%")
(def-c-type __ipc_pid_t) ; ushort
; --------------------------- <sys/types.h> -----------------------------------
@@ -293,6 +293,8 @@
;; for robust mutexes
(def-c-const EOWNERDEAD (:documentation "Owner died")) ; 130
(def-c-const ENOTRECOVERABLE (:documentation "State not recoverable")) ; 131
+(def-c-const ERFKILL (:documentation "Operation not possible due to RF-kill")) ; 132
+(def-c-const EHWPOISON (:documentation "Memory page has hardware error")) ; 133
; -------------------------- <bits/errno.h> -----------------------------------

View File

@@ -1,31 +0,0 @@
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Access: 2012-11-28 16:13:07 +0100
Referencens: http://comments.gmane.org/gmane.comp.lib.glibc.alpha/25618
Subject: remove __swblk_t from linux.lisp
Upstream: no
Glibc got rid of unused __swblk_t type, so the linux.lisp package needs to
be updated, enabling build
---
modules/bindings/glibc/linux.lisp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/modules/bindings/glibc/linux.lisp
+++ b/modules/bindings/glibc/linux.lisp
@@ -38,7 +38,6 @@
; =========================== <sys/types.h> ===================================
(c-lines "#include <sys/types.h>~%")
-
; --------------------------- <gnu/types.h> -----------------------------------
(def-c-type __u_char uchar)
@@ -67,7 +66,7 @@
(def-c-type __daddr_t) ; int
(def-c-type __caddr_t) ; c-pointer
(def-c-type __time_t) ; long
-(def-c-type __swblk_t) ; long
+;;(def-c-type __swblk_t) ; long
(def-c-type __fd_mask ulong)
(eval-when (load compile eval)

View File

@@ -1,74 +0,0 @@
--- src/socket.d.orig 2009-10-08 08:45:13.000000000 -0600
+++ src/socket.d 2012-01-12 11:22:24.701723636 -0700
@@ -57,8 +57,8 @@
/* ============ hostnames and IP addresses only (no sockets) ============
Fetches the machine's host name.
- get_hostname(host =);
- The name is allocated on the stack, with dynamic extent.
+ get_hostname(hostname);
+ where hostname is an array of MAXHOSTNAMELEN+1 characters.
< const char* host: The host name.
(Note: In some cases we could get away with less system calls by simply
setting
@@ -67,13 +67,12 @@
sds: never: you will always get localhost/127.0.0.1 - what's the point? */
#if defined(HAVE_GETHOSTNAME)
/* present on all supported unix systems and on woe32 */
- #define get_hostname(host_assignment) \
- do { var char hostname[MAXHOSTNAMELEN+1]; \
+ #define get_hostname(hostname) \
+ do { \
begin_system_call(); \
if ( gethostname(&hostname[0],MAXHOSTNAMELEN) <0) { SOCK_error(); } \
end_system_call(); \
hostname[MAXHOSTNAMELEN] = '\0'; \
- host_assignment &hostname[0]; \
} while(0)
#else
#error get_hostname is not defined
@@ -207,8 +206,8 @@ LISPFUNN(machine_instance,0)
(if (or (null address) (zerop (length address)))
hostname
(apply #'string-concat hostname " [" (inet-ntop address) "]"))) */
- var const char* host;
- get_hostname(host =);
+ var char host[MAXHOSTNAMELEN+1];
+ get_hostname(host);
result = asciz_to_string(host,O(misc_encoding)); /* hostname as result */
#ifdef HAVE_GETHOSTBYNAME
pushSTACK(result); /* hostname as 1st string */
@@ -389,8 +388,8 @@ local int resolve_host1 (const void* add
modexp struct hostent* resolve_host (object arg) {
var struct hostent* he;
if (eq(arg,S(Kdefault))) {
- var char* host;
- get_hostname(host =);
+ var char host[MAXHOSTNAMELEN+1];
+ get_hostname(host);
begin_system_call();
he = gethostbyname(host);
end_system_call();
@@ -724,8 +723,9 @@ global SOCKET connect_to_x_server (const
if (conntype == conn_tcp) {
var unsigned short port = X_TCP_PORT+display;
if (host[0] == '\0') {
- get_hostname(host =);
- fd = with_host_port(host,port,&connect_to_x_via_ip,NULL);
+ var char hostname[MAXHOSTNAMELEN+1];
+ get_hostname(hostname);
+ fd = with_host_port(hostname,port,&connect_to_x_via_ip,NULL);
} else {
fd = with_host_port(host,port,&connect_to_x_via_ip,NULL);
}
@@ -798,8 +798,8 @@ global host_data_t * socket_getlocalname
if (socket_getlocalname_aux(socket_handle,hd) == NULL)
return NULL;
if (resolve_p) { /* Fill in hd->truename. */
- var const char* host;
- get_hostname(host =); /* was: host = "localhost"; */
+ var char host[MAXHOSTNAMELEN+1];
+ get_hostname(host); /* was: host = "localhost"; */
ASSERT(strlen(host) <= MAXHOSTNAMELEN);
strcpy(hd->truename,host);
} else {

View File

@@ -1,12 +0,0 @@
#!/bin/bash
VERSION=$1
if [ "${VERSION}" == "2.49.93" ]; then
REF=b55b8196c9f25428304ec3de87383319fd1f2264
else
echo "ERROR: add ${VERSION} hg ref in clisp-autoupdate file."
exit 1
fi
#hg clone -r ${REF} http://hg.code.sf.net/p/clisp/clisp clisp-${VERSION} || exit 1
rm -rf clisp-${VERSION}/.hg
tar cjf clisp-${VERSION}.tar.bz2 clisp-${VERSION} || exit 1
rm -rf clisp-${VERSION}

View File

@@ -1,27 +1,33 @@
%define with_postgresql 0
%define basever %(echo %version | cut -d+ -f1)
%define gitcommit %(echo %version | cut -d+ -f2 | cut -d. -f2)
Name: clisp
Version: 2.49.93
Version: 2.49.95+20250504git.f6622093
Release: 1mamba
Summary: Common Lisp (ANSI CL) implementation
Group: Applications/Development
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://clisp.cons.org/
Source: http://downloads.sourceforge.net/sourceforge/clisp/%{name}-%{version}.tar.bz2
Source1: clisp-autoupdate
Patch0: %{name}-2.49-db-5.1.patch
Patch1: clisp-2.49-glibc-2.17-1.patch
Patch2: clisp-2.49-glibc-2.17-2.patch
Patch3: clisp-2.49-hostname.patch
URL: https://clisp.sourceforge.io/
Source: https://gitlab.com/gnu-clisp/clisp.git/master@%{gitcommit}/%{name}-%{version}.tar.bz2
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
BuildRequires: libdb53-devel
BuildRequires: libffcall-devel
BuildRequires: libncurses-devel
BuildRequires: libpcre-devel
BuildRequires: libreadline-devel
BuildRequires: libsigsegv-devel
BuildRequires: libunistring-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
BuildRequires: mercurial
BuildRequires: gettext-devel >= 0.14.4
@@ -29,7 +35,6 @@ BuildRequires: gettext-devel >= 0.14.4
BuildRequires: postgresql-devel >= 8.0
%endif
Requires(post):%{__install_info}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Common Lisp is a high-level, general-purpose programming language.
@@ -47,23 +52,10 @@ Requires: %{name} = %{version}-%{release}
%description devel
Common Lisp is a high-level, general-purpose programming language.
GNU CLISP is a Common Lisp implementation by Bruno Haible of Karlsruhe University and Michael Stoll of Munich University, both in Germany.
It mostly supports the Lisp described in the ANSI Common Lisp standard.
GNU CLISP includes an interpreter, a compiler, a debugger, a large subset of CLOS, a foreign language interface and a socket interface.
An X11 interface is available through CLX, Garnet, CLUE/CLIO.
GNU CLISP runs Maxima, ACL2 and many other Common Lisp packages.
This package contains files necessary for linking CLISP.
%debug_package
%prep
%setup -q
#%patch0 -p1
#%patch1 -p1
#%patch2 -p1
#%patch3 -p0
%build
sed -i -e 's|^ make check$||' configure
@@ -117,12 +109,12 @@ cat %{name}low.lang >> %{name}.lang
%{_datadir}/vim/vimfiles/after/syntax/lisp.vim
%{_datadir}/emacs/site-lisp/*.el
%{_datadir}/emacs/site-lisp/*.lisp
%dir %{_libdir}/clisp-%{version}+
%dir %{_libdir}/clisp-%{version}+/base
%{_libdir}/clisp-%{version}+/base/lispinit.mem
%{_libdir}/clisp-%{version}+/base/lisp.run
%{_libdir}/clisp-%{version}+/data
%{_libdir}/clisp-%{version}+/dynmod
%dir %{_libdir}/clisp-%{basever}+
%dir %{_libdir}/clisp-%{basever}+/base
%{_libdir}/clisp-%{basever}+/base/lispinit.mem
%{_libdir}/clisp-%{basever}+/base/lisp.run
%{_libdir}/clisp-%{basever}+/data
%{_libdir}/clisp-%{basever}+/dynmod
%{_mandir}/man1/*
%dir %{_docdir}/%{name}-%{version}
%{_docdir}/%{name}-%{version}/*
@@ -130,22 +122,27 @@ cat %{name}low.lang >> %{name}.lang
%files devel
%defattr(-,root,root,-)
%attr(0755,root,root) %{_bindir}/clisp-link
%{_libdir}/clisp-%{version}+/base/*.a
%{_libdir}/clisp-%{version}+/base/*.o
%{_libdir}/clisp-%{version}+/base/*.h
%{_libdir}/clisp-%{version}+/base/makevars
%{_libdir}/clisp-%{version}+/berkeley-db
%{_libdir}/clisp-%{version}+/bindings/glibc
%{_libdir}/clisp-%{version}+/build-aux
%{_libdir}/clisp-%{version}+/clx
%{_libdir}/clisp-%{version}+/linkkit
%{_libdir}/clisp-%{version}+/pcre
%{_libdir}/clisp-%{version}+/rawsock
#%{_libdir}/clisp-%{version}+/wildcard
%{_libdir}/clisp-%{version}+/zlib
%{_libdir}/clisp-%{basever}+/base/*.a
%{_libdir}/clisp-%{basever}+/base/*.o
%{_libdir}/clisp-%{basever}+/base/*.h
%{_libdir}/clisp-%{basever}+/base/makevars
%{_libdir}/clisp-%{basever}+/berkeley-db
%{_libdir}/clisp-%{basever}+/bindings/glibc
%{_libdir}/clisp-%{basever}+/build-aux
%{_libdir}/clisp-%{basever}+/clx
%{_libdir}/clisp-%{basever}+/linkkit
%{_libdir}/clisp-%{basever}+/pcre
%{_libdir}/clisp-%{basever}+/rawsock
%{_libdir}/clisp-%{basever}+/zlib
%{_datadir}/aclocal/clisp.m4
%changelog
* Fri Dec 26 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 2.49.95+20250504git.f6622093-1mamba
- update to 2.49.95+20250504git.f6622093
* Sat Dec 27 2025 Automatic Build System <autodist@openmamba.org> 2.49.93-2mamba
- automatic rebuild by autodist
* Sun Dec 01 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.49.93-1mamba
- update to 2.49.93