Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu
* Add patch 02-ptsname-prototype.patch to fix segfault at runtime
- Closes: #878322
* Updated 01-spelling-fixes.patch to account for other spelling errors
diff -Nru ax25-tools-0.0.10-rc4/debian/changelog
ax25-tools-0.0.10-rc4/debian/changelog
--- ax25-tools-0.0.10-rc4/debian/changelog 2015-09-03 16:39:34.000000000
+0300
+++ ax25-tools-0.0.10-rc4/debian/changelog 2018-02-27 20:11:05.000000000
+0200
@@ -1,3 +1,12 @@
+ax25-tools (0.0.10-rc4-1+deb9u1) stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch 02-ptsname-prototype.patch to fix segfault at runtime
+ - Closes: #878322
+ * Updated 01-spelling-fixes.patch to account for other spelling errors
+
+ -- Adrian Bunk <b...@debian.org> Tue, 27 Feb 2018 20:11:05 +0200
+
ax25-tools (0.0.10-rc4-1) unstable; urgency=medium
* New upstream version.
diff -Nru ax25-tools-0.0.10-rc4/debian/patches/01-spelling-fixes.patch
ax25-tools-0.0.10-rc4/debian/patches/01-spelling-fixes.patch
--- ax25-tools-0.0.10-rc4/debian/patches/01-spelling-fixes.patch
2015-09-03 16:35:54.000000000 +0300
+++ ax25-tools-0.0.10-rc4/debian/patches/01-spelling-fixes.patch
2018-02-27 20:10:29.000000000 +0200
@@ -1,5 +1,7 @@
Fix spelling errors
Author: col...@debian.org
+Author: Dave Hibberd <d...@vehibberd.com>
+Last-Update: 2017-10-30
--- a/ax25/axgetput/axgetput.c
+++ b/ax25/axgetput/axgetput.c
@@ -12,6 +14,15 @@
} else {
fprintf(stderr, " -b value is the blocksize (framelen) of the
transmitted data\n");
fprintf(stderr, " default %d, which is a useful choice for ampr
ax25.\n", BLOCKSIZ_DEFAULT);
+@@ -175,7 +175,7 @@
+ fprintf(stderr, " otherwise, the data will be read to memory until
EOF.\n");
+ fprintf(stderr, " -s is only available if stdin is a pipe\n");
+ fprintf(stderr, " if filename specified in filter, the given name will
be suggested instead.\n");
+- fprintf(stderr, " filename may be ommited if used as filter.\n");
++ fprintf(stderr, " filename may be omitted if used as filter.\n");
+ }
+ fputc('\n', stderr);
+ fprintf(stderr, "Tips: - compressed download:\n");
--- a/hdlcutil/sethdlc.8
+++ b/hdlcutil/sethdlc.8
@@ -94,7 +94,7 @@
@@ -145,6 +156,24 @@
#BIN protocol.
.LP
+@@ -60,7 +60,7 @@
+ .B yget
+ or
+ .B yput
+-is reserverd for the yapp protocol, which is not supported in this version.
++is reserved for the yapp protocol, which is not supported in this version.
+
+ .LP
+ .B II. DIDADIT Protocol
+@@ -68,7 +68,7 @@
+ .B rget
+ or
+ .B rput
+-is reserverd for the didadit protocol, which is not supported in this version.
++is reserved for the didadit protocol, which is not supported in this version.
+ .LP
+ Anyone like to implement yapp and didadit protcols?
+ .LP
--- a/rose/rsuplnk.8
+++ b/rose/rsuplnk.8
@@ -47,7 +47,7 @@
@@ -178,6 +207,21 @@
write_ax25(buf, strlen(buf), 1);
sprintf(buf, " MD5 is recommended.\r");
write_ax25(buf, strlen(buf), 1);
+@@ -280,12 +280,12 @@
+ goto end;
+ }
+ if (!S_ISREG(statbuf.st_mode)) {
+- sprintf(buf, "Error: password file .%s should
be a regular file. Skiping..\r", PWFILE);
++ sprintf(buf, "Error: password file .%s should
be a regular file. Skipping..\r", PWFILE);
+ write_ax25(buf, strlen(buf), 1);
+ goto end;
+ }
+ if (statbuf.st_uid != 0 && statbuf.st_uid !=
pw->pw_uid) {
+- sprintf(buf, "Error: your password file .%s is
not owned by you. Skiping..\r", PWFILE);
++ sprintf(buf, "Error: your password file .%s is
not owned by you. Skipping..\r", PWFILE);
+ write_ax25(buf, strlen(buf), 1);
+ goto end;
+ }
--- a/tcpip/ttylinkd.c
+++ b/tcpip/ttylinkd.c
@@ -427,7 +427,7 @@
@@ -189,3 +233,36 @@
close(skt);
close(ctl_skt);
return 0;
+--- a/ax25/ax25d.c
++++ b/ax25/ax25d.c
+@@ -1280,7 +1280,7 @@
+ AXL = axl_build; /* Assign our built list to AXL */
+
+ if (Logging)
+- syslog(LOG_INFO, "new config file loaded successfuly");
++ syslog(LOG_INFO, "new config file loaded successfully");
+
+ update_maxfd();
+ return 0;
+--- a/dmascc/dmascc_cfg.1
++++ b/dmascc/dmascc_cfg.1
+@@ -82,7 +82,7 @@
+ on to \fImilliseconds\fR. Maximum wait time is 2500 ms.
+ .TP 10
+ .BI "\-\-persist "\fIf\fR
+-Set the persistance parameter to \fIf\fR. Must be between 0 and 255
++Set the persistence parameter to \fIf\fR. Must be between 0 and 255
+ (inclusive).
+ .TP 10
+ .BI "\-\-dma "\fIchannel\fR
+--- a/tcpip/rip98d.c
++++ b/tcpip/rip98d.c
+@@ -199,7 +199,7 @@
+
+ if (network == 0 || network == 127) {
+ if (debug && logging)
+- syslog(LOG_DEBUG, "rejecting route to %s/%ld -
should not be propogated\n", inet_ntoa(address), netmask);
++ syslog(LOG_DEBUG, "rejecting route to %s/%ld -
should not be propagated\n", inet_ntoa(address), netmask);
+ continue;
+ }
+
diff -Nru ax25-tools-0.0.10-rc4/debian/patches/02-ptsname-prototype.patch
ax25-tools-0.0.10-rc4/debian/patches/02-ptsname-prototype.patch
--- ax25-tools-0.0.10-rc4/debian/patches/02-ptsname-prototype.patch
1970-01-01 02:00:00.000000000 +0200
+++ ax25-tools-0.0.10-rc4/debian/patches/02-ptsname-prototype.patch
2018-02-27 20:07:41.000000000 +0200
@@ -0,0 +1,69 @@
+Description: Fix ptsname bug by defining the relevant macros to their required
+values so ptsname's prototype is declared.
+Author: James Clarke <jrt...@debian.org>
+Last-Update: 2017-10-12
+
+
+--- a/kiss/kissattach.c
++++ b/kiss/kissattach.c
+@@ -1,5 +1,6 @@
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+--- a/kiss/kissnetd.c
++++ b/kiss/kissnetd.c
+@@ -9,8 +9,9 @@
+ * F1OAT 960804 - Frederic RIBLE
+ */
+
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+--- a/kiss/mkiss.c
++++ b/kiss/mkiss.c
+@@ -37,8 +37,9 @@
+ * 1.08 xx/xx/99 Tom Mazouch - Adjustable poll interval
+ */
+
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
+--- a/kiss/net2kiss.c
++++ b/kiss/net2kiss.c
+@@ -30,8 +30,9 @@
+
+
/*****************************************************************************/
+
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+--- a/6pack/m6pack.c
++++ b/6pack/m6pack.c
+@@ -33,8 +33,9 @@
+ *********************************************************************
+ */
+
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
+
diff -Nru ax25-tools-0.0.10-rc4/debian/patches/series
ax25-tools-0.0.10-rc4/debian/patches/series
--- ax25-tools-0.0.10-rc4/debian/patches/series 2015-09-03 16:05:16.000000000
+0300
+++ ax25-tools-0.0.10-rc4/debian/patches/series 2018-02-27 20:07:50.000000000
+0200
@@ -1 +1,2 @@
01-spelling-fixes.patch
+02-ptsname-prototype.patch
