From owner-freebsd-current@FreeBSD.ORG Mon Sep 26 16:25:25 2011 Return-Path: Delivered-To: current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E21801065672; Mon, 26 Sep 2011 16:25:25 +0000 (UTC) (envelope-from owner-freebsd-stable@freebsd.org) Received: from core.impulsive.hu (core.impulsive.hu [79.172.194.2]) by mx1.freebsd.org (Postfix) with ESMTP id 2C47A8FC1D; Mon, 26 Sep 2011 16:25:24 +0000 (UTC) Received: by core.impulsive.hu (Postfix, from userid 143) id 155E0DC0BA; Mon, 26 Sep 2011 16:26:11 +0000 (UTC) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by core.impulsive.hu (Postfix) with ESMTP id 29DE9DC0B6 for ; Mon, 26 Sep 2011 16:26:08 +0000 (UTC) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 8ACB2178134; Mon, 26 Sep 2011 16:24:04 +0000 (UTC) Received: from hub.freebsd.org (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with ESMTP id 41CAA10657D3; Mon, 26 Sep 2011 16:24:02 +0000 (UTC) (envelope-from owner-freebsd-stable@freebsd.org) Delivered-To: stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EADAD106566B; Mon, 26 Sep 2011 16:23:47 +0000 (UTC) (envelope-from ume@mahoroba.org) Received: from mail.mahoroba.org (ent.mahoroba.org [IPv6:2001:2f0:104:8010::1]) by mx1.freebsd.org (Postfix) with ESMTP id 34C638FC14; Mon, 26 Sep 2011 16:23:47 +0000 (UTC) Received: from yuga.mahoroba.org (ume@yuga.mahoroba.org [IPv6:2001:2f0:104:8010:7258:12ff:fe22:d94b]) (user=ume mech=DIGEST-MD5 bits=0) by mail.mahoroba.org (8.14.5/8.14.5) with ESMTP/inet6 id p8QGNW85077217 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Sep 2011 01:23:40 +0900 (JST) (envelope-from ume@mahoroba.org) Date: Tue, 27 Sep 2011 01:23:32 +0900 Message-ID: From: Hajimu UMEMOTO To: Andrey Chernov , gshapiro@FreeBSD.org In-Reply-To: <20110926115801.GA92276@vniz.net> References: <20110926115801.GA92276@vniz.net> User-Agent: xcite1.60> Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29qGyQoRCtXGyhC?=) APEL/10.8 Emacs/23.3 (i386-portbld-freebsd8.2) MULE/6.0 (HANACHIRUSATO) X-Operating-System: FreeBSD 8.2-STABLE X-PGP-Key: http://www.imasy.or.jp/~ume/publickey.asc X-PGP-Fingerprint: 1F00 0B9E 2164 70FC 6DC5 BF5F 04E9 F086 BF90 71FE Organization: Internet Mutual Aid Society, YOKOHAMA MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/mixed; boundary="Multipart_Tue_Sep_27_01:23:32_2011-1" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.mahoroba.org [IPv6:2001:2f0:104:8010::1]); Tue, 27 Sep 2011 01:23:40 +0900 (JST) X-Virus-Scanned: clamav-milter 0.97.2 at asuka.mahoroba.org X-Virus-Status: Clean X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on asuka.mahoroba.org X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Sender: owner-freebsd-stable@freebsd.org Errors-To: owner-freebsd-stable@freebsd.org Cc: stable@FreeBSD.org, current@FreeBSD.org Subject: Re: System sendmail build fails with updated cyrus-sasl2 port X-BeenThere: freebsd-current@freebsd.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Sep 2011 16:25:26 -0000 --Multipart_Tue_Sep_27_01:23:32_2011-1 Content-Type: text/plain; charset=US-ASCII Hi, >>>>> On Mon, 26 Sep 2011 15:58:03 +0400 >>>>> Andrey Chernov said: ache> This is for 9 BETA2 or 10-CURRENT. ache> Please fix it on either side. Apparently minor types mismatch within ache> sasl_callback_t type. ache> cc -O2 -pipe -march=pentium4 ache> -I/usr/src/usr.sbin/sendmail/../../contrib/sendmail/src ache> -I/usr/src/usr.sbin/sendmail/../../contrib/sendmail/include -I. -DNEWDB ache> -DTCPWRAPPERS -DMAP_REGEX -DDNSMAP -DNETINET6 -DSTARTTLS -D_FFR_TLS_1 ache> -I/usr/local/include -DSASL=2 -std=gnu99 -fstack-protector ache> -Wsystem-headers -Werror -Wno-pointer-sign -c ache> /usr/src/usr.sbin/sendmail/../../contrib/sendmail/src/main.c ache> cc1: warnings being treated as errors ache> /usr/src/usr.sbin/sendmail/../../contrib/sendmail/src/main.c:112: warning: ache> initialization from incompatible pointer type ache> /usr/src/usr.sbin/sendmail/../../contrib/sendmail/src/main.c:113: warning: ache> initialization from incompatible pointer type ache> *** Error code 1 It seems 2.1.25 requires to cast to sasl_callback_ft. How about the attached patch? --Multipart_Tue_Sep_27_01:23:32_2011-1 Content-Type: text/x-patch; type=patch; charset=US-ASCII Content-Disposition: attachment; filename="sendmail-sasl-2.1.25.diff" Content-Transfer-Encoding: 7bit Index: contrib/sendmail/src/main.c diff -u -p contrib/sendmail/src/main.c.orig contrib/sendmail/src/main.c --- contrib/sendmail/src/main.c.orig 2011-06-22 13:00:26.000000000 +0900 +++ contrib/sendmail/src/main.c 2011-09-27 00:32:34.000000000 +0900 @@ -109,8 +109,8 @@ GIDSET_T InitialGidSet[NGROUPS_MAX]; #if SASL static sasl_callback_t srvcallbacks[] = { - { SASL_CB_VERIFYFILE, &safesaslfile, NULL }, - { SASL_CB_PROXY_POLICY, &proxy_policy, NULL }, + { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile, NULL }, + { SASL_CB_PROXY_POLICY, (sasl_callback_ft)&proxy_policy, NULL }, { SASL_CB_LIST_END, NULL, NULL } }; #endif /* SASL */ Index: contrib/sendmail/src/sendmail.h diff -u contrib/sendmail/src/sendmail.h.orig contrib/sendmail/src/sendmail.h --- contrib/sendmail/src/sendmail.h.orig 2011-06-22 13:00:27.000000000 +0900 +++ contrib/sendmail/src/sendmail.h 2011-09-27 00:57:43.000000000 +0900 @@ -133,10 +133,15 @@ # if SASL == 2 || SASL >= 20000 # include +# include # include +# if SASL_VERSION_FULL < 0x020119 +typedef int (*sasl_callback_ft)(void); +# endif # else /* SASL == 2 || SASL >= 20000 */ # include # include +typedef int (*sasl_callback_ft)(void); # endif /* SASL == 2 || SASL >= 20000 */ # if defined(SASL_VERSION_MAJOR) && defined(SASL_VERSION_MINOR) && defined(SASL_VERSION_STEP) # define SASL_VERSION (SASL_VERSION_MAJOR * 10000) + (SASL_VERSION_MINOR * 100) + SASL_VERSION_STEP Index: contrib/sendmail/src/usersmtp.c diff -u -p contrib/sendmail/src/usersmtp.c.orig contrib/sendmail/src/usersmtp.c --- contrib/sendmail/src/usersmtp.c.orig 2011-09-27 00:51:44.000000000 +0900 +++ contrib/sendmail/src/usersmtp.c 2011-09-27 00:51:52.000000000 +0900 @@ -524,15 +524,15 @@ static int attemptauth __P((MAILER *, MC static sasl_callback_t callbacks[] = { - { SASL_CB_GETREALM, &saslgetrealm, NULL }, + { SASL_CB_GETREALM, (sasl_callback_ft)&saslgetrealm, NULL }, #define CB_GETREALM_IDX 0 - { SASL_CB_PASS, &getsecret, NULL }, + { SASL_CB_PASS, (sasl_callback_ft)&getsecret, NULL }, #define CB_PASS_IDX 1 - { SASL_CB_USER, &getsimple, NULL }, + { SASL_CB_USER, (sasl_callback_ft)&getsimple, NULL }, #define CB_USER_IDX 2 - { SASL_CB_AUTHNAME, &getsimple, NULL }, + { SASL_CB_AUTHNAME, (sasl_callback_ft)&getsimple, NULL }, #define CB_AUTHNAME_IDX 3 - { SASL_CB_VERIFYFILE, &safesaslfile, NULL }, + { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile, NULL }, #define CB_SAFESASL_IDX 4 { SASL_CB_LIST_END, NULL, NULL } }; --Multipart_Tue_Sep_27_01:23:32_2011-1 Content-Type: text/plain; charset=US-ASCII -- Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan ume@mahoroba.org ume@{,jp.}FreeBSD.org http://www.imasy.org/~ume/ --Multipart_Tue_Sep_27_01:23:32_2011-1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" --Multipart_Tue_Sep_27_01:23:32_2011-1--