aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-09 21:10:46 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-09 21:10:46 +0200
commitee5408576d9a3d4cec24682bb76921d2d4839470 (patch)
treeb2b45685516f1b722d8ca4fe2bda3cff187e70b1 /gnu/packages/patches
parentafd40799e451ae7eeeacc97e30924c294e8b2c1e (diff)
parent0cc0095f3c5ad18ee701aeea14c390225feccb2f (diff)
downloadguix-ee5408576d9a3d4cec24682bb76921d2d4839470.tar.gz
guix-ee5408576d9a3d4cec24682bb76921d2d4839470.zip
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/inetutils-syslogd.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/gnu/packages/patches/inetutils-syslogd.patch b/gnu/packages/patches/inetutils-syslogd.patch
new file mode 100644
index 0000000000..0bf9eb7fc6
--- /dev/null
+++ b/gnu/packages/patches/inetutils-syslogd.patch
@@ -0,0 +1,20 @@
+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);)