Attachment #394544 for bug #537292

Lines 162-167 Link Here

(-)openntpd-5.7p2-orig/Makefile.am (+2 lines)
162	libcompat_la_SOURCES += compat/md5.c	162	libcompat_la_SOURCES += compat/md5.c
163	endif	163	endif
164		164
		165	libcompat_la_SOURCES += compat/progname.c
		166
165	if !HAVE_REALLOCARRAY	167	if !HAVE_REALLOCARRAY
166	libcompat_la_SOURCES += compat/reallocarray.c	168	libcompat_la_SOURCES += compat/reallocarray.c
167	endif	169	endif




	   -a "x$HOST_OS" != xnetbsd \
	   -a "x$ac_cv_func_arc4random_uniform" = xyes])

AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
                [[ extern char *__progname; printf("%s", __progname); ]])],
        [ ac_cv_libc_defines___progname="yes" ],
        [ ac_cv_libc_defines___progname="no"
        ])
])
if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
        AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
fi


AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdarg.h>




fi


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5
$as_echo_n "checking if libc defines __progname... " >&6; }
if ${ac_cv_libc_defines___progname+:} false; then :
  $as_echo_n "(cached) " >&6
else

       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h.  */

int
main ()
{
 extern char *__progname; printf("%s", __progname);
  ;
  return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_libc_defines___progname="yes"
else
   ac_cv_libc_defines___progname="no"

fi
rm -f core conftest.err conftest.$ac_objext \
    conftest$ac_exeext conftest.$ac_ext

fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5
$as_echo "$ac_cv_libc_defines___progname" >&6; }
if test "x$ac_cv_libc_defines___progname" = "xyes" ; then

$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h

fi


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5
$as_echo_n "checking whether va_copy exists... " >&6; }
if ${ac_cv_have_va_copy+:} false; then :




	compat/adjfreq_osx.c compat/adjfreq_solaris.c \
	compat/bsd-asprintf.c compat/clock_getres.c \
	compat/clock_gettime_osx.c compat/imsg.c compat/imsg-buffer.c \
	compat/md5.c compat/progname.c compat/reallocarray.c \
	compat/setproctitle.c compat/strlcat.c compat/strlcpy.c \
	compat/strtonum.c compat/bsd-setresgid.c \
	compat/bsd-setresuid.c compat/arc4random.c \
	compat/getentropy_freebsd.c compat/getentropy_linux.c \
	compat/sha2.c compat/getentropy_netbsd.c \
	compat/getentropy_osx.c compat/getentropy_solaris.c \
	compat/arc4random_uniform.c
am__dirstamp = $(am__leading_dot)dirstamp
@HAVE_ADJFREQ_FALSE@@HOST_FREEBSD_TRUE@am__objects_1 = compat/libcompat_la-adjfreq_freebsd.lo
@HAVE_ADJFREQ_FALSE@@HOST_LINUX_TRUE@am__objects_2 = compat/libcompat_la-adjfreq_linux.lo

am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
	$(am__objects_9) $(am__objects_10) \
	compat/libcompat_la-progname.lo $(am__objects_11) \
	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
	$(am__objects_18) $(am__objects_19) $(am__objects_20) \

libcompat_la_SOURCES = $(am__append_4) $(am__append_5) $(am__append_6) \
	$(am__append_7) $(am__append_8) $(am__append_9) \
	$(am__append_10) $(am__append_11) $(am__append_12) \
	$(am__append_13) compat/progname.c $(am__append_14) \
	$(am__append_15) $(am__append_16) $(am__append_17) \
	$(am__append_18) $(am__append_19) $(am__append_20) \
	$(am__append_21) $(am__append_22) $(am__append_23) \
	$(am__append_24) $(am__append_25) $(am__append_26) \
	$(am__append_27) $(am__append_28) $(am__append_29) \
	$(am__append_30)
libcompat_la_LIBADD = $(PLATFORM_LDADD)
noinst_HEADERS = compat/arc4random.h compat/arc4random_freebsd.h \
	compat/arc4random_linux.h compat/arc4random_netbsd.h \

	compat/$(DEPDIR)/$(am__dirstamp)
compat/libcompat_la-md5.lo: compat/$(am__dirstamp) \
	compat/$(DEPDIR)/$(am__dirstamp)
compat/libcompat_la-progname.lo: compat/$(am__dirstamp) \
	compat/$(DEPDIR)/$(am__dirstamp)
compat/libcompat_la-reallocarray.lo: compat/$(am__dirstamp) \
	compat/$(DEPDIR)/$(am__dirstamp)
compat/libcompat_la-setproctitle.lo: compat/$(am__dirstamp) \

@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg-buffer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-md5.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-progname.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-reallocarray.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-setproctitle.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-sha2.Plo@am__quote@

@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-md5.lo `test -f 'compat/md5.c' || echo '$(srcdir)/'`compat/md5.c

compat/libcompat_la-progname.lo: compat/progname.c
@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-progname.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-progname.Tpo -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-progname.Tpo compat/$(DEPDIR)/libcompat_la-progname.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='compat/progname.c' object='compat/libcompat_la-progname.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c

compat/libcompat_la-reallocarray.lo: compat/reallocarray.c
@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-reallocarray.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo -c -o compat/libcompat_la-reallocarray.lo `test -f 'compat/reallocarray.c' || echo '$(srcdir)/'`compat/reallocarray.c
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo compat/$(DEPDIR)/libcompat_la-reallocarray.Plo




/*
 * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice appear in all copies.
 *
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

#include <string.h>

#ifndef HAVE___PROGNAME
char *__progname;
#endif

/*
 * NB. duplicate __progname in case it is an alias for argv[0]
 * Otherwise it may get clobbered by setproctitle()
 */
char *get_progname(char *argv0)
{
#ifdef HAVE___PROGNAME
	extern char *__progname;

	return strdup(__progname);
#else
	char *p;

	if (argv0 == NULL)
		return ("unknown");	/* XXX */
	p = strrchr(argv0, '/');
	if (p == NULL)
		p = argv0;
	else
		p++;

	return (strdup(p));
#endif
}

Lines 116-121 Link Here

(-)openntpd-5.7p2-orig/ntpd.c (+4 lines)
116	static char **saved_argv;	116	static char **saved_argv;
117	#endif	117	#endif
118		118
		119	char get_progname(char argv0);
		120
119	int	121	int
120	main(int argc, char *argv[])	122	main(int argc, char *argv[])
121	{	123	{
Lines 139-144 Link Here
139		141
140	log_init(1); /* log to stderr until daemonized */	142	log_init(1); /* log to stderr until daemonized */
141		143
		144	__progname = get_progname(argv[0]);
		145
142	#ifndef HAVE_SETPROCTITLE	146	#ifndef HAVE_SETPROCTITLE
143	int i;	147	int i;
144	/* Prepare for later setproctitle emulation */	148	/* Prepare for later setproctitle emulation */

Return to bug 537292

Lines 13519-13524 Link Here

(-)openntpd-5.7p2-orig/configure (+36 lines)
13519	fi	13519	fi
13520		13520
13521		13521
		13522	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5
		13523	$as_echo_n "checking if libc defines __progname... " >&6; }
		13524	if ${ac_cv_libc_defines___progname+:} false; then :
		13525	$as_echo_n "(cached) " >&6
		13526	else
		13527
		13528	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		13529	/* end confdefs.h. */
		13530
		13531	int
		13532	main ()
		13533	{
		13534	extern char *__progname; printf("%s", __progname);
		13535	;
		13536	return 0;
		13537	}
		13538	_ACEOF
		13539	if ac_fn_c_try_link "$LINENO"; then :
		13540	ac_cv_libc_defines___progname="yes"
		13541	else
		13542	ac_cv_libc_defines___progname="no"
		13543
		13544	fi
		13545	rm -f core conftest.err conftest.$ac_objext \
		13546	conftest$ac_exeext conftest.$ac_ext
		13547
		13548	fi
		13549	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5
		13550	$as_echo "$ac_cv_libc_defines___progname" >&6; }
		13551	if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
		13552
		13553	$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
		13554
		13555	fi
		13556
		13557
13522	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5	13558	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5
13523	$as_echo_n "checking whether va_copy exists... " >&6; }	13559	$as_echo_n "checking whether va_copy exists... " >&6; }
13524	if ${ac_cv_have_va_copy+:} false; then :	13560	if ${ac_cv_have_va_copy+:} false; then :

Lines 161-173 Link Here

(-)openntpd-5.7p2-orig/Makefile.in (-14 / +27 lines)
161	compat/adjfreq_osx.c compat/adjfreq_solaris.c \	161	compat/adjfreq_osx.c compat/adjfreq_solaris.c \
162	compat/bsd-asprintf.c compat/clock_getres.c \	162	compat/bsd-asprintf.c compat/clock_getres.c \
163	compat/clock_gettime_osx.c compat/imsg.c compat/imsg-buffer.c \	163	compat/clock_gettime_osx.c compat/imsg.c compat/imsg-buffer.c \
164	compat/md5.c compat/reallocarray.c compat/setproctitle.c \	164	compat/md5.c compat/progname.c compat/reallocarray.c \
165	compat/strlcat.c compat/strlcpy.c compat/strtonum.c \	165	compat/setproctitle.c compat/strlcat.c compat/strlcpy.c \
166	compat/bsd-setresgid.c compat/bsd-setresuid.c \	166	compat/strtonum.c compat/bsd-setresgid.c \
167	compat/arc4random.c compat/getentropy_freebsd.c \	167	compat/bsd-setresuid.c compat/arc4random.c \
168	compat/getentropy_linux.c compat/sha2.c \	168	compat/getentropy_freebsd.c compat/getentropy_linux.c \
169	compat/getentropy_netbsd.c compat/getentropy_osx.c \	169	compat/sha2.c compat/getentropy_netbsd.c \
170	compat/getentropy_solaris.c compat/arc4random_uniform.c	170	compat/getentropy_osx.c compat/getentropy_solaris.c \
		171	compat/arc4random_uniform.c
171	am__dirstamp = $(am__leading_dot)dirstamp	172	am__dirstamp = $(am__leading_dot)dirstamp
172	@HAVE_ADJFREQ_FALSE@@HOST_FREEBSD_TRUE@am__objects_1 = compat/libcompat_la-adjfreq_freebsd.lo	173	@HAVE_ADJFREQ_FALSE@@HOST_FREEBSD_TRUE@am__objects_1 = compat/libcompat_la-adjfreq_freebsd.lo
173	@HAVE_ADJFREQ_FALSE@@HOST_LINUX_TRUE@am__objects_2 = compat/libcompat_la-adjfreq_linux.lo	174	@HAVE_ADJFREQ_FALSE@@HOST_LINUX_TRUE@am__objects_2 = compat/libcompat_la-adjfreq_linux.lo
Lines 207-213 Link Here
207	am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \	208	am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
208	$(am__objects_3) $(am__objects_4) $(am__objects_5) \	209	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
209	$(am__objects_6) $(am__objects_7) $(am__objects_8) \	210	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
210	$(am__objects_9) $(am__objects_10) $(am__objects_11) \	211	$(am__objects_9) $(am__objects_10) \
		212	compat/libcompat_la-progname.lo $(am__objects_11) \
211	$(am__objects_12) $(am__objects_13) $(am__objects_14) \	213	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
212	$(am__objects_15) $(am__objects_16) $(am__objects_17) \	214	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
213	$(am__objects_18) $(am__objects_19) $(am__objects_20) \	215	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
Lines 562-573 Link Here
562	libcompat_la_SOURCES = $(am__append_4) $(am__append_5) $(am__append_6) \	564	libcompat_la_SOURCES = $(am__append_4) $(am__append_5) $(am__append_6) \
563	$(am__append_7) $(am__append_8) $(am__append_9) \	565	$(am__append_7) $(am__append_8) $(am__append_9) \
564	$(am__append_10) $(am__append_11) $(am__append_12) \	566	$(am__append_10) $(am__append_11) $(am__append_12) \
565	$(am__append_13) $(am__append_14) $(am__append_15) \	567	$(am__append_13) compat/progname.c $(am__append_14) \
566	$(am__append_16) $(am__append_17) $(am__append_18) \	568	$(am__append_15) $(am__append_16) $(am__append_17) \
567	$(am__append_19) $(am__append_20) $(am__append_21) \	569	$(am__append_18) $(am__append_19) $(am__append_20) \
568	$(am__append_22) $(am__append_23) $(am__append_24) \	570	$(am__append_21) $(am__append_22) $(am__append_23) \
569	$(am__append_25) $(am__append_26) $(am__append_27) \	571	$(am__append_24) $(am__append_25) $(am__append_26) \
570	$(am__append_28) $(am__append_29) $(am__append_30)	572	$(am__append_27) $(am__append_28) $(am__append_29) \
		573	$(am__append_30)
571	libcompat_la_LIBADD = $(PLATFORM_LDADD)	574	libcompat_la_LIBADD = $(PLATFORM_LDADD)
572	noinst_HEADERS = compat/arc4random.h compat/arc4random_freebsd.h \	575	noinst_HEADERS = compat/arc4random.h compat/arc4random_freebsd.h \
573	compat/arc4random_linux.h compat/arc4random_netbsd.h \	576	compat/arc4random_linux.h compat/arc4random_netbsd.h \
Lines 649-654 Link Here
649	compat/$(DEPDIR)/$(am__dirstamp)	652	compat/$(DEPDIR)/$(am__dirstamp)
650	compat/libcompat_la-md5.lo: compat/$(am__dirstamp) \	653	compat/libcompat_la-md5.lo: compat/$(am__dirstamp) \
651	compat/$(DEPDIR)/$(am__dirstamp)	654	compat/$(DEPDIR)/$(am__dirstamp)
		655	compat/libcompat_la-progname.lo: compat/$(am__dirstamp) \
		656	compat/$(DEPDIR)/$(am__dirstamp)
652	compat/libcompat_la-reallocarray.lo: compat/$(am__dirstamp) \	657	compat/libcompat_la-reallocarray.lo: compat/$(am__dirstamp) \
653	compat/$(DEPDIR)/$(am__dirstamp)	658	compat/$(DEPDIR)/$(am__dirstamp)
654	compat/libcompat_la-setproctitle.lo: compat/$(am__dirstamp) \	659	compat/libcompat_la-setproctitle.lo: compat/$(am__dirstamp) \
Lines 783-788 Link Here
783	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg-buffer.Plo@am__quote@	788	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg-buffer.Plo@am__quote@
784	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg.Plo@am__quote@	789	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg.Plo@am__quote@
785	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-md5.Plo@am__quote@	790	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-md5.Plo@am__quote@
		791	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-progname.Plo@am__quote@
786	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-reallocarray.Plo@am__quote@	792	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-reallocarray.Plo@am__quote@
787	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-setproctitle.Plo@am__quote@	793	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-setproctitle.Plo@am__quote@
788	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-sha2.Plo@am__quote@	794	@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-sha2.Plo@am__quote@
Lines 893-898 Link Here
893	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@	899	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
894	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-md5.lo `test -f 'compat/md5.c' \|\| echo '$(srcdir)/'`compat/md5.c	900	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-md5.lo `test -f 'compat/md5.c' \|\| echo '$(srcdir)/'`compat/md5.c
895		901
		902	compat/libcompat_la-progname.lo: compat/progname.c
		903	@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-progname.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-progname.Tpo -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' \|\| echo '$(srcdir)/'`compat/progname.c
		904	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-progname.Tpo compat/$(DEPDIR)/libcompat_la-progname.Plo
		905	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='compat/progname.c' object='compat/libcompat_la-progname.lo' libtool=yes @AMDEPBACKSLASH@
		906	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
		907	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' \|\| echo '$(srcdir)/'`compat/progname.c
		908
896	compat/libcompat_la-reallocarray.lo: compat/reallocarray.c	909	compat/libcompat_la-reallocarray.lo: compat/reallocarray.c
897	@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-reallocarray.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo -c -o compat/libcompat_la-reallocarray.lo `test -f 'compat/reallocarray.c' \|\| echo '$(srcdir)/'`compat/reallocarray.c	910	@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-reallocarray.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo -c -o compat/libcompat_la-reallocarray.lo `test -f 'compat/reallocarray.c' \|\| echo '$(srcdir)/'`compat/reallocarray.c
898	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo compat/$(DEPDIR)/libcompat_la-reallocarray.Plo	911	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo compat/$(DEPDIR)/libcompat_la-reallocarray.Plo

Lines 153-158 Link Here

(-)openntpd-5.7p2-orig/configure.ac (+12 lines)
153	-a "x$HOST_OS" != xnetbsd \	153	-a "x$HOST_OS" != xnetbsd \
154	-a "x$ac_cv_func_arc4random_uniform" = xyes])	154	-a "x$ac_cv_func_arc4random_uniform" = xyes])
155		155
		156	AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
		157	AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
		158	[[ extern char *__progname; printf("%s", __progname); ]])],
		159	[ ac_cv_libc_defines___progname="yes" ],
		160	[ ac_cv_libc_defines___progname="no"
		161	])
		162	])
		163	if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
		164	AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
		165	fi
		166
		167
156	AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [	168	AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
157	AC_LINK_IFELSE([AC_LANG_PROGRAM([[	169	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
158	#include <stdarg.h>	170	#include <stdarg.h>

Line 0 Link Here

(-)openntpd-5.7p2-orig/compat/progname.c (+46 lines)
	1	/*
	2	* Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
	3	*
	4	* Permission to use, copy, modify, and distribute this software for any
	5	* purpose with or without fee is hereby granted, provided that the above
	6	* copyright notice and this permission notice appear in all copies.
	7	*
	8	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
	9	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
	10	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
	11	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
	12	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
	13	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
	14	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	15	*/
	16
	17	#include <string.h>
	18
	19	#ifndef HAVE___PROGNAME
	20	char *__progname;
	21	#endif
	22
	23	/*
	24	* NB. duplicate __progname in case it is an alias for argv[0]
	25	* Otherwise it may get clobbered by setproctitle()
	26	*/
	27	char get_progname(char argv0)
	28	{
	29	#ifdef HAVE___PROGNAME
	30	extern char *__progname;
	31
	32	return strdup(__progname);
	33	#else
	34	char *p;
	35
	36	if (argv0 == NULL)
	37	return ("unknown"); /* XXX */
	38	p = strrchr(argv0, '/');
	39	if (p == NULL)
	40	p = argv0;
	41	else
	42	p++;
	43
	44	return (strdup(p));
	45	#endif
	46	}