SHA256
1
0
forked from pool/dictd

Compare commits

...

2 Commits

Author SHA256 Message Date
345a5a85e6
Update to 1.13.3:
- dictd: fix buffer overflow in first/last search strategies.
2024-11-18 12:10:58 +01:00
e0a55a2436
Update to 1.13.2
- Included changes:
   - Remove config.{sub,guess}
   - Update version to 1.13.2
   - Rename configure.in to configure.ac
   - dictP.h: remove #include <sys/time.h>
   - configure.in: fix obsolete code
   - Fix compilation issues with gcc-14
   - Update configure script and the like (autoconf-2.72)
- Remove upstreamed patch gcc-14.patch
- Add index-buf-ovrflw.patch to overcome a buffer overflow
  (courtesy of the upstream author)
2024-11-16 13:06:59 +01:00
9 changed files with 106 additions and 16 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
.osc .osc
dictd*/

16
_service.NO Normal file
View File

@ -0,0 +1,16 @@
<services>
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/cheusov/dictd.git</param>
<param name="versionprefix">1.13.1+git</param>
<param name="revision">dictd-1.13</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">mcepl@cepl.eu</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service name="set_version" mode="manual"/>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/cheusov/dictd.git</param>
<param name="changesrevision">cccab00fe9eea071f35474c0f7d1c95daa5eeb22</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a00bfa802354217d355bef2846b69bf81628af9a137651da74a8366ef55ecc16
size 338581

BIN
dictd-1.13.3.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Mon Nov 18 11:00:22 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Update to 1.13.3:
- dictd: fix buffer overflow in first/last search strategies.
-------------------------------------------------------------------
Fri Nov 15 12:58:53 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Update to 1.13.2:
- Remove config.{sub,guess}
- Update version to 1.13.2
- Rename configure.in to configure.ac
- dictP.h: remove #include <sys/time.h>
- configure.in: fix obsolete code
- Fix compilation issues with gcc-14
- Update configure script and the like (autoconf-2.72)
- Remove upstreamed patches:
- gcc-14.patch
- Add index-buf-ovrflw.patch to fix a buffer overflow in index.c
(courtesy of the upstream author).
-------------------------------------------------------------------
Sat Nov 02 21:08:57 UTC 2024 - mcepl@cepl.eu
- Update to version 1.13.1+git.1730572217.cccab00:
* dictd: listen to ipv6 and ipv4 by default
* remove use of deprecated inet_aton and inet_ntoa
* dictd: install dictd*.conf files to ${DATADIR}/examples/dictd by default
* Fix problems with DICT_CONFIG_PATH and other defined came from Makefile
* dict/Makefile: do not copy man page to ${BINDIR} :-)
* dict/Makefile: formatting
* dict: install samples dict.conf and dict2.conf to ${EGDIR}
* Move examples/dict1.conf to dict/
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 7 18:18:01 UTC 2024 - Matej Cepl <mcepl@cepl.eu> Thu Mar 7 18:18:01 UTC 2024 - Matej Cepl <mcepl@cepl.eu>

View File

@ -1,5 +1,4 @@
name: dictd name: dictd
version: 1.12.1.git.1520674574.9a2f53e version: 1.13.1+git.1730572217.cccab00
mtime: 1520674574 mtime: 1730572217
commit: 9a2f53ec26ec7eb1880437f1cafae6291634c98d commit: cccab00fe9eea071f35474c0f7d1c95daa5eeb22

View File

@ -17,22 +17,24 @@
Name: dictd Name: dictd
Version: 1.13.1 Version: 1.13.3
Release: 0 Release: 0
Summary: DICT protocol (RFC 2229) server and command-line client Summary: DICT protocol (RFC 2229) server and command-line client
License: BSD-3-Clause AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND MIT AND SUSE-Public-Domain License: BSD-3-Clause AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND MIT AND SUSE-Public-Domain
Group: Productivity/Office/Dictionary Group: Productivity/Office/Dictionary
URL: https://github.com/cheusov/dictd URL: https://github.com/cheusov/dictd
Source0: https://github.com/cheusov/dictd/archive/%{version}.tar.gz#/dictd-%{version}.tar.gz # Source0: https://github.com/cheusov/dictd/archive/%%{version}.tar.gz#/dictd-%%{version}.tar.gz
Source0: https://sourceforge.net/projects/dict/files/dictd/dictd-%{version}/dictd-%{version}.tar.gz
Source1: colorit.conf Source1: colorit.conf
Source2: dictd.service Source2: dictd.service
Source99: dictd-rpmlintrc Source99: dictd-rpmlintrc
Patch0: dictd-1.12.1-unused-return.patch Patch0: dictd-1.12.1-unused-return.patch
BuildRequires: autoconf # BuildRequires: mk-configure
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: gawk BuildRequires: gawk
BuildRequires: gcc BuildRequires: gcc
BuildRequires: judy-devel
BuildRequires: libdbi-devel BuildRequires: libdbi-devel
BuildRequires: libmaa-devel BuildRequires: libmaa-devel
BuildRequires: libtool BuildRequires: libtool
@ -52,12 +54,6 @@ set up a custom dictionary. To look up, for example, the word "grunt",
execute `dict grunt` at a command line. See the man pages of dict and execute `dict grunt` at a command line. See the man pages of dict and
dictd for details. dictd for details.
%prep
%setup -q
%autopatch -p1
autoreconf -fv
%package devel %package devel
Summary: Development files for dictd Summary: Development files for dictd
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
@ -73,14 +69,28 @@ dictd for details.
This package contains development files for the dictd package. This package contains development files for the dictd package.
%prep
%autosetup -p1
%build %build
export LDFLAGS="%{?__global_ldflags}" CPPFLAGS="%{optflags} -fPIC" export LDFLAGS="%{?__global_ldflags}" CPPFLAGS="%{optflags} -fPIC"
# export USE_PLUGIN=1
# export PREFIX="%%{_prefix}"
# export MANDIR="%%{_mandir}"
# export SYSCONFDIR="%%{_sysconfdir}"
# export CC="%%{__cc}"
# export DESTDIR="%%{buildroot}"
# export COPTS="%%{optflags} -fPIC"
# mkc_compiler_settings
# mkcmake all
export LEXLIB="-fl"
%configure --enable-dictorg --with-plugin-dbi %configure --enable-dictorg --with-plugin-dbi
# --disable-plugin # --disable-plugin
%make_build %make_build
%install %install
%make_install %make_install
# mkcmake install
install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/colorit.conf install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/colorit.conf
cat <<EOF >%{buildroot}/%{_sysconfdir}/dictd.conf cat <<EOF >%{buildroot}/%{_sysconfdir}/dictd.conf
global { global {
@ -110,6 +120,9 @@ if [ "x%{_libdir}" != "x%{_libexecdir}" ] ; then
fi fi
rm -fv %{buildroot}%{_libdir}/*.{la,a} rm -fv %{buildroot}%{_libdir}/*.{la,a}
%check
%make_build test
%pre %pre
%service_add_pre dictd.service %service_add_pre dictd.service

22
index-buf-ovrflw.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/index.c b/index.c
index ced1459..883a12d 100644
--- a/index.c
+++ b/index.c
@@ -1505,7 +1505,7 @@ static int dict_search_suffix(
assert (database);
if (database->index_suffix){
- buf = (char *) alloca (strlen (word));
+ buf = (char *) alloca (strlen (word) + 1);
strcpy (buf, word);
PRINTF(DBG_SEARCH, ("anagram: '%s' ==> ", buf));
@@ -1549,7 +1549,7 @@ static int dict_search_last (
assert (database);
if (database->index_suffix){
- buf = (char *) alloca (strlen (word));
+ buf = (char *) alloca (strlen (word) + 1);
strcpy (buf, word);
PRINTF(DBG_SEARCH, ("anagram: '%s' ==> ", buf));