- Update to 1.8

- Pass maintainership to submitter

PR:		135463
Submitted by:	Charlie Kester <corky1951@comcast.net>

4 files changed, 33 insertions, 28 deletions

diff --git a/security/ccrypt/files/patch-Makefile.in b/security/ccrypt/files/patch-Makefile.in
index 91ac67716abf..6c1fa446bb1e 100644
--- a/security/ccrypt/files/patch-Makefile.in
+++ b/security/ccrypt/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Mar 29 06:58:19 2004
-+++ Makefile.in	Sun Jan 23 09:55:14 2005
-@@ -150,7 +150,7 @@
+--- Makefile.in.orig	2009-06-05 07:59:43.000000000 -0700
++++ Makefile.in	2009-06-10 18:06:23.000000000 -0700
+@@ -251,7 +251,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = src emacs doc check
-+SUBDIRS = src doc check
- EXTRA_DIST = README.win
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+-SUBDIRS = m4 po intl src emacs doc check
++SUBDIRS = m4 po intl src doc check
+ EXTRA_DIST = m4/ChangeLog  config.rpath README-WIN intltool-extract.in	\
+  intltool-merge.in intltool-update.in
+ 
diff --git a/security/ccrypt/files/patch-doc::Makefile.in b/security/ccrypt/files/patch-doc::Makefile.in
deleted file mode 100644
index 6cfb5a16d6df..000000000000
--- a/security/ccrypt/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Mon Mar 29 06:58:19 2004
-+++ doc/Makefile.in	Sun Jan 23 09:59:41 2005
-@@ -274,7 +274,7 @@
- check: check-am
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
--	$(mkdir_p) $(DESTDIR)$(man1dir) $(DESTDIR)$(htmldir)
-+	$(mkdir_p) $(DESTDIR)$(man1dir)
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -316,7 +316,7 @@
- 
- info-am:
- 
--install-data-am: install-htmlDATA install-man
-+install-data-am: install-man
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
diff --git a/security/ccrypt/files/patch-src-main.c b/security/ccrypt/files/patch-src-main.c
new file mode 100644
index 000000000000..0241affcb291
--- /dev/null
+++ b/security/ccrypt/files/patch-src-main.c
@@ -0,0 +1,13 @@
+--- src/main.c.orig	2009-06-05 07:58:59.000000000 -0700
++++ src/main.c	2009-06-10 16:56:56.000000000 -0700
+@@ -519,10 +519,6 @@
+     }
+   }
+ 
+-  /* reset stdin/stdout to binary mode under Windows */
+-  setmode(0,O_BINARY);
+-  setmode(1,O_BINARY);
+-
+   /* if --keyref given, check encryption keys against named file */
+   if (cmd.keyref && (cmd.mode == ENCRYPT || cmd.mode == KEYCHANGE)) {
+     f = fopen(cmd.keyref, "rb");
diff --git a/security/ccrypt/files/patch-src-platform.h b/security/ccrypt/files/patch-src-platform.h
new file mode 100644
index 000000000000..157bd95022d7
--- /dev/null
+++ b/security/ccrypt/files/patch-src-platform.h
@@ -0,0 +1,12 @@
+--- src/platform.h.orig	2009-06-05 07:39:49.000000000 -0700
++++ src/platform.h	2009-06-10 17:18:40.000000000 -0700
+@@ -78,9 +78,6 @@
+ 
+ #else /* on a POSIX system, map these to no-ops */
+ 
+-static inline void setmode(int fd, int mode) {
+-  return;
+-}
+ #ifndef O_BINARY
+ #define O_BINARY 0
+ #endif /* O_BINARY */