Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu

xmotd in stretch currently just crashes.
diff -Nru xmotd-1.17.3b/debian/changelog xmotd-1.17.3b/debian/changelog
--- xmotd-1.17.3b/debian/changelog      2016-09-10 22:07:47.000000000 +0300
+++ xmotd-1.17.3b/debian/changelog      2018-09-16 21:30:35.000000000 +0300
@@ -1,3 +1,15 @@
+xmotd (1.17.3b-9+deb9u1) stretch; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/bugfix/fix-warnings-hardening-build.patch:
+    - Fix most compile time warnings and avoid crash with hardening
+      flags (acknowledgments to Christoph Pleger for the patch)
+      (Closes: #889740).
+    - Backported to stretch is a partial version of this patch
+      sufficient to fix the crash.
+
+ -- Adrian Bunk <b...@debian.org>  Sun, 16 Sep 2018 21:30:35 +0300
+
 xmotd (1.17.3b-9) unstable; urgency=medium
 
   * Make debian/copyright DEP5 compliant.
diff -Nru 
xmotd-1.17.3b/debian/patches/bugfix/fix-warnings-hardening-build.patch 
xmotd-1.17.3b/debian/patches/bugfix/fix-warnings-hardening-build.patch
--- xmotd-1.17.3b/debian/patches/bugfix/fix-warnings-hardening-build.patch      
1970-01-01 02:00:00.000000000 +0200
+++ xmotd-1.17.3b/debian/patches/bugfix/fix-warnings-hardening-build.patch      
2018-09-16 21:30:35.000000000 +0300
@@ -0,0 +1,75 @@
+Remove compiler and linker warnings
+Index: xmotd-1.17.3b/atom.c
+===================================================================
+--- xmotd-1.17.3b.orig/atom.c  2018-02-13 10:44:27.104309051 +0100
++++ xmotd-1.17.3b/atom.c       2018-02-13 10:44:27.096309028 +0100
+@@ -29,6 +29,7 @@
+  */
+ #include <stdio.h>
+ 
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <errno.h>
+ #include <pwd.h>
+Index: xmotd-1.17.3b/textmode.c
+===================================================================
+--- xmotd-1.17.3b.orig/textmode.c      2018-02-13 10:44:27.104309051 +0100
++++ xmotd-1.17.3b/textmode.c   2018-02-13 10:44:27.096309028 +0100
+@@ -40,6 +40,9 @@
+ #include <fcntl.h>
+ 
+ #include "maindefs.h"
++#include "prototypes.h"
++
++extern time_t motdChanged();
+ 
+ void
+ runInTextMode(argc, argv)
+Index: xmotd-1.17.3b/xmotd.c
+===================================================================
+--- xmotd-1.17.3b.orig/xmotd.c 2018-02-13 10:44:27.104309051 +0100
++++ xmotd-1.17.3b/xmotd.c      2018-02-13 11:06:49.756282943 +0100
+@@ -70,6 +70,7 @@
+ 
+ #include "maindefs.h"
+ #include "main.h"
++#include "prototypes.h"
+ 
+ extern time_t motdChanged();
+ extern messageptr freeMessage();
+Index: xmotd-1.17.3b/Imakefile
+===================================================================
+--- xmotd-1.17.3b.orig/Imakefile       2018-02-13 10:44:27.104309051 +0100
++++ xmotd-1.17.3b/Imakefile    2018-02-13 10:44:27.096309028 +0100
+@@ -60,7 +60,7 @@
+ 
+              SRCS = main.c xmotd.c changed.c textmode.c usage.c browser.c 
logo.c atom.c
+              OBJS = main.o xmotd.o changed.o textmode.o usage.o browser.o 
logo.o atom.o
+-            INCLS = maindefs.h appdefs.h main.h
++            INCLS = maindefs.h appdefs.h main.h prototypes.h
+ 
+       CDEBUGFLAGS = -g
+         MANSUFFIX = 8
+Index: xmotd-1.17.3b/Makefile
+===================================================================
+--- xmotd-1.17.3b.orig/Makefile        2018-02-13 10:44:27.104309051 +0100
++++ xmotd-1.17.3b/Makefile     2018-02-13 10:44:27.096309028 +0100
+@@ -497,7 +497,7 @@
+ 
+              SRCS = main.c xmotd.c changed.c textmode.c usage.c browser.c 
logo.c atom.c
+              OBJS = main.o xmotd.o changed.o textmode.o usage.o browser.o 
logo.o atom.o
+-            INCLS = maindefs.h appdefs.h main.h
++            INCLS = maindefs.h appdefs.h main.h prototypes.h
+ 
+       CDEBUGFLAGS = -g
+         MANSUFFIX = 8
+Index: xmotd-1.17.3b/prototypes.h
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ xmotd-1.17.3b/prototypes.h 2018-02-13 10:46:01.608588566 +0100
+@@ -0,0 +1,5 @@
++#ifndef _XMOTD_PROTOTYPES_H
++#define _XMOTD_PROTOTYPES_H
++void updateTimeStamp(char *motdfile);
++char * getTimeStampName(void);
++#endif
diff -Nru xmotd-1.17.3b/debian/patches/series 
xmotd-1.17.3b/debian/patches/series
--- xmotd-1.17.3b/debian/patches/series 2016-09-10 22:07:47.000000000 +0300
+++ xmotd-1.17.3b/debian/patches/series 2018-09-16 21:30:35.000000000 +0300
@@ -6,3 +6,4 @@
 debian/enable-xpm.diff -p1
 debian/html-support-gone.diff -p1
 debian/unqualify-xmotd-in-manpage.diff -p1
+bugfix/fix-warnings-hardening-build.patch

Reply via email to