gnu: inetutils: Update to 1.9.3.
* gnu/packages/patches/inetutils-syslogd.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. * gnu/packages/admin.scm (inetutils): Bump to 1.9.3. [source]: Remove patch. [native-inputs]: Remove.
This commit is contained in:
parent
5463fe512a
commit
083b54b7c7
@ -452,7 +452,6 @@ dist_patch_DATA = \
|
||||
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
||||
gnu/packages/patches/hop-bigloo-4.0b.patch \
|
||||
gnu/packages/patches/hop-linker-flags.patch \
|
||||
gnu/packages/patches/inetutils-syslogd.patch \
|
||||
gnu/packages/patches/irrlicht-mesa-10.patch \
|
||||
gnu/packages/patches/jbig2dec-ignore-testtest.patch \
|
||||
gnu/packages/patches/kmod-module-directory.patch \
|
||||
|
@ -152,25 +152,20 @@ re-executing them as necessary.")
|
||||
(define-public inetutils
|
||||
(package
|
||||
(name "inetutils")
|
||||
(version "1.9.2")
|
||||
(version "1.9.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/inetutils/inetutils-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4"))
|
||||
(patches (list (search-patch "inetutils-syslogd.patch")))))
|
||||
"06dshajjpyi9sxi7qfki9gnp5r3nxvyvf81r81gx0x2qkqzqcxlj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(;; FIXME: `tftp.sh' relies on `netstat' from utils-linux,
|
||||
;; which is currently missing.
|
||||
#:tests? #f))
|
||||
(inputs `(("ncurses" ,ncurses)
|
||||
("readline" ,readline))) ; for 'ftp'
|
||||
|
||||
;; Help2man is needed because of the patch that modifies syslogd.c.
|
||||
(native-inputs `(("help2man" ,help2man)))
|
||||
|
||||
(home-page "http://www.gnu.org/software/inetutils/")
|
||||
(synopsis "Basic networking utilities")
|
||||
(description
|
||||
|
@ -1,20 +0,0 @@
|
||||
From <http://lists.gnu.org/archive/html/bug-inetutils/2015-04/msg00001.html>.
|
||||
|
||||
2015-04-01 Ludovic Courtès <ludo@gnu.org>
|
||||
|
||||
* src/syslogd.c (load_conffile): Use 'bcopy' instead of 'strcpy'
|
||||
since the two regions may overlap.
|
||||
Reported by Alex Kost <alezost@gmail.com>
|
||||
at <http://lists.gnu.org/archive/html/guix-devel/2015-03/msg00780.html>.
|
||||
|
||||
--- a/src/syslogd.c
|
||||
+++ b/src/syslogd.c
|
||||
@@ -1989,7 +1989,7 @@ load_conffile (const char *filename, struct filed **nextp)
|
||||
if (*p == '\0' || *p == '#')
|
||||
continue;
|
||||
|
||||
- strcpy (cline, p);
|
||||
+ bcopy (p, cline, strlen (p) + 1);
|
||||
|
||||
/* Cut the trailing spaces. */
|
||||
for (p = strchr (cline, '\0'); isspace (*--p);)
|
Loading…
Reference in New Issue
Block a user