Merge ~vpa1977/ubuntu/+source/ncrack:ubuntu/devel into ubuntu/+source/ncrack:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merged at revision: 00d199cb8d53af4f4d469f407feeb936e347e1a4
Proposed branch: ~vpa1977/ubuntu/+source/ncrack:ubuntu/devel
Merge into: ubuntu/+source/ncrack:ubuntu/devel
Diff against target: 233 lines (+211/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/implicit-declaration-in-configure.patch (+202/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Zixing Liu Pending
git-ubuntu import Pending
Review via email: mp+464185@code.launchpad.net

Description of the change

Changes:
 - add missing headers to the configure script

PPA: ppa:vpa1977/october-21[1]

Testing:
 - build succeeds[1]
 - piuparts test (amd64)
0m45.2s INFO: PASS: All tests.
0m45.2s INFO: piuparts run ends.
 - package installs on armhf
 - smoke test on armhf
---
  ncrack -v -T5 https://192.168.0.1

Starting Ncrack 0.7 ( http://ncrack.org ) at 2024-04-14 20:58 UTC

https://192.168.0.1:443 finished.

Ncrack done: 1 service scanned in 9.00 seconds.
Probes sent: 1 | timed-out: 1 | prematurely-closed: 0

Ncrack finished.
---

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21/+sourcepub/15931126/+listing-archive-extra

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a2128fe..99d5a04 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+ncrack (0.7+debian-5ubuntu1) noble; urgency=medium
7+
8+ * debian/patches/implicit-declaration-in-configure.patch: add missing
9+ headers to workaround -Werror=implicit-function-declaration (Closes:
10+ #1065799, LP: #2060908).
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Fri, 12 Apr 2024 19:45:45 +1200
13+
14 ncrack (0.7+debian-5build2) noble; urgency=medium
15
16 * No-change rebuild for CVE-2024-3094
17diff --git a/debian/patches/implicit-declaration-in-configure.patch b/debian/patches/implicit-declaration-in-configure.patch
18new file mode 100644
19index 0000000..267e38f
20--- /dev/null
21+++ b/debian/patches/implicit-declaration-in-configure.patch
22@@ -0,0 +1,202 @@
23+Description: add missing headers to workaround -Werror=implicit-function-declaration
24+Author: Vladimir Petko <vladimir.petko@canonical.com>
25+Origin: https://github.com/nmap/ncrack/pull/135
26+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ncrack/+bug/2060908
27+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1065799
28+Bug: https://github.com/nmap/ncrack/issues/134
29+Last-Update: 2024-04-12
30+---
31+diff --git a/opensshlib/configure.ac b/opensshlib/configure.ac
32+index 3961df4..e8807eb 100644
33+--- a/opensshlib/configure.ac
34++++ b/opensshlib/configure.ac
35+@@ -1111,7 +1111,10 @@ mips-sony-bsd|mips-sony-newsos4)
36+ esac
37+
38+ AC_MSG_CHECKING([compiler and flags for sanity])
39+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ exit(0); ]])],
40++AC_RUN_IFELSE([AC_LANG_PROGRAM([[
41++#include <stdio.h>
42++#include <stdlib.h>
43++]], [[ exit(0); ]])],
44+ [ AC_MSG_RESULT([yes]) ],
45+ [
46+ AC_MSG_RESULT([no])
47+@@ -1349,6 +1352,7 @@ AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
48+ AC_RUN_IFELSE(
49+ [AC_LANG_PROGRAM([[
50+ #include <sys/types.h>
51++#include <stdlib.h>
52+ #include <dirent.h>]],
53+ [[
54+ struct dirent d;
55+@@ -1944,7 +1948,10 @@ AC_CHECK_FUNC([getpagesize],
56+ if test "x$ac_cv_func_snprintf" = "xyes" ; then
57+ AC_MSG_CHECKING([whether snprintf correctly terminates long strings])
58+ AC_RUN_IFELSE(
59+- [AC_LANG_PROGRAM([[ #include <stdio.h> ]],
60++ [AC_LANG_PROGRAM([[
61++#include <stdio.h>
62++#include <stdlib.h>
63++]],
64+ [[
65+ char b[5];
66+ snprintf(b,5,"123456789");
67+@@ -2346,6 +2353,7 @@ if test "x$openssl" = "xyes" ; then
68+ AC_RUN_IFELSE(
69+ [AC_LANG_PROGRAM([[
70+ #include <stdio.h>
71++ #include <stdlib.h>
72+ #include <string.h>
73+ #include <openssl/opensslv.h>
74+ #define DATA "conftest.sslincver"
75+@@ -2380,6 +2388,7 @@ if test "x$openssl" = "xyes" ; then
76+ AC_RUN_IFELSE(
77+ [AC_LANG_PROGRAM([[
78+ #include <stdio.h>
79++ #include <stdlib.h>
80+ #include <string.h>
81+ #define OPENSSL_API_COMPAT 0x10000000L
82+ #include <openssl/opensslv.h>
83+@@ -3186,6 +3195,7 @@ if test -z "$have_llong_max"; then
84+ AC_RUN_IFELSE(
85+ [AC_LANG_PROGRAM([[
86+ #include <stdio.h>
87++#include <stdlib.h>
88+ /* Why is this so damn hard? */
89+ #ifdef __GNUC__
90+ # undef __GNUC__
91+@@ -3644,6 +3654,7 @@ dnl test snprintf (broken on SCO w/gcc)
92+ AC_RUN_IFELSE(
93+ [AC_LANG_SOURCE([[
94+ #include <stdio.h>
95++#include <stdlib.h>
96+ #include <string.h>
97+ #ifdef HAVE_SNPRINTF
98+ main()
99+@@ -3701,6 +3712,7 @@ AC_CHECK_MEMBER([struct __res_state.retrans], [], [AC_DEFINE([__res_state], [sta
100+ [Define if we don't have struct __res_state in resolv.h])],
101+ [[
102+ #include <stdio.h>
103++#include <stdlib.h>
104+ #if HAVE_SYS_TYPES_H
105+ # include <sys/types.h>
106+ #endif
107+@@ -3744,6 +3756,7 @@ AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
108+ #include <sys/types.h>
109+ #include <sys/socket.h>
110+ #include <sys/uio.h>
111++#include <stdlib.h>
112+ ]], [[
113+ #ifdef msg_accrights
114+ #error "msg_accrights is a macro"
115+@@ -3804,6 +3817,7 @@ AC_CACHE_CHECK([for msg_control field in struct msghdr],
116+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
117+ #include <sys/types.h>
118+ #include <sys/socket.h>
119++#include <stdlib.h>
120+ #include <sys/uio.h>
121+ ]], [[
122+ #ifdef msg_control
123+@@ -3825,7 +3839,7 @@ if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
124+ fi
125+
126+ AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
127+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
128++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
129+ [[ extern char *__progname; printf("%s", __progname); ]])],
130+ [ ac_cv_libc_defines___progname="yes" ],
131+ [ ac_cv_libc_defines___progname="no"
132+@@ -3897,7 +3911,7 @@ if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
133+ fi
134+
135+ AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [
136+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
137++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
138+ [[ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);]])],
139+ [ ac_cv_libc_defines_sys_errlist="yes" ],
140+ [ ac_cv_libc_defines_sys_errlist="no"
141+@@ -3910,7 +3924,7 @@ fi
142+
143+
144+ AC_CACHE_CHECK([if libc defines sys_nerr], ac_cv_libc_defines_sys_nerr, [
145+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
146++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
147+ [[ extern int sys_nerr; printf("%i", sys_nerr);]])],
148+ [ ac_cv_libc_defines_sys_nerr="yes" ],
149+ [ ac_cv_libc_defines_sys_nerr="no"
150+@@ -4220,6 +4234,7 @@ AC_ARG_WITH([maildir],
151+ AC_RUN_IFELSE(
152+ [AC_LANG_PROGRAM([[
153+ #include <stdio.h>
154++#include <stdlib.h>
155+ #include <string.h>
156+ #ifdef HAVE_PATHS_H
157+ #include <paths.h>
158+@@ -4366,6 +4381,7 @@ if test -z "$disable_shadow" ; then
159+ AC_MSG_CHECKING([if the systems has expire shadow information])
160+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
161+ #include <sys/types.h>
162++#include <stdlib.h>
163+ #include <shadow.h>
164+ struct spwd sp;
165+ ]], [[ sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; ]])],
166+@@ -4464,6 +4480,7 @@ otherwise scp will not work.])
167+ [AC_LANG_PROGRAM([[
168+ /* find out what STDPATH is */
169+ #include <stdio.h>
170++#include <stdlib.h>
171+ #ifdef HAVE_PATHS_H
172+ # include <paths.h>
173+ #endif
174+diff --git a/opensshlib/configure.ac b/opensshlib/configure.ac
175+index e8807eb..6b3be12 100644
176+--- a/opensshlib/configure.ac
177++++ b/opensshlib/configure.ac
178+@@ -1853,6 +1853,9 @@ AC_CHECK_FUNCS([setresuid], [
179+ AC_MSG_CHECKING([if setresuid seems to work])
180+ AC_RUN_IFELSE(
181+ [AC_LANG_PROGRAM([[
182++#ifdef HAVE_UNISTD_H
183++#include <unistd.h>
184++#endif
185+ #include <stdlib.h>
186+ #include <errno.h>
187+ ]], [[
188+@@ -1878,6 +1881,9 @@ AC_CHECK_FUNCS([setresgid], [
189+ [AC_LANG_PROGRAM([[
190+ #include <stdlib.h>
191+ #include <errno.h>
192++#ifdef HAVE_UNISTD_H
193++#include <unistd.h>
194++#endif
195+ ]], [[
196+ errno=0;
197+ setresgid(0,0,0);
198+@@ -2042,6 +2048,9 @@ if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
199+ AC_MSG_CHECKING([for (overly) strict mkstemp])
200+ AC_RUN_IFELSE(
201+ [AC_LANG_PROGRAM([[
202++#ifdef HAVE_UNISTD_H
203++#include <unistd.h>
204++#endif
205+ #include <stdlib.h>
206+ ]], [[
207+ char template[]="conftest.mkstemp-test";
208+@@ -2070,6 +2079,13 @@ if test ! -z "$check_for_openpty_ctty_bug"; then
209+ AC_RUN_IFELSE(
210+ [AC_LANG_PROGRAM([[
211+ #include <stdio.h>
212++#include <stdlib.h>
213++#ifdef HAVE_UNISTD_H
214++#include <unistd.h>
215++#endif
216++#ifdef HAVE_PTY_H
217++#include <pty.h>
218++#endif
219+ #include <sys/fcntl.h>
220+ #include <sys/types.h>
221+ #include <sys/wait.h>
222+--
223+2.40.1
224+
225diff --git a/debian/patches/series b/debian/patches/series
226index 197a260..ce603cf 100644
227--- a/debian/patches/series
228+++ b/debian/patches/series
229@@ -2,3 +2,4 @@ fix-gcc-10-build.patch
230 fix-autotools-compat.patch
231 fix-spelling-errors.patch
232 allow-zlib-versions-with-two-part-version-number.patch
233+implicit-declaration-in-configure.patch

Subscribers

People subscribed via source and target branches