Hi ports,
I got a mail from Peter Selinger (ccrypt's author) with a tiny patch
that avoids using the bundled getopt library.
Testing (macppc and amd64):
- 'make test' passes
- It survives my heavy use of it ;)
Any comments/feedback?
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/ccrypt/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 28 Aug 2018 18:49:11 -0000 1.23
+++ Makefile 19 Dec 2018 17:08:21 -0000
@@ -3,6 +3,7 @@
COMMENT= encrypt and decrypt AES files and streams
V= 1.11
+REVISION= 0
DISTNAME= ccrypt-${V}
CATEGORIES= security
@@ -23,9 +24,6 @@ MODULES= textproc/intltool
LIB_DEPENDS= devel/gettext
CONFIGURE_STYLE= gnu
-# XXX We need to use the upstream provided getopt or tests fail. This
-# configuration option should be zapped as of v1.12 as it's fixed upstream.
-CONFIGURE_ARGS= --disable-emacs \
- --with-included-getopt
+CONFIGURE_ARGS= --disable-emacs
.include <bsd.port.mk>
Index: patches/patch-src_main_c
===================================================================
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_main_c 19 Dec 2018 17:08:21 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+Allows the use our getopt instead of the bundled one.
+From Peter Selinger (upstream author)
+Can be removed for ccrypt>=1.12
+
+Index: src/main.c
+--- src/main.c.orig
++++ src/main.c
+@@ -180,7 +180,7 @@ static struct option longopts[] = {
+ {0, 0, 0, 0}
+ };
+
+-static const char *shortopts = "edcxuhVLvqDfmE:K:k:F:H:S:sP:Q:tby:rRlT-";
++static const char *shortopts = "edcxuhVLvqDfmE:K:k:F:H:S:sP:Q:tby:rRlT";
+
+ static cmdline read_commandline(int ac, char *av[]) {
+ cmdline cmd;
