diff options
author | uebayasi <uebayasi@pkgsrc.org> | 2004-09-18 12:47:33 +0000 |
---|---|---|
committer | uebayasi <uebayasi@pkgsrc.org> | 2004-09-18 12:47:33 +0000 |
commit | 61ce658fb325f8266c811bb29329b6f881aac917 (patch) | |
tree | 488bfad0ccad392d33158b7f41881a733c127f74 /net/jftpgw | |
parent | c0b38da8083d26042128d5829d8fa05416969762 (diff) | |
download | pkgsrc-61ce658fb325f8266c811bb29329b6f881aac917.tar.gz |
Refer to IPL_NAME if IPL_NAT is not defined. This hopefully fixes
a build failure reported by build builds.
And while here, suppress GCC3 warnings by doing s/log()/xlog()/.
Diffstat (limited to 'net/jftpgw')
-rw-r--r-- | net/jftpgw/Makefile | 10 | ||||
-rw-r--r-- | net/jftpgw/distinfo | 3 | ||||
-rw-r--r-- | net/jftpgw/patches/patch-ab | 18 |
3 files changed, 29 insertions, 2 deletions
diff --git a/net/jftpgw/Makefile b/net/jftpgw/Makefile index 1de4353a078..1037449db25 100644 --- a/net/jftpgw/Makefile +++ b/net/jftpgw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/24 01:10:31 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/09/18 12:47:33 uebayasi Exp $ DISTNAME= jftpgw-0.13.4 CATEGORIES= net @@ -20,6 +20,14 @@ RCD_SCRIPTS= jftpgw EGDIR= ${PREFIX}/share/examples/jftpgw CONF_FILES= ${EGDIR}/jftpgw.conf ${PKG_SYSCONFDIR}/jftpgw.conf +SUBST_CLASSES+= log +SUBST_STAGE.log= post-patch +SUBST_FILES.log= active.c bindport.c cache.c cmds.c config.c \ + ftpread.c fw_auth_cmds.c jftpgw.c log.c log.h \ + login.c openport.c passive.c states.c std_cmds.c \ + util.c +SUBST_SED.log= -e "s,\([[:space:]]\)\(log(\),\1x\2," + SUBST_CLASSES+= config SUBST_STAGE.config= post-build SUBST_FILES.config= jftpgw.conf.sample diff --git a/net/jftpgw/distinfo b/net/jftpgw/distinfo index 1e8c9031a22..6f60438848b 100644 --- a/net/jftpgw/distinfo +++ b/net/jftpgw/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/02/23 01:32:33 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/09/18 12:47:33 uebayasi Exp $ SHA1 (jftpgw-0.13.4.tar.gz) = 9bc043bafc2be73b29a446429b76b58345ae55e8 Size (jftpgw-0.13.4.tar.gz) = 255160 bytes SHA1 (patch-aa) = 8af643cbdd2e6c4f620cd8f7a0d51419ce7f6769 +SHA1 (patch-ab) = 610cfa10d5282c5877f40529092c346db7d90078 diff --git a/net/jftpgw/patches/patch-ab b/net/jftpgw/patches/patch-ab new file mode 100644 index 00000000000..f6cbb88e745 --- /dev/null +++ b/net/jftpgw/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.1 2004/09/18 12:47:33 uebayasi Exp $ + +--- support/ipfilter.c.orig 2003-02-20 07:30:26.000000000 +0900 ++++ support/ipfilter.c +@@ -55,6 +55,13 @@ get_realdst(fd, laddrp, faddrp, np) + np->nl_outip = faddrp->sin_addr; + np->nl_flags = IPN_TCP; + ++#ifndef IPL_NAT ++# ifdef IPL_NAME ++# define IPL_NAT IPL_NAME ++# else ++# error Neither IPL_NAT nor IPL_NAME undefined ++# endif ++#endif + if ((natfd = open(IPL_NAT, O_RDONLY)) < 0) { + perror("open"); + return(0); |