head 1.4; access; symbols pkgsrc-2014Q4:1.3.0.26 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.24 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.22 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.20 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.18 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.16 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.14 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.12 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.1.0.18 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.16 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.14 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.12 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.10 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.8 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.6 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.4 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.2 pkgsrc-2009Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2015.01.04.12.02.21; author joerg; state dead; branches; next 1.3; commitid 1pG9ZixND9xpAH4y; 1.3 date 2011.11.28.19.42.39; author marino; state Exp; branches; next 1.2; 1.2 date 2011.10.08.06.17.40; author dholland; state Exp; branches; next 1.1; 1.1 date 2009.09.23.13.31.32; author tnn; state Exp; branches 1.1.18.1; next ; 1.1.18.1 date 2011.10.08.20.32.16; author tron; state Exp; branches; next ; desc @@ 1.4 log @Retire tzc, zephy and zephyr-mode, the last krb4 users in pkgsrc. Can be revived as krb5 versions later. @ text @$NetBSD: patch-an,v 1.3 2011/11/28 19:42:39 marino Exp $ - check for hes_getmailhost before using it - avoid conflict with POSIX getline --- clients/zmailnotify/zmailnotify.c.orig 1997-10-25 21:47:11.000000000 +0000 +++ clients/zmailnotify/zmailnotify.c @@@@ -72,7 +72,7 @@@@ main(argc, argv) int i,nbytes,retval,uselock; struct passwd *pwd; struct _mail mymail; -#ifdef HAVE_HESIOD +#ifdef HAVE_HES_GETMAILHOST struct hes_postoffice *p; #endif @@@@ -104,7 +104,7 @@@@ main(argc, argv) (void) sprintf(lockfile,"%s/.maillock",dir); host = (char *)getenv("MAILHOST"); -#ifdef HAVE_HESIOD +#ifdef HAVE_HES_GETMAILHOST if (host == NULL) { p = hes_getmailhost(user); if (p != NULL && strcmp(p->po_type, "POP") == 0) @@@@ -144,7 +144,7 @@@@ main(argc, argv) exit(1); } - if ((getline(response, sizeof response, sfi) != OK) || + if ((get_line(response, sizeof response, sfi) != OK) || (*response != '+')) { fprintf(stderr,"%s: %s\n",prog,response); exit(1); @@@@ -460,7 +460,12 @@@@ char *host; strcpy(host_save, hp->h_name); rem = krb_sendauth(authopts, s, ticket, "pop", host_save, (char *)0, 0, (MSG_DAT *) 0, (CREDENTIALS *) 0, - (bit_64 *) 0, (struct sockaddr_in *)0, +#if defined(__DragonFly__) || defined (__FreeBSD__) + (DES_key_schedule) {0}, +#else + (bit_64 *) 0, +#endif + (struct sockaddr_in *)0, (struct sockaddr_in *)0,"ZMAIL0.0"); free(host_save); free(ticket); @@@@ -498,7 +503,7 @@@@ pop_command(fmt, va_alist) if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK); - if (getline(buf, sizeof buf, sfi) != OK) { + if (get_line(buf, sizeof buf, sfi) != OK) { (void) strcpy(Errmsg, buf); return(NOTOK); } @@@@ -519,7 +524,7 @@@@ int *nmsgs, *nbytes; if (putline("STAT", Errmsg, sfo) == NOTOK) return(NOTOK); - if (getline(buf, sizeof buf, sfi) != OK) { + if (get_line(buf, sizeof buf, sfi) != OK) { (void) strcpy(Errmsg, buf); return(NOTOK); } @@@@ -546,7 +551,7 @@@@ int (*action)(); #endif if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK); - if (getline(buf, sizeof buf, sfi) != OK) { + if (get_line(buf, sizeof buf, sfi) != OK) { (void) strcpy(Errmsg, buf); return(NOTOK); } @@@@ -565,7 +570,7 @@@@ int (*action)(); } } -getline(buf, n, f) +get_line(buf, n, f) char *buf; register int n; FILE *f; @@@@ -595,7 +600,7 @@@@ char *buf; register int n; FILE *f; { - if (getline(buf, n, f) != OK) return (NOTOK); + if (get_line(buf, n, f) != OK) return (NOTOK); if (*buf == '.') { if (*(buf+1) == '\0') { return (DONE); @@@@ -605,7 +610,7 @@@@ FILE *f; } else if (*buf == '\0') { /* suck up all future lines, since this is after all only for headers */ while(! ((buf[0]=='.') && (buf[1] == '\0')) ) { - if (getline(buf, n, f) != OK) return (NOTOK); + if (get_line(buf, n, f) != OK) return (NOTOK); } return DONE; } @ 1.3 log @chat/zephyr: Add DragonFly and FreeBSD support DragonFly and FreeBSD don't build libdes with Kerberos IV, and at least DragonFly doesn't have heriod support. Sed substition within the Makefile was required due to requirements conflicts between platforms. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Check for hes_getmailhost before trying to call it. It's not in the libc hesiod, and it looks as if it's a deprecated feature. This in turn will make the mail notify tool not understand Hesiod mailserver records on NetBSD and probably anyone else with a builtin hesiod. If anyone really really wants that functionality, set PREFER.hesiod=pkgsrc and let it build and link to the pkgsrc hesiod library... Fixes the build of zephyr. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2009/09/23 13:31:32 tnn Exp $ d35 15 a49 1 @@@@ -498,7 +498,7 @@@@ pop_command(fmt, va_alist) d58 1 a58 1 @@@@ -519,7 +519,7 @@@@ int *nmsgs, *nbytes; d67 1 a67 1 @@@@ -546,7 +546,7 @@@@ int (*action)(); d76 1 a76 1 @@@@ -565,7 +565,7 @@@@ int (*action)(); d85 1 a85 1 @@@@ -595,7 +595,7 @@@@ char *buf; d94 1 a94 1 @@@@ -605,7 +605,7 @@@@ FILE *f; @ 1.1 log @- rename conflicting getline() - honour PKGMANDIR @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 1 --- clients/zmailnotify/zmailnotify.c.orig 1997-10-25 23:47:11.000000000 +0200 d8 18 @ 1.1.18.1 log @Pullup ticket #3537 - requested by dholland chat/zephyr: build fix Revisions pulled up: - chat/zephyr/distinfo 1.7-1.8 - chat/zephyr/patches/patch-acconfig_h 1.1 - chat/zephyr/patches/patch-aclocal_m4 1.1 - chat/zephyr/patches/patch-an 1.2 - chat/zephyr/patches/patch-configure 1.1-1.2 - chat/zephyr/patches/patch-configure_in 1.1 - net/hesiod/Makefile 1.12 - net/hesiod/builtin.mk 1.1 --- Module Name: pkgsrc Committed By: dholland Date: Thu Oct 6 08:48:00 UTC 2011 Modified Files: pkgsrc/net/hesiod: Makefile Added Files: pkgsrc/net/hesiod: builtin.mk Log Message: Add builtin handling for hesiod. Previously, this was setting PKG_SKIP_REASION if hesiod was builtin, which was causing dependent packages (all one of them, AFAICT) to fail in the bulk builds. Someone who knows more about builtin/buildlink stuff should probably review this, but to casual inspection at least it seems to work; plus it's not likely to make anything worse. --- Module Name: pkgsrc Committed By: dholland Date: Sat Oct 8 05:56:00 UTC 2011 Modified Files: pkgsrc/chat/zephyr: distinfo Added Files: pkgsrc/chat/zephyr/patches: patch-aclocal_m4 patch-configure Log Message: Fix configure script to cope with hesiod in libc as well as in -lhesiod. --- Module Name: pkgsrc Committed By: dholland Date: Sat Oct 8 06:17:40 UTC 2011 Modified Files: pkgsrc/chat/zephyr: distinfo pkgsrc/chat/zephyr/patches: patch-an patch-configure Added Files: pkgsrc/chat/zephyr/patches: patch-acconfig_h patch-configure_in Log Message: Check for hes_getmailhost before trying to call it. It's not in the libc hesiod, and it looks as if it's a deprecated feature. This in turn will make the mail notify tool not understand Hesiod mailserver records on NetBSD and probably anyone else with a builtin hesiod. If anyone really really wants that functionality, set PREFER.hesiod=pkgsrc and let it build and link to the pkgsrc hesiod library... Fixes the build of zephyr. @ text @d3 1 a3 4 - check for hes_getmailhost before using it - avoid conflict with POSIX getline --- clients/zmailnotify/zmailnotify.c.orig 1997-10-25 21:47:11.000000000 +0000 a4 18 @@@@ -72,7 +72,7 @@@@ main(argc, argv) int i,nbytes,retval,uselock; struct passwd *pwd; struct _mail mymail; -#ifdef HAVE_HESIOD +#ifdef HAVE_HES_GETMAILHOST struct hes_postoffice *p; #endif @@@@ -104,7 +104,7 @@@@ main(argc, argv) (void) sprintf(lockfile,"%s/.maillock",dir); host = (char *)getenv("MAILHOST"); -#ifdef HAVE_HESIOD +#ifdef HAVE_HES_GETMAILHOST if (host == NULL) { p = hes_getmailhost(user); if (p != NULL && strcmp(p->po_type, "POP") == 0) @