Changeset View
Changeset View
Standalone View
Standalone View
security/libressl-devel/files/extra-patch-enable-nc
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- apps/nc/Makefile.am.orig 2015-09-14 02:12:32.000000000 +0200 | |||||
+++ apps/nc/Makefile.am 2015-09-25 12:29:58.927784208 +0200 | |||||
@@ -1,10 +1,8 @@ | |||||
include $(top_srcdir)/Makefile.am.common | |||||
-if BUILD_NC | |||||
- | |||||
-noinst_PROGRAMS = nc | |||||
+bin_PROGRAMS = nc | |||||
-EXTRA_DIST = nc.1 | |||||
+dist_man_MANS = nc.1 | |||||
nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | |||||
nc_LDADD += $(top_builddir)/crypto/libcrypto.la | |||||
@@ -32,5 +30,3 @@ endif | |||||
if !HAVE_STRTONUM | |||||
nc_SOURCES += compat/strtonum.c | |||||
endif | |||||
- | |||||
-endif | |||||
--- apps/nc/Makefile.in.orig 2015-09-22 14:06:38.000000000 +0200 | |||||
+++ apps/nc/Makefile.in 2015-09-25 12:34:54.162760621 +0200 | |||||
@@ -89,11 +89,10 @@ PRE_UNINSTALL = : | |||||
POST_UNINSTALL = : | |||||
build_triplet = @build@ | |||||
host_triplet = @host@ | |||||
-@BUILD_NC_TRUE@noinst_PROGRAMS = nc$(EXEEXT) | |||||
-@BUILD_NC_TRUE@am__append_1 = -I$(top_srcdir)/apps/nc/compat | |||||
-@BUILD_NC_TRUE@@HAVE_ACCEPT4_FALSE@am__append_2 = compat/accept4.c | |||||
-@BUILD_NC_TRUE@@HAVE_READPASSPHRASE_FALSE@am__append_3 = compat/readpassphrase.c | |||||
-@BUILD_NC_TRUE@@HAVE_STRTONUM_FALSE@am__append_4 = compat/strtonum.c | |||||
+bin_PROGRAMS = nc$(EXEEXT) | |||||
+@HAVE_ACCEPT4_FALSE@am__append_1 = compat/accept4.c | |||||
+@HAVE_READPASSPHRASE_FALSE@am__append_2 = compat/readpassphrase.c | |||||
+@HAVE_STRTONUM_FALSE@am__append_3 = compat/strtonum.c | |||||
subdir = apps/nc | |||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |||||
am__aclocal_m4_deps = $(top_srcdir)/m4/check-hardening-options.m4 \ | |||||
@@ -105,31 +104,28 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/c | |||||
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | |||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |||||
$(ACLOCAL_M4) | |||||
-DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \ | |||||
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ | |||||
$(am__DIST_COMMON) | |||||
mkinstalldirs = $(install_sh) -d | |||||
CONFIG_CLEAN_FILES = | |||||
CONFIG_CLEAN_VPATH_FILES = | |||||
-PROGRAMS = $(noinst_PROGRAMS) | |||||
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" | |||||
+PROGRAMS = $(bin_PROGRAMS) | |||||
am__nc_SOURCES_DIST = atomicio.c netcat.c socks.c compat/socket.c \ | |||||
compat/accept4.c compat/readpassphrase.c compat/strtonum.c | |||||
am__dirstamp = $(am__leading_dot)dirstamp | |||||
-@BUILD_NC_TRUE@@HAVE_ACCEPT4_FALSE@am__objects_1 = \ | |||||
-@BUILD_NC_TRUE@@HAVE_ACCEPT4_FALSE@ compat/accept4.$(OBJEXT) | |||||
-@BUILD_NC_TRUE@@HAVE_READPASSPHRASE_FALSE@am__objects_2 = compat/readpassphrase.$(OBJEXT) | |||||
-@BUILD_NC_TRUE@@HAVE_STRTONUM_FALSE@am__objects_3 = \ | |||||
-@BUILD_NC_TRUE@@HAVE_STRTONUM_FALSE@ compat/strtonum.$(OBJEXT) | |||||
-@BUILD_NC_TRUE@am_nc_OBJECTS = atomicio.$(OBJEXT) netcat.$(OBJEXT) \ | |||||
-@BUILD_NC_TRUE@ socks.$(OBJEXT) compat/socket.$(OBJEXT) \ | |||||
-@BUILD_NC_TRUE@ $(am__objects_1) $(am__objects_2) \ | |||||
-@BUILD_NC_TRUE@ $(am__objects_3) | |||||
+@HAVE_ACCEPT4_FALSE@am__objects_1 = compat/accept4.$(OBJEXT) | |||||
+@HAVE_READPASSPHRASE_FALSE@am__objects_2 = \ | |||||
+@HAVE_READPASSPHRASE_FALSE@ compat/readpassphrase.$(OBJEXT) | |||||
+@HAVE_STRTONUM_FALSE@am__objects_3 = compat/strtonum.$(OBJEXT) | |||||
+am_nc_OBJECTS = atomicio.$(OBJEXT) netcat.$(OBJEXT) socks.$(OBJEXT) \ | |||||
+ compat/socket.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ | |||||
+ $(am__objects_3) | |||||
nc_OBJECTS = $(am_nc_OBJECTS) | |||||
am__DEPENDENCIES_1 = | |||||
-@BUILD_NC_TRUE@nc_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | |||||
-@BUILD_NC_TRUE@ $(am__DEPENDENCIES_1) \ | |||||
-@BUILD_NC_TRUE@ $(top_builddir)/crypto/libcrypto.la \ | |||||
-@BUILD_NC_TRUE@ $(top_builddir)/ssl/libssl.la \ | |||||
-@BUILD_NC_TRUE@ $(top_builddir)/tls/libtls.la | |||||
+nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||||
+ $(top_builddir)/crypto/libcrypto.la \ | |||||
+ $(top_builddir)/ssl/libssl.la $(top_builddir)/tls/libtls.la | |||||
AM_V_lt = $(am__v_lt_@AM_V@) | |||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | |||||
am__v_lt_0 = --silent | |||||
@@ -175,7 +171,36 @@ am__can_run_installinfo = \ | |||||
n|no|NO) false;; \ | |||||
*) (install-info --version) >/dev/null 2>&1;; \ | |||||
esac | |||||
-am__noinst_HEADERS_DIST = atomicio.h compat/sys/socket.h | |||||
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | |||||
+am__vpath_adj = case $$p in \ | |||||
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | |||||
+ *) f=$$p;; \ | |||||
+ esac; | |||||
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | |||||
+am__install_max = 40 | |||||
+am__nobase_strip_setup = \ | |||||
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | |||||
+am__nobase_strip = \ | |||||
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | |||||
+am__nobase_list = $(am__nobase_strip_setup); \ | |||||
+ for p in $$list; do echo "$$p $$p"; done | \ | |||||
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | |||||
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | |||||
+ if (++n[$$2] == $(am__install_max)) \ | |||||
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | |||||
+ END { for (dir in files) print dir, files[dir] }' | |||||
+am__base_list = \ | |||||
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | |||||
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | |||||
+am__uninstall_files_from_dir = { \ | |||||
+ test -z "$$files" \ | |||||
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | |||||
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | |||||
+ $(am__cd) "$$dir" && rm -f $$files; }; \ | |||||
+ } | |||||
+man1dir = $(mandir)/man1 | |||||
+NROFF = nroff | |||||
+MANS = $(dist_man_MANS) | |||||
HEADERS = $(noinst_HEADERS) | |||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | |||||
# Read a list of newline-separated strings from the standard input, | |||||
@@ -196,7 +221,7 @@ am__define_uniq_tagged_files = \ | |||||
done | $(am__uniquify_input)` | |||||
ETAGS = etags | |||||
CTAGS = ctags | |||||
-am__DIST_COMMON = $(srcdir)/Makefile.in \ | |||||
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ | |||||
$(top_srcdir)/Makefile.am.common $(top_srcdir)/depcomp | |||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |||||
ACLOCAL = @ACLOCAL@ | |||||
@@ -214,7 +239,7 @@ CCASFLAGS = @CCASFLAGS@ | |||||
CCDEPMODE = @CCDEPMODE@ | |||||
CFLAGS = @CFLAGS@ | |||||
CPP = @CPP@ | |||||
-CPPFLAGS = @CPPFLAGS@ $(am__append_1) | |||||
+CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/apps/nc/compat | |||||
CYGPATH_W = @CYGPATH_W@ | |||||
DEFS = @DEFS@ | |||||
DEPDIR = @DEPDIR@ | |||||
@@ -324,15 +349,13 @@ top_builddir = @top_builddir@ | |||||
top_srcdir = @top_srcdir@ | |||||
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/compat | |||||
AM_CPPFLAGS = -DLIBRESSL_INTERNAL | |||||
-@BUILD_NC_TRUE@EXTRA_DIST = nc.1 | |||||
-@BUILD_NC_TRUE@nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) \ | |||||
-@BUILD_NC_TRUE@ $(top_builddir)/crypto/libcrypto.la \ | |||||
-@BUILD_NC_TRUE@ $(top_builddir)/ssl/libssl.la \ | |||||
-@BUILD_NC_TRUE@ $(top_builddir)/tls/libtls.la | |||||
-@BUILD_NC_TRUE@nc_SOURCES = atomicio.c netcat.c socks.c \ | |||||
-@BUILD_NC_TRUE@ compat/socket.c $(am__append_2) $(am__append_3) \ | |||||
-@BUILD_NC_TRUE@ $(am__append_4) | |||||
-@BUILD_NC_TRUE@noinst_HEADERS = atomicio.h compat/sys/socket.h | |||||
+dist_man_MANS = nc.1 | |||||
+nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) \ | |||||
+ $(top_builddir)/crypto/libcrypto.la \ | |||||
+ $(top_builddir)/ssl/libssl.la $(top_builddir)/tls/libtls.la | |||||
+nc_SOURCES = atomicio.c netcat.c socks.c compat/socket.c \ | |||||
+ $(am__append_1) $(am__append_2) $(am__append_3) | |||||
+noinst_HEADERS = atomicio.h compat/sys/socket.h | |||||
all: all-am | |||||
.SUFFIXES: | |||||
@@ -367,9 +390,49 @@ $(top_srcdir)/configure: $(am__configur | |||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |||||
$(am__aclocal_m4_deps): | |||||
+install-binPROGRAMS: $(bin_PROGRAMS) | |||||
+ @$(NORMAL_INSTALL) | |||||
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ | |||||
+ if test -n "$$list"; then \ | |||||
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ | |||||
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ | |||||
+ fi; \ | |||||
+ for p in $$list; do echo "$$p $$p"; done | \ | |||||
+ sed 's/$(EXEEXT)$$//' | \ | |||||
+ while read p p1; do if test -f $$p \ | |||||
+ || test -f $$p1 \ | |||||
+ ; then echo "$$p"; echo "$$p"; else :; fi; \ | |||||
+ done | \ | |||||
+ sed -e 'p;s,.*/,,;n;h' \ | |||||
+ -e 's|.*|.|' \ | |||||
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ | |||||
+ sed 'N;N;N;s,\n, ,g' | \ | |||||
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ | |||||
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ | |||||
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \ | |||||
+ else { print "f", $$3 "/" $$4, $$1; } } \ | |||||
+ END { for (d in files) print "f", d, files[d] }' | \ | |||||
+ while read type dir files; do \ | |||||
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ | |||||
+ test -z "$$files" || { \ | |||||
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ | |||||
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ | |||||
+ } \ | |||||
+ ; done | |||||
-clean-noinstPROGRAMS: | |||||
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ | |||||
+uninstall-binPROGRAMS: | |||||
+ @$(NORMAL_UNINSTALL) | |||||
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ | |||||
+ files=`for p in $$list; do echo "$$p"; done | \ | |||||
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ | |||||
+ -e 's/$$/$(EXEEXT)/' \ | |||||
+ `; \ | |||||
+ test -n "$$list" || exit 0; \ | |||||
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ | |||||
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files | |||||
+ | |||||
+clean-binPROGRAMS: | |||||
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ | |||||
echo " rm -f" $$list; \ | |||||
rm -f $$list || exit $$?; \ | |||||
test -n "$(EXEEXT)" || exit 0; \ | |||||
@@ -439,6 +502,49 @@ mostlyclean-libtool: | |||||
clean-libtool: | |||||
-rm -rf .libs _libs | |||||
+install-man1: $(dist_man_MANS) | |||||
+ @$(NORMAL_INSTALL) | |||||
+ @list1=''; \ | |||||
+ list2='$(dist_man_MANS)'; \ | |||||
+ test -n "$(man1dir)" \ | |||||
+ && test -n "`echo $$list1$$list2`" \ | |||||
+ || exit 0; \ | |||||
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ | |||||
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ | |||||
+ { for i in $$list1; do echo "$$i"; done; \ | |||||
+ if test -n "$$list2"; then \ | |||||
+ for i in $$list2; do echo "$$i"; done \ | |||||
+ | sed -n '/\.1[a-z]*$$/p'; \ | |||||
+ fi; \ | |||||
+ } | while read p; do \ | |||||
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ | |||||
+ echo "$$d$$p"; echo "$$p"; \ | |||||
+ done | \ | |||||
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ | |||||
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ | |||||
+ sed 'N;N;s,\n, ,g' | { \ | |||||
+ list=; while read file base inst; do \ | |||||
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ | |||||
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ | |||||
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ | |||||
+ fi; \ | |||||
+ done; \ | |||||
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ | |||||
+ while read files; do \ | |||||
+ test -z "$$files" || { \ | |||||
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ | |||||
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ | |||||
+ done; } | |||||
+ | |||||
+uninstall-man1: | |||||
+ @$(NORMAL_UNINSTALL) | |||||
+ @list=''; test -n "$(man1dir)" || exit 0; \ | |||||
+ files=`{ for i in $$list; do echo "$$i"; done; \ | |||||
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ | |||||
+ sed -n '/\.1[a-z]*$$/p'; \ | |||||
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ | |||||
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ | |||||
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) | |||||
ID: $(am__tagged_files) | |||||
$(am__define_uniq_tagged_files); mkid -fID $$unique | |||||
@@ -524,8 +630,11 @@ distdir: $(DISTFILES) | |||||
done | |||||
check-am: all-am | |||||
check: check-am | |||||
-all-am: Makefile $(PROGRAMS) $(HEADERS) | |||||
+all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) | |||||
installdirs: | |||||
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ | |||||
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | |||||
+ done | |||||
install: install-am | |||||
install-exec: install-exec-am | |||||
install-data: install-data-am | |||||
@@ -560,8 +669,7 @@ maintainer-clean-generic: | |||||
@echo "it deletes files that may require special tools to rebuild." | |||||
clean: clean-am | |||||
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ | |||||
- mostlyclean-am | |||||
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am | |||||
distclean: distclean-am | |||||
-rm -rf ./$(DEPDIR) compat/$(DEPDIR) | |||||
@@ -581,13 +689,13 @@ info: info-am | |||||
info-am: | |||||
-install-data-am: | |||||
+install-data-am: install-man | |||||
install-dvi: install-dvi-am | |||||
install-dvi-am: | |||||
-install-exec-am: | |||||
+install-exec-am: install-binPROGRAMS | |||||
install-html: install-html-am | |||||
@@ -597,7 +705,7 @@ install-info: install-info-am | |||||
install-info-am: | |||||
-install-man: | |||||
+install-man: install-man1 | |||||
install-pdf: install-pdf-am | |||||
@@ -627,23 +735,26 @@ ps: ps-am | |||||
ps-am: | |||||
-uninstall-am: | |||||
+uninstall-am: uninstall-binPROGRAMS uninstall-man | |||||
+ | |||||
+uninstall-man: uninstall-man1 | |||||
.MAKE: install-am install-strip | |||||
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ | |||||
- clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ | |||||
- ctags-am distclean distclean-compile distclean-generic \ | |||||
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ | |||||
+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ | |||||
+ ctags ctags-am distclean distclean-compile distclean-generic \ | |||||
distclean-libtool distclean-tags distdir dvi dvi-am html \ | |||||
- html-am info info-am install install-am install-data \ | |||||
- install-data-am install-dvi install-dvi-am install-exec \ | |||||
- install-exec-am install-html install-html-am install-info \ | |||||
- install-info-am install-man install-pdf install-pdf-am \ | |||||
- install-ps install-ps-am install-strip installcheck \ | |||||
- installcheck-am installdirs maintainer-clean \ | |||||
- maintainer-clean-generic mostlyclean mostlyclean-compile \ | |||||
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | |||||
- tags tags-am uninstall uninstall-am | |||||
+ html-am info info-am install install-am install-binPROGRAMS \ | |||||
+ install-data install-data-am install-dvi install-dvi-am \ | |||||
+ install-exec install-exec-am install-html install-html-am \ | |||||
+ install-info install-info-am install-man install-man1 \ | |||||
+ install-pdf install-pdf-am install-ps install-ps-am \ | |||||
+ install-strip installcheck installcheck-am installdirs \ | |||||
+ maintainer-clean maintainer-clean-generic mostlyclean \ | |||||
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | |||||
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ | |||||
+ uninstall-binPROGRAMS uninstall-man uninstall-man1 | |||||
.PRECIOUS: Makefile | |||||