nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Ludovic Courtès 2015-05-12 18:41:58 +02:00
parent 5463fe512a
commit 083b54b7c7
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu-system.am
View File

@ -452,7 +452,6 @@ dist_patch_DATA = \
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \ gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/hop-bigloo-4.0b.patch \
gnu/packages/patches/hop-linker-flags.patch \ gnu/packages/patches/hop-linker-flags.patch \
gnu/packages/patches/inetutils-syslogd.patch \
gnu/packages/patches/irrlicht-mesa-10.patch \ gnu/packages/patches/irrlicht-mesa-10.patch \
gnu/packages/patches/jbig2dec-ignore-testtest.patch \ gnu/packages/patches/jbig2dec-ignore-testtest.patch \
gnu/packages/patches/kmod-module-directory.patch \ gnu/packages/patches/kmod-module-directory.patch \

9
gnu/packages/admin.scm
View File

@ -152,25 +152,20 @@ re-executing them as necessary.")
(define-public inetutils (define-public inetutils
(package (package
(name "inetutils") (name "inetutils")
(version "1.9.2") (version "1.9.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/inetutils/inetutils-" (uri (string-append "mirror://gnu/inetutils/inetutils-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4")) "06dshajjpyi9sxi7qfki9gnp5r3nxvyvf81r81gx0x2qkqzqcxlj"))))
(patches (list (search-patch "inetutils-syslogd.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments `(;; FIXME: `tftp.sh' relies on `netstat' from utils-linux, (arguments `(;; FIXME: `tftp.sh' relies on `netstat' from utils-linux,
;; which is currently missing. ;; which is currently missing.
#:tests? #f)) #:tests? #f))
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("readline" ,readline))) ; for 'ftp' ("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/") (home-page "http://www.gnu.org/software/inetutils/")
(synopsis "Basic networking utilities") (synopsis "Basic networking utilities")
(description (description

20
gnu/packages/patches/inetutils-syslogd.patch
View File

@ -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);)