rpms/slang
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 2.1.3

Browse Source
This commit is contained in:
Miroslav Lichvar 2007-11-05 16:08:12 +00:00
parent 3be97fb302
commit 9f44c63db3
6 changed files with 119 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
slang-2.1.2.tar.bz2
slang-2.1.3.tar.bz2

12
slang-2.1.2-hashborder.patch
View File

@ -1,12 +0,0 @@
diff -up slang-2.1.2/src/slsmg.c.hashborder slang-2.1.2/src/slsmg.c
--- slang-2.1.2/src/slsmg.c.hashborder 2007-09-17 19:17:24.000000000 +0200
+++ slang-2.1.2/src/slsmg.c 2007-09-24 17:23:29.000000000 +0200
@@ -993,7 +993,7 @@ static unsigned long compute_hash (SLsmg
c += SLsmg_Scroll_Hash_Border;
csave = c;
- cmax = c + (n - SLsmg_Scroll_Hash_Border);
+ cmax = c + ((int)n - SLsmg_Scroll_Hash_Border);
while ((c < cmax) && is_blank)
{

77
slang-2.1.2-slerr.patch
View File

@ -1,77 +0,0 @@
Index: slang/src/slerr.c
===================================================================
--- slang/src/slerr.c (revision 199)
+++ slang/src/slerr.c (revision 200)
@@ -384,6 +384,8 @@
}
Error_Message_Type;
+static char *Static_Error_Message = NULL;
+
struct _pSLerr_Error_Queue_Type
{
Error_Message_Type *head;
@@ -531,12 +533,11 @@
free_queued_messages (q);
}
-#if 0
- if (_pSLang_Error != SL_Usage_Error)
+ if (Static_Error_Message != NULL)
{
- print_error (_SLERR_MSG_ERROR, SLerr_strerror (_pSLang_Error));
+ print_error (_SLERR_MSG_ERROR, Static_Error_Message);
+ Static_Error_Message = NULL;
}
-#endif
}
/* This function returns a pointer to the first error message in the queue.
@@ -615,6 +616,7 @@
void _pSLerr_free_queued_messages (void)
{
+ Static_Error_Message = NULL;
free_queued_messages (Active_Error_Queue);
}
@@ -626,7 +628,10 @@
*/
if ((error == 0)
|| (_pSLang_Error == 0))
- _pSLang_Error = error;
+ {
+ Static_Error_Message = NULL;
+ _pSLang_Error = error;
+ }
if (_pSLinterpreter_Error_Hook != NULL)
(*_pSLinterpreter_Error_Hook) (_pSLang_Error);
@@ -707,9 +712,19 @@
{
set_error (error);
- if (_pSLang_Error == 0)
+ if (error == 0)
return 0;
+ if (error == SL_UserBreak_Error)
+ {
+ /* This function may be called from a SIGINT handler, in which case the
+ * error code will be SL_Usage_Error.
+ */
+ /* print_error (_SLERR_MSG_ERROR, SLerr_strerror (_pSLang_Error)); */
+ Static_Error_Message = SLerr_strerror (error);
+ return 0;
+ }
+
/* If a string is not in the message queue, then add one. */
if (Active_Error_Queue != NULL)
{
@@ -806,5 +821,6 @@
Suspend_Error_Messages = 0;
Default_Error_Queue = NULL;
Active_Error_Queue = NULL;
+ Static_Error_Message = NULL;
}

111
slang-2.1.3-makefile.patch Normal file
View File

@ -0,0 +1,111 @@
diff -up slang-2.1.3/modules/Makefile.in.makefile slang-2.1.3/modules/Makefile.in
--- slang-2.1.3/modules/Makefile.in.makefile 2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.3/modules/Makefile.in 2007-11-05 16:12:25.000000000 +0100
@@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_MODULE = @INSTALL_MODULE@
+INSTALL_MODULE = @INSTALL@
MKINSDIR = ../autoconf/mkinsdir.sh
SLSH_DIR = $(prefix)/share/slsh
CMAPS_DIR = $(SLSH_DIR)/cmaps
@@ -67,7 +67,7 @@ DEST_SLSH_DIR = $(DESTDIR)$(SLSH_DIR)
DEST_CMAPSDIR = $(DESTDIR)$(CMAPS_DIR)
DEST_HELPDIR = $(DESTDIR)$(HELP_DIR)
#---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
#LIBS = $(RPATH) $(DL_LIB) -lm
diff -up slang-2.1.3/slsh/Makefile.in.makefile slang-2.1.3/slsh/Makefile.in
--- slang-2.1.3/slsh/Makefile.in.makefile 2007-09-09 03:39:18.000000000 +0200
+++ slang-2.1.3/slsh/Makefile.in 2007-11-05 16:12:25.000000000 +0100
@@ -15,7 +15,7 @@ SLANG_SRCINC = -I@SRCDIR@
SLANG_SRCLIB = -L@ELFDIR@
#---------------------------------------------------------------------------
OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
-RPATH = @RPATH@
+RPATH =
#----------------------------------------------------------------------------
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
#----------------------------------------------------------------------------
@SET_MAKE@
SHELL = /bin/sh
-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
diff -up slang-2.1.3/src/Makefile.in.makefile slang-2.1.3/src/Makefile.in
--- slang-2.1.3/src/Makefile.in.makefile 2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.3/src/Makefile.in 2007-11-05 16:12:25.000000000 +0100
@@ -137,17 +137,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
# Rules
#---------------------------------------------------------------------------
all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+$(OBJS): $(OBJDIR)/stamp
+
+$(ELFOBJS): $(ELFDIR)/stamp
+
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
-$(RM) $(OBJDIR_NORMAL_LIB)
cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
$(RANLIB) $(OBJDIR_NORMAL_LIB)
@echo ""
@echo $(NORMAL_LIB) created in $(OBJDIR)
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
-$(RM) $(ELFDIR_ELF_LIB)
cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
@@ -158,10 +162,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
@echo ""
-$(OBJDIR) :
+$(OBJDIR)/stamp :
-$(MKDIR) $(OBJDIR)
-$(ELFDIR) :
+ touch $(OBJDIR)/stamp
+$(ELFDIR)/stamp :
-$(MKDIR) $(ELFDIR)
+ touch $(ELFDIR)/stamp
$(CONFIG_H) : sysconf.h
-$(CP) sysconf.h $(CONFIG_H)
@@ -192,9 +198,9 @@ install-elf-and-links:
-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+ $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
- -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+ -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
@echo ""
@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.
diff -up slang-2.1.3/autoconf/Makefile.in.makefile slang-2.1.3/autoconf/Makefile.in
--- slang-2.1.3/autoconf/Makefile.in.makefile 2007-09-11 04:57:09.000000000 +0200
+++ slang-2.1.3/autoconf/Makefile.in 2007-11-05 16:29:44.000000000 +0100
@@ -28,8 +28,7 @@ help:
@echo "make check : Build the library and run the regression tests"
static: makefiles
cd src; $(MAKE) static
- cd slsh; $(MAKE) all
-elf: makefiles
+elf: makefiles static
cd src; $(MAKE) elf
cd slsh; $(MAKE) all
cd modules; $(MAKE) all

13
slang.spec
View File

@ -1,15 +1,13 @@
Summary: The shared library for the S-Lang extension language
Name: slang
Version: 2.1.2
Release: 2%{?dist}
Version: 2.1.3
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
Patch1: slang-2.1.2-makefile.patch
Patch1: slang-2.1.3-makefile.patch
Patch2: slang-nointerlibc2.patch
Patch3: slang-LANG.patch
Patch4: slang-2.1.2-hashborder.patch
Patch5: slang-2.1.2-slerr.patch
URL: http://www.jedsoft.org/slang/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel pcre-devel gawk
@ -62,8 +60,6 @@ language.
%patch1 -p1 -b .makefile
%patch2 -p1 -b .nointerlibc2
%patch3 -p1 -b .LANG
%patch4 -p1 -b .hashborder
%patch5 -p1 -b .slerr
%build
%configure --includedir=%{_includedir}/slang
@ -107,6 +103,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libslang*.a
%changelog
* Mon Nov 05 2007 Miroslav Lichvar <mlichvar@redhat.com> - 2.1.3-1
- update to 2.1.3
* Tue Sep 25 2007 Miroslav Lichvar <mlichvar@redhat.com> - 2.1.2-2
- fix integer underflow in compute_hash (#302181)
- fix SLang_set_error when called from signal handler (#297661)

2
sources
View File

@ -1 +1 @@
99534ae667ed1a50c863ce9a08912ccc slang-2.1.2.tar.bz2
0e4ae3aac75441eaa230bceb7811f088 slang-2.1.3.tar.bz2