diff options
Diffstat (limited to 'security/libssh')
| -rw-r--r-- | security/libssh/patches/patch-aa | 30 | ||||
| -rw-r--r-- | security/libssh/patches/patch-ab | 42 |
2 files changed, 12 insertions, 60 deletions
diff --git a/security/libssh/patches/patch-aa b/security/libssh/patches/patch-aa index 2c2a56f8323..16a8c601a68 100644 --- a/security/libssh/patches/patch-aa +++ b/security/libssh/patches/patch-aa @@ -1,19 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2007/02/25 00:57:54 yyamano Exp $ - ---- sample.c.orig 2005-03-05 04:54:59.000000000 +0900 -+++ sample.c -@@ -20,7 +20,14 @@ clients must be made or how a client sho +--- CMakeLists.txt.orig 2013-01-30 11:46:25.000000000 +0000 ++++ CMakeLists.txt 2013-01-30 11:45:52.000000000 +0000 +@@ -36,8 +36,8 @@ + include(CPackConfig.cmake) - #include <sys/select.h> - #include <sys/time.h> -+#if defined(__NetBSD__) || defined(__APPLE__) -+#include <sys/types.h> -+#include <util.h> /* openpty() on NetBSD and Darwin */ -+#elif defined(__DragonFly__) -+#include <libutil.h> -+#else - #include <pty.h> -+#endif - #include <signal.h> - #include <errno.h> - #include <libssh/libssh.h> + # disallow in-source build +-include(MacroEnsureOutOfSourceBuild) +-macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.") ++#include(MacroEnsureOutOfSourceBuild) ++#macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.") + + # add macros + include(MacroAddPlugin) diff --git a/security/libssh/patches/patch-ab b/security/libssh/patches/patch-ab deleted file mode 100644 index bef9ffd0f7c..00000000000 --- a/security/libssh/patches/patch-ab +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2009/11/25 21:11:33 joerg Exp $ - ---- Makefile.in.orig 2005-03-04 20:54:59.000000000 +0100 -+++ Makefile.in -@@ -15,7 +15,7 @@ mandir = $(prefix)/man/man1 - CC = @CC@ - CFLAGS = @CFLAGS@ -Iinclude/ -Wall -g - LDFLAGS = @LDFLAGS@ --LIBS = -lssh -Llibssh/ -+LIBS = -Llibssh -lssh - INSTALL = @INSTALL@ - LN= @LN_S@ - OBJECTS= sample.o samplesshd.o -@@ -27,9 +27,9 @@ all: $(CONFIG) $(OBJECTS) - (cd $$dir && $(MAKE) all) \ - || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -- $(CC) -o samplessh sample.o $(LDFLAGS) $(LIBS) -+ $(CC) -o samplessh sample.o $(LIBS) $(LDFLAGS) - $(LN) -sf samplessh samplesftp -- $(CC) -o samplesshd samplesshd.o $(LDFLAGS) $(LIBS) -+ $(CC) -o samplesshd samplesshd.o $(LIBS) $(LDFLAGS) - $(CONFIG): - $(LN) -f ../../config.h $(CONFIG) - dist: -@@ -56,11 +56,11 @@ install: all - || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - $(top_srcdir)/mkinstalldirs $(incldir)/libssh -- $(INSTALL) include/libssh/libssh.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/config.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/sftp.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/crypto.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/server.h $(incldir)/libssh/ -+ $(BSD_INSTALL_DATA) include/libssh/libssh.h $(incldir)/libssh/ -+ $(BSD_INSTALL_DATA) include/libssh/config.h $(incldir)/libssh/ -+ $(BSD_INSTALL_DATA) include/libssh/sftp.h $(incldir)/libssh/ -+ $(BSD_INSTALL_DATA) include/libssh/crypto.h $(incldir)/libssh/ -+ $(BSD_INSTALL_DATA) include/libssh/server.h $(incldir)/libssh/ - clean: - /bin/rm -f *~ *.o ssh sftp - @for dir in ${subdirs}; do \ |