Compare commits

..

No commits in common. "a728001d9611d76b15fa8308c915c3d1fea3505d" and "a29c867cb98e8fcb51e2dd6a8f65f60e53f936ac" have entirely different histories.

5 changed files with 42 additions and 19 deletions

BIN
slang-2.3.2.tar.bz2 Normal file

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,31 @@
commit d338fd6e949ef62e7eac4eb5c024059e02158b06
Author: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed Jul 25 13:07:42 2018 +0200
Replaced memcpy in SLang_getkey
memcpy() is not defined for overlapping buffers, i.e. it may copy bytes
in any direction. As SLMEMMOVE is not defined in slang, replace the
SLMEMCPY call with a for loop.
diff --git a/src/slgetkey.c b/src/slgetkey.c
index 86e7946..d9bc678 100644
--- a/src/slgetkey.c
+++ b/src/slgetkey.c
@@ -40,13 +40,13 @@ unsigned int SLang_getkey (void)
if (SLang_Input_Buffer_Len)
{
- unsigned int imax;
+ unsigned int i, imax;
ch = (unsigned int) *SLang_Input_Buffer;
SLang_Input_Buffer_Len--;
imax = SLang_Input_Buffer_Len;
- SLMEMCPY ((char *) SLang_Input_Buffer,
- (char *) (SLang_Input_Buffer + 1), imax);
+ for (i = 0; i < imax; i++)
+ SLang_Input_Buffer[i] = SLang_Input_Buffer[i + 1];
}
else if (SLANG_GETKEY_ERROR == (ch = _pSLsys_getkey ())) return ch;

View File

@ -1,8 +1,8 @@
%bcond_with oniguruma
Name: slang
Version: 2.3.3
Release: 2
Version: 2.3.2
Release: 8
Summary: An interpreted language and programing library
License: GPLv2+
URL: https://www.jedsoft.org/slang/
@ -11,9 +11,10 @@ Source0: https://www.jedsoft.org/releases/slang/%{name}-%{version}.tar.bz2
Provides: %{name}-slsh = %{version}-%{release}
Obsoletes: %{name}-slsh < %{version}-%{release}
Patch0: slang-sighuptest.patch
Patch6000: slang-getkey-memmove.patch
Patch6001: slang-sighuptest.patch
BuildRequires: gcc libpng-devel zlib-devel
BuildRequires: gcc libpng-devel pcre-devel zlib-devel git
%description
S-Lang is a multi-platform programmer's library designed to allow
@ -36,12 +37,12 @@ BuildArch: noarch
Help files for %{name}
%prep
%autosetup -n %{name}-%{version} -p1
%autosetup -n %{name}-%{version} -p1 -Sgit
sed -i '/^INSTALL_MODULE=/s/_DATA//' configure
%build
%configure --with-{png,z}lib=%{_libdir} --with-{png,z}inc=%{_includedir} --without-pcre
%configure --with-{pcre,png,z}lib=%{_libdir} --with-{pcre,png,z}inc=%{_includedir}
make RPATH="" install_doc_dir=%{_pkgdocdir} all
@ -83,23 +84,14 @@ make check
%{_mandir}/man1/slsh.1*
%changelog
* Tue Apr 25 2023 fuanan <fuanan3@h-partners.com> - 2.3.3-2
- decouple from pcre
* Wed Jan 18 2023 fuanan <fuanan3@h-partners.com> - 2.3.3-1
- update version to 2.3.3
* Mon Aug 02 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.3.2-9
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-8
- Add provides of slang-slsh
* Thu Nov 21 2019 fangyufa <fangyufa1@huawei.com> - 2.3.2-7
- add buildrequires of git for x86_64 build
* Tue Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-6
* Mon Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-6
- Remove unnecessary info in spec
* Mon Sep 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-5
* Tue Sep 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-5
- Package init

View File

@ -1,4 +1,4 @@
version_control: git
src_repo: git://git.jedsoft.org/git/slang.git
tag_prefix: "^v"
seperator: "."
tag_prefix: ^v
seperator: