diff options
author | taca <taca> | 2005-01-30 04:41:16 +0000 |
---|---|---|
committer | taca <taca> | 2005-01-30 04:41:16 +0000 |
commit | 6ccfac3c5551582846569b83d01f36e81703bb93 (patch) | |
tree | 711a1e45cba4b9bab023acaee5534cc78bc7d70e /mail/qpopper | |
parent | 0cf9f0894ef2ea8017b10ab7ffd85ea3a0a3e037 (diff) | |
download | pkgsrc-6ccfac3c5551582846569b83d01f36e81703bb93.tar.gz |
Update qpopper package to 4.0.5nb7.
- Explicitly add "--disable-ipv6" when inet6 is disabled.
- Fix compile error when inet6 is disabled. This should fix PR pkg/28805.
Diffstat (limited to 'mail/qpopper')
-rw-r--r-- | mail/qpopper/Makefile | 4 | ||||
-rw-r--r-- | mail/qpopper/distinfo | 4 | ||||
-rw-r--r-- | mail/qpopper/options.mk | 4 | ||||
-rw-r--r-- | mail/qpopper/patches/patch-ap | 58 |
4 files changed, 57 insertions, 13 deletions
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 5c74180e2a8..e59ced053ef 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2004/12/28 02:47:45 reed Exp $ +# $NetBSD: Makefile,v 1.47 2005/01/30 04:41:16 taca Exp $ # DISTNAME= qpopper${VERSION} PKGNAME= qpopper-${VERSION} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= mail MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo index 08163e9b879..a00a7766641 100644 --- a/mail/qpopper/distinfo +++ b/mail/qpopper/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2004/05/06 13:46:23 taca Exp $ +$NetBSD: distinfo,v 1.10 2005/01/30 04:41:16 taca Exp $ SHA1 (qpopper4.0.5.tar.gz) = 726d40da2210bf4b82541a28971986e6a3d9e1a5 Size (qpopper4.0.5.tar.gz) = 2281284 bytes @@ -12,4 +12,4 @@ SHA1 (patch-al) = 63fdc28b9c1d292d55464cda13c529ffb2a47b34 SHA1 (patch-am) = 145c5d5ca8bdf59d5ee9cdaed0f60b2da814d033 SHA1 (patch-an) = 43e7c20b9c3cfd978255748236efbcbaf2f929ce SHA1 (patch-ao) = 0edffdd0b548e2fd83d946225e32aeab0a1c99c2 -SHA1 (patch-ap) = 6547b0f7ee5cfb0eb43015e51b4bf3a4ac8d3c0d +SHA1 (patch-ap) = e68fdccaea642c52dff60f5db59aecbb3084645d diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk index cc90b1a7cd6..3e442c5ec1c 100644 --- a/mail/qpopper/options.mk +++ b/mail/qpopper/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/01/10 20:59:43 adrianp Exp $ +# $NetBSD: options.mk,v 1.3 2005/01/30 04:41:16 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qpopper PKG_SUPPORTED_OPTIONS= inet6 ssl @@ -18,4 +18,6 @@ CONFIGURE_ARGS+= --without-ssl .if !empty(PKG_OPTIONS:Minet6) CONFIGURE_ENV+= O_DEFS="${O_DEFS}" CFLAGS="-DINET6" +.else +CONFIGURE_ARGS+= --disable-ipv6 .endif diff --git a/mail/qpopper/patches/patch-ap b/mail/qpopper/patches/patch-ap index db06165533c..3390c6be829 100644 --- a/mail/qpopper/patches/patch-ap +++ b/mail/qpopper/patches/patch-ap @@ -1,8 +1,18 @@ -$NetBSD: patch-ap,v 1.1 2004/05/06 13:46:23 taca Exp $ +$NetBSD: patch-ap,v 1.2 2005/01/30 04:41:16 taca Exp $ ---- popper/main.c.orig Fri Apr 23 18:39:01 2004 +--- popper/main.c.orig 2005-01-30 13:05:52.000000000 +0900 +++ popper/main.c -@@ -236,6 +236,7 @@ main ( int argc, char *argv[] ) +@@ -226,7 +226,8 @@ main ( int argc, char *argv[] ) + #else + struct sockaddr_in cli_addr; + struct sockaddr_in serv_addr; +- unsigned short port = SERV_TCP_PORT; ++ unsigned short hport = SERV_TCP_PORT; ++ unsigned short port; + unsigned long addr = INADDR_ANY; + int pollfd [ 1 ]; + #endif +@@ -236,6 +237,7 @@ main ( int argc, char *argv[] ) fd_set fdset_templ; fd_set fdset_read; int fd_flags = 0; @@ -10,20 +20,51 @@ $NetBSD: patch-ap,v 1.1 2004/05/06 13:46:23 taca Exp $ if ( argc >= 2 && ( strncmp ( argv[1], "-v", 2 ) == 0 || -@@ -636,7 +637,7 @@ main ( int argc, char *argv[] ) +@@ -256,7 +258,7 @@ main ( int argc, char *argv[] ) + * Ensure default port & address is in network order + */ + addr = htonl ( addr ); +- port = htons ( port ); ++ port = htons ( hport ); + #endif + + /* +@@ -290,8 +292,7 @@ main ( int argc, char *argv[] ) + { + #ifndef INET6 + unsigned long a = addr; +- unsigned short n = ntohs ( port ); +- unsigned short n = port; ++ int n = hport; + char b [ 25 ] = ""; + #endif + char *q = b; +@@ -349,7 +350,8 @@ main ( int argc, char *argv[] ) + if ( a == BAD_ADDR || n == 0 || n > USHRT_MAX ) + err_dump ( HERE, "invalid address and/or port: \"%s\"", argv[1] ); + +- port = htons ( n ); ++ hport = n; ++ port = htons ( hport ); + addr = a; + #endif + +@@ -636,7 +638,10 @@ main ( int argc, char *argv[] ) TRACE ( trace_file, POP_DEBUG, HERE, "listening using socket fd %d", sockfd ); - listen ( sockfd, 5 ); ++#ifndef SOMAXCONN ++#define SOMAXCONN 5 ++#endif + listen ( sockfd, SOMAXCONN ); /* * Set file descriptor to be non-blocking in case there isn't really a -@@ -761,6 +762,16 @@ main ( int argc, char *argv[] ) - +@@ -762,6 +767,16 @@ main ( int argc, char *argv[] ) signal ( SIGHUP, VOIDSTAR hupit ); signal ( SIGTERM, VOIDSTAR cleanup ); -+ + +#ifndef PIDFILE +#define PIDFILE "/var/run/qpopper.pid" +#endif @@ -33,6 +74,7 @@ $NetBSD: patch-ap,v 1.1 2004/05/06 13:46:23 taca Exp $ + } + fprintf(fp, "%d\n", getpid()); + fclose(fp); - ++ while ( TRUE ) { + if ( bClean ) |