The dependency in question has a package name base of "netcat", not "nc". The attached patch allows the port to build again. Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->mi mi@aldan.algebra.com => mi@ (via the GNATS Auto Assign Tool)
Maintainer of security/sst, Please note that PR ports/179752 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179752 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Thanks, John. Could you test, if sst works just as well with our /usr/bin/nc? Then the dependency can be dropped altogether... -mi
On 6/20/2013 14:26, Mikhail T. wrote: > Thanks, John. Could you test, if sst works just as well with our > /usr/bin/nc? Then the dependency can be dropped altogether... Hi Mikhail, Unfortunately DragonFly doesn't have /usr/bin/nc, so I can't test it without redports. That's also a reason to keep the dependency, but if it's removed I can always add it to Makefile.DragonFly in dports. So I'd prefer to leave it as I proposed but I can work around it if it's removed. Thanks, John
Ok, then, how about the attached logic?
On 6/20/2013 14:59, Mikhail T. wrote: > Ok, then, how about the attached logic? looks solid to me.
Author: mi Date: Fri Jun 21 03:10:20 2013 New Revision: 321436 URL: http://svnweb.freebsd.org/changeset/ports/321436 Log: Only depend on net/netcat, when /usr/bin/netcat is not uvailable (either because the present FreeBSD is too old, or because we are building on, say, DragonFlyBSD). Fix up most compiler warnings, while I'm here. Bump PORTREVISION. PR: ports/179752 Submitted by: John Marino Modified: head/security/sst/Makefile head/security/sst/files/Makefile head/security/sst/files/patch-sst.c Modified: head/security/sst/Makefile ============================================================================== --- head/security/sst/Makefile Fri Jun 21 01:42:57 2013 (r321435) +++ head/security/sst/Makefile Fri Jun 21 03:10:20 2013 (r321436) @@ -7,6 +7,7 @@ PORTNAME= sst PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://utcc.utoronto.ca/~pkern/stuff/sst/ DISTNAME= ${PORTNAME} @@ -14,7 +15,9 @@ DISTNAME= ${PORTNAME} MAINTAINER= mi@aldan.algebra.com COMMENT= A simple SSL tunneling tool (uses netcat) -RUN_DEPENDS= nc:${PORTSDIR}/net/netcat +.if !exists(/usr/bin/nc) +RUN_DEPENDS= netcat:${PORTSDIR}/net/netcat +.endif USE_OPENSSL= YES MAN1= sst.1 Modified: head/security/sst/files/Makefile ============================================================================== --- head/security/sst/files/Makefile Fri Jun 21 01:42:57 2013 (r321435) +++ head/security/sst/files/Makefile Fri Jun 21 03:10:20 2013 (r321436) @@ -6,8 +6,12 @@ BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man CFLAGS+= -DCONFDIR='"${OPENSSLDIR}"' -DCERTF='"certs/sst.pem"' \ - -DNETCAT='"${PREFIX}/bin/nc"' -I${OPENSSLINC} - + -I${OPENSSLINC} +.if exists(/usr/bin/nc) +CFLAGS+= -DNETCAT='"/usr/bin/nc"' +.else +CFLAGS+= -DNETCAT='"${LOCALBASE}/bin/netcat"' +.endif LDADD+= -L${OPENSSLLIB} -lssl -lcrypto .include <bsd.prog.mk> Modified: head/security/sst/files/patch-sst.c ============================================================================== --- head/security/sst/files/patch-sst.c Fri Jun 21 01:42:57 2013 (r321435) +++ head/security/sst/files/patch-sst.c Fri Jun 21 03:10:20 2013 (r321436) @@ -1,7 +1,112 @@ ---- sst.c Thu May 4 14:47:28 2000 -+++ sst.c.new Sun Dec 31 04:49:43 2000 -@@ -609,8 +609,8 @@ - SHOW_info1("client cert subject: %s", subj); +--- sst.c 2000-05-04 15:47:28.000000000 -0400 ++++ sst.c 2013-06-20 08:55:27.000000000 -0400 +@@ -213,5 +213,5 @@ + */ + #ifndef lint +-static char rcsid[] = "$Header: /local/src/local.bin/sst/SRC/RCS/sst.c,v 1.12 2000/05/04 19:47:26 pkern Exp $"; ++static const char rcsid[] = "$Header: /local/src/local.bin/sst/SRC/RCS/sst.c,v 1.12 2000/05/04 19:47:26 pkern Exp $"; + #endif + +@@ -262,8 +262,8 @@ + int eofclnt = 0; + +-char *prog = "sst"; +-char *host = NULL; +-char *port = NULL; +-char *method = NULL; ++const char *prog = "sst"; ++const char *host = NULL; ++const char *port = NULL; ++const char *method = NULL; + + char certfbuf[MAXPATHLEN], ssldbuf[MAXPATHLEN]; +@@ -298,6 +298,6 @@ + * All rights reserved. + */ +-void +-ERR_log_errors() ++static void ++ERR_log_errors(void) + { + unsigned long l; +@@ -315,6 +315,6 @@ + } + +-void +-show_SSL_errors() ++static void ++show_SSL_errors(void) + { + if (logging) ERR_log_errors(); +@@ -322,4 +322,8 @@ + } + ++#ifndef __GNUC__ ++# define __attribute__(x) ++#endif ++ + #define SHOW_x(L,F,x) { \ + if (logging) syslog((L), "%s", (x)); \ +@@ -347,5 +351,5 @@ + + +-char *usageopts[] = { ++const char *usageopts[] = { + "", + " options:", +@@ -375,7 +379,8 @@ + }; + +-usage() ++static void ++usage(void) + { +- char **uop = usageopts; ++ const char **uop = usageopts; + + if (logging) { +@@ -390,6 +395,6 @@ + + /* reaper -- zombie prevention */ +-void +-reaper() ++static void ++reaper(int signal __attribute__((unused))) + { + int w; +@@ -415,4 +420,5 @@ + * - EOF on rd when in server mode means the actual server has finished. + */ ++static void + relay(ssl, sd, rd, wd) + SSL *ssl; +@@ -523,20 +529,12 @@ + + if (verbose) { +- if (sizeof(off_t) > 4) { +- SHOW_info1("bytes from ssl: %qd", nsr); +- SHOW_info1("bytes to ssl: %qd", nsw); +- SHOW_info1("bytes from local: %qd", nlr); +- SHOW_info1("bytes to local: %qd", nlw); +- } +- else { +- SHOW_info1("bytes from ssl: %ld", nsr); +- SHOW_info1("bytes to ssl: %ld", nsw); +- SHOW_info1("bytes from local: %ld", nlr); +- SHOW_info1("bytes to local: %ld", nlw); +- } ++ SHOW_info1("bytes from ssl: %qd", (long long int)nsr); ++ SHOW_info1("bytes to ssl: %qd", (long long int)nsw); ++ SHOW_info1("bytes from local: %qd", (long long int)nlr); ++ SHOW_info1("bytes to local: %qd", (long long int)nlw); + } + } + +- ++static void + srvr_prep(ctx, ssl, sd) + SSL_CTX **ctx; +@@ -610,6 +608,6 @@ SHOW_info1("client cert issuer: %s", issu); - Free(subj); @@ -10,9 +115,14 @@ + free(issu); /* - * XXX ... -@@ -699,8 +699,8 @@ - SHOW_info1("server cert subject: %s", subj); +@@ -625,5 +623,5 @@ + } + +- ++static void + clnt_prep(ctx, ssl, sd) + SSL_CTX **ctx; +@@ -700,6 +698,6 @@ SHOW_info1("server cert issuer: %s", issu); - Free(subj); @@ -21,4 +131,16 @@ + free(issu); /* - * XXX ... +@@ -714,5 +712,5 @@ + } + +- ++int + main(ac, av) + int ac; +@@ -757,5 +755,4 @@ + + if (errflg) { +-usage: + usage(); + exit(1); _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
This PR looks like it should be closed now, at least to me.
State Changed From-To: feedback->closed Fix confirmed