From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 19 08:20:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FB091065675 for ; Tue, 19 Aug 2008 08:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7B2898FC1B for ; Tue, 19 Aug 2008 08:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7J8K2Xu037155 for ; Tue, 19 Aug 2008 08:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7J8K20P037154; Tue, 19 Aug 2008 08:20:02 GMT (envelope-from gnats) Resent-Date: Tue, 19 Aug 2008 08:20:02 GMT Resent-Message-Id: <200808190820.m7J8K20P037154@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63F4C1065677 for ; Tue, 19 Aug 2008 08:19:47 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id 6AE428FC18 for ; Tue, 19 Aug 2008 08:19:46 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU ([10.0.3.30]) by ns.ael.RU (8.14.2/8.14.2/Fluffy/5.2) with ESMTP id m7J8JXSa040850 for ; Tue, 19 Aug 2008 19:19:38 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.2/8.14.2/Fluffy/5.4) with ESMTP id m7J8JVQo047015 for ; Tue, 19 Aug 2008 19:19:31 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Message-Id: <1219133971.46681@Fluffy.Khv.RU> Date: Tue, 19 Aug 2008 19:19:31 +1100 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/126651: news/inn: update to 2.4.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 08:20:02 -0000 >Number: 126651 >Category: ports >Synopsis: news/inn: update to 2.4.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 19 08:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 8.0-800043-CURRENT i386 >Organization: >Environment: System: FreeBSD 8.0-800043-CURRENT #0: Sat Aug 16 19:27:03 VLAST 2008 root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: Update news/inn to latest release and unbroke Kerberos5/OpenSSL build >How-To-Repeat: >Fix: --- news::inn.diff begins here --- Index: news/inn/Makefile =================================================================== RCS file: /home/ncvs/ports/news/inn/Makefile,v retrieving revision 1.88 diff -u -r1.88 Makefile --- news/inn/Makefile 7 Oct 2007 05:45:00 -0000 1.88 +++ news/inn/Makefile 19 Aug 2008 08:11:15 -0000 @@ -6,8 +6,8 @@ # PORTNAME?= inn -PORTVERSION?= 2.4.3 -PORTREVISION?= 3 +PORTVERSION?= 2.4.5 +PORTREVISION?= 0 CATEGORIES= news ipv6 MASTER_SITES?= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR?= ${PORTNAME} @@ -33,6 +33,7 @@ TCL "Embedded TCL support" Off \ KERBEROS "Enable Kerberos auth support" Off \ SASL "Enable SASL support (for imapfeed auth)" Off \ + SSL "Enable OpenSSL support (for NNTP over SSL support)" Off \ TAGGED_HASH "Use tagged hash table for history" Off \ LARGE_FILES "Support for files larger than 2GB" Off \ KEYWORDS "Automatic keyword generation support" On \ @@ -58,32 +59,28 @@ .include .if defined(WITH_BERKELEYDB) -CONFIGURE_ARGS+= --with-berkeleydb -. if !defined(WITH_BDB_VER) -WITH_BDB_VER= 4 -. endif -. if (${WITH_BDB_VER} == 3) || (${WITH_BDB_VER} == 4) || (${WITH_BDB_VER} == 41) -LIB_DEPENDS+= db${WITH_BDB_VER}:${PORTSDIR}/databases/db${WITH_BDB_VER} -. elif ${WITH_BDB_VER} == 2 -BROKEN= Does not compile with db2 -. else -BROKEN= Unknown BerkeleyDB version -. endif -CONFIGURE_ENV+= DB_VER=db${WITH_BDB_VER} +USE_BDB=41+ +CONFIGURE_ENV+= DB_VER=db${BDB_VER} +CONFIGURE_ENV+= DB_LIB=${BDB_LIB_NAME} CONFIGURE_ARGS+= --with-berkeleydb=${LOCALBASE} .endif +.if defined(WITH_SSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} +.endif + .if defined(WITH_KERBEROS) . if exists(${LOCALBASE}/bin/krb5-config) LIB_DEPENDS+= gssapi_krb5:${PORTSDIR}/security/krb5 -CONFIGURE_ARGS+= --enable-kerberos=${LOCALBASE} +CONFIGURE_ARGS+= --with-kerberos=${LOCALBASE} . else -CONFIGURE_ARGS+= --enable-kerberos=/usr +CONFIGURE_ARGS+= --with-kerberos=/usr . endif -CONFIGURE_ENV+= ac_cv_search_krb5_parse_name="-lcrypt -lcrypto -lkrb5 -lasn1 -lroken" +CONFIGURE_ENV+= ac_cv_search_krb5_parse_name="-lcrypt -lcrypto -lkrb5 -lasn1 -lroken -lhx509" CONFIGURE_ENV+= ac_cv_func_krb5_init_ets=yes .else -CONFIGURE_ARGS+= --disable-kerberos +CONFIGURE_ARGS+= --without-kerberos .endif .if !defined(WITHOUT_PERL) @@ -98,8 +95,8 @@ .endif .if defined(WITH_TCL) +USE_TCL=84 CONFIGURE_ARGS+= --with-tcl=${LOCALBASE} -BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83 .endif .if defined(WITH_MAXSOCKET) @@ -199,8 +196,8 @@ @${REINPLACE_CMD} -E 's!\$$[{(]PATHETC[})]!${EXAMPLESDIR}!g' \ ${WRKSRC}/site/Makefile .if defined(WITH_TCL) - @${REINPLACE_CMD} -e 's!!!' ${WRKSRC}/innd/innd.h - @${REINPLACE_CMD} -e 's!-ltcl!-ltcl83!' \ + @${REINPLACE_CMD} -e 's!!!' ${WRKSRC}/innd/innd.h + @${REINPLACE_CMD} -e 's!-ltcl!-ltcl84!' \ ${WRKSRC}/configure .endif @${REINPLACE_CMD} -e 's!et/com_err\.h!com_err.h!g' \ Index: news/inn/distinfo =================================================================== RCS file: /home/ncvs/ports/news/inn/distinfo,v retrieving revision 1.22 diff -u -r1.22 distinfo --- news/inn/distinfo 7 May 2006 21:16:15 -0000 1.22 +++ news/inn/distinfo 18 Aug 2008 01:31:09 -0000 @@ -1,3 +1,3 @@ -MD5 (inn-2.4.3.tar.gz) = 6caa10909a7bf55fb91535685990aec9 -SHA256 (inn-2.4.3.tar.gz) = b69679ed4b79ed8384db50e43a09a7d52e4da51712235b912bcfae037e137bf2 -SIZE (inn-2.4.3.tar.gz) = 1871994 +MD5 (inn-2.4.5.tar.gz) = 07bc6530c5e296b0ee81a5d6ac4cd355 +SHA256 (inn-2.4.5.tar.gz) = 7d33c383fccb119ff2d474c35ad09ffb223822cce3575cb457eab8a2c4b1f23e +SIZE (inn-2.4.5.tar.gz) = 1908550 Index: news/inn/files/patch-configure =================================================================== RCS file: /home/ncvs/ports/news/inn/files/patch-configure,v retrieving revision 1.4 diff -u -r1.4 patch-configure --- news/inn/files/patch-configure 7 May 2006 21:16:16 -0000 1.4 +++ news/inn/files/patch-configure 18 Aug 2008 01:35:43 -0000 @@ -1,11 +1,11 @@ ---- configure.orig Mon Mar 20 04:14:57 2006 -+++ configure Sat May 6 02:32:58 2006 -@@ -7604,36 +7604,9 @@ +--- configure.orig 2008-06-30 04:56:57.000000000 +1100 ++++ configure 2008-08-18 12:35:35.000000000 +1100 +@@ -7535,36 +7535,9 @@ done done fi - if test x"$BERKELEY_DB_DIR" = xyes ; then -- for v in db43 db42 db41 db4 db3 db2 ; do +- for v in db46 db45 db44 db43 db42 db41 db4 db3 db2 ; do - if test -d "/usr/local/include/$v" ; then - BERKELEY_DB_LDFLAGS="-L/usr/local/lib" - BERKELEY_DB_CFLAGS="-I/usr/local/include/$v" @@ -15,7 +15,7 @@ - fi - done - if test x"$BERKELEY_DB_LIB" = x ; then -- for v in db43 db42 db41 db4 db3 db2 ; do +- for v in db44 db43 db42 db41 db4 db3 db2 ; do - if test -d "/usr/include/$v" ; then - BERKELEY_DB_CFLAGS="-I/usr/include/$v" - BERKELEY_DB_LIB="-l$v" @@ -29,13 +29,14 @@ - fi - fi - else - BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib" +- BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib" - BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include" - BERKELEY_DB_LIB="-ldb" - echo "$ac_t""$BERKELEY_DB_DIR" 1>&6 - fi -+ BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}" -+ BERKELEY_DB_LIB="-l${DB_VER}" ++ BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib" ++ BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}" ++ BERKELEY_DB_LIB="-l${DB_LIB}" cat >> confdefs.h <<\EOF #define USE_BERKELEY_DB 1 EOF Index: news/inn/files/patch-innfeed_endpoint.c =================================================================== RCS file: /home/ncvs/ports/news/inn/files/patch-innfeed_endpoint.c,v retrieving revision 1.1 diff -u -r1.1 patch-innfeed_endpoint.c --- news/inn/files/patch-innfeed_endpoint.c 26 Sep 2007 19:10:54 -0000 1.1 +++ news/inn/files/patch-innfeed_endpoint.c 18 Aug 2008 01:39:21 -0000 @@ -1,11 +0,0 @@ ---- innfeed/endpoint.c.orig Mon Mar 20 04:14:57 2006 -+++ innfeed/endpoint.c Wed Sep 26 20:02:26 2007 -@@ -1644,7 +1644,7 @@ - if (sigHandlers == NULL) - { - sigHandlers = xmalloc (sizeof(sigfn) * NSIG) ; -- sigFlags = xmalloc (sizeof(int) * NSIG) ; -+ sigFlags = xmalloc (sizeof(sig_atomic_t) * NSIG) ; - for (i = 0 ; i < NSIG ; i++) - { - sigHandlers [i] = NULL ; --- news::inn.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: