head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.42 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.40 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.38 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.36 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.34 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.32 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.30 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.28 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.26 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.24 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.22 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.20 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.18 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.16 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.14 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.12 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.10 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.8 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.6 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.4 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2005.03.24.02.53.34; author jlam; state dead; branches; next 1.3; 1.3 date 2000.07.29.03.12.20; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.01.17.16.02.34; author jlam; state Exp; branches; next 1.1; 1.1 date 99.10.11.05.48.25; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.10.11.05.48.25; author jlam; state Exp; branches; next ; desc @@ 1.4 log @SpeakFreely is officially "abandonware" since January 14, 2004. Since this package hasn't built in quite a while, remove it from pkgsrc. @ text @$NetBSD: patch-ad,v 1.3 2000/07/29 03:12:20 jlam Exp $ --- mike.c.orig Tue Jun 13 14:13:04 2000 +++ mike.c Fri Jul 28 22:57:32 2000 @@@@ -23,8 +23,10 @@@@ char deskey[9]; /* Destination DES key, if any */ char rtpdeskey[9]; /* Destination RTP DES key, if any */ char vatdeskey[9]; /* Destination VAT DES key, if any */ +#ifdef USE_IDEA char ideakey[17]; /* Destination IDEA key, if any */ char pgpkey[17]; /* Destination PGP key, if any */ +#endif char blowfish_spec; /* Nonzero if Blowfish key specified */ #ifdef CRYPTO BF_KEY blowfishkey; /* Destination Blowfish key, if any */ @@@@ -84,8 +86,10 @@@@ static char curkey[9] = ""; /* Current DES key if curkey[0] != 0 */ static char currtpkey[9] = ""; /* Current RTP DES key if currtpkey[0] != 0 */ static char curvatkey[9] = ""; /* Current VAT DES key if currtpkey[0] != 0 */ +#ifdef USE_IDEA static char curideakey[17] = ""; /* Current IDEA key if curideakey[0] != 0 */ static char curpgpkey[17] = ""; /* Current PGP key if curpgpkey[0] != 0 */ +#endif static char curblowfish_spec = FALSE; /* Nonzero if Blowfish key specified */ #ifdef CRYPTO static BF_KEY curblowfishkey; /* Blowfish key */ @@@@ -429,8 +433,10 @@@@ bcopy(curkey, d->deskey, 9); bcopy(currtpkey, d->rtpdeskey, 9); bcopy(curvatkey, d->vatdeskey, 9); +#ifdef USE_IDEA bcopy(curideakey, d->ideakey, 17); bcopy(curpgpkey, d->pgpkey, 17); +#endif d->blowfish_spec = curblowfish_spec; #ifdef CRYPTO bcopy(&curblowfishkey, &(d->blowfishkey), sizeof(BF_KEY)); @@@@ -599,8 +605,12 @@@@ #endif #ifdef CRYPTO +#ifdef USE_IDEA if (d->deskey[0] || d->ideakey[0] || d->blowfish_spec || d->pgpkey[0] || d->otp != NULL) { +#else + if (d->deskey[0] || d->blowfish_spec || d->otp != NULL) { +#endif soundbuf ebuf; int i; LONG slen, plen = 0; @@@@ -677,6 +687,7 @@@@ } } +#ifdef USE_IDEA /* IDEA encryption. */ if (d->ideakey[0]) { @@@@ -699,6 +710,7 @@@@ close_idea(); ebuf.compression |= fEncIDEA; } +#endif /* Blowfish encryption. */ @@@@ -723,6 +735,7 @@@@ ebuf.compression |= fEncBF; } +#ifdef USE_IDEA /* PGP encryption. */ if (d->pgpkey[0]) { @@@@ -745,6 +758,7 @@@@ close_idea(); ebuf.compression |= fEncPGP; } +#endif /* Key file encryption. */ @@@@ -1593,7 +1607,7 @@@@ MD5Init(&md5c); MD5Update(&md5c, s, strlen(s)); MD5Final(md5key1, &md5c); -#ifdef CRYPTO +#if defined(CRYPTO) && defined(USE_IDEA) init_idearand(md5key, md5key1, time(NULL)); #define nextrand idearand() #else @@@@ -1617,7 +1631,7 @@@@ key[j] = nextrand; } } -#ifdef CRYPTO +#if defined(CRYPTO) && defined(USE_IDEA) close_idearand(); #endif #undef nextrand @@@@ -1657,7 +1671,9 @@@@ V fprintf(stderr, " -F ADPCM compression\n"); V fprintf(stderr, " -G Automatic gain control\n"); #ifdef CRYPTO +#ifdef USE_IDEA V fprintf(stderr, " -Ikey IDEA encrypt with key\n"); +#endif V fprintf(stderr, " -Kkey DES encrypt with key\n"); #endif V fprintf(stderr, " -L Remote loopback\n"); @@@@ -1684,7 +1700,7 @@@@ #ifdef AUDIO_DEVICE_FILE V fprintf(stderr, " -Yindev[:ctldev] Override default audio device file name or specify open #fd\n"); #endif -#ifdef CRYPTO +#if defined(CRYPTO) && defined(USE_IDEA) V fprintf(stderr, " -Z\"user..\" Send PGP session key for user(s)\n"); #endif V fprintf(stderr, "\n"); @@@@ -1877,6 +1893,7 @@@@ break; #ifdef CRYPTO +#ifdef USE_IDEA case 'I': /* -Ikey -- Set IDEA key */ if (strlen(op + 1) == 0) { curideakey[0] = FALSE; @@@@ -1894,6 +1911,7 @@@@ } } break; +#endif case 'K': /* -Kkey -- Set DES key */ desinit(1); /* Initialise the DES library */ @@@@ -2107,6 +2125,7 @@@@ #endif #ifdef CRYPTO +#ifdef USE_IDEA case 'Z': /* -Z"user1 user2..." -- Send PGP encrypted session key to named users */ @@@@ -2196,6 +2215,7 @@@@ } break; #endif +#endif } } else { @@@@ -2207,10 +2227,15 @@@@ } if (rtp || vat) { -#ifdef CRYPTO +#if defined(CRYPTO) && defined(USE_IDEA) if (curideakey[0] || curpgpkey[0] || curblowfish_spec || curotp != NULL) { fprintf(stderr, "Blowfish, IDEA, PGP, and Key File encryption cannot be used\n with -RTP or -VAT protocols.\n"); + return 2; + } +#else + if (curblowfish_spec || curotp != NULL) { + fprintf(stderr, "Blowfish and Key File encryption cannot be used\n with -RTP or -VAT protocols.\n"); return 2; } #endif @ 1.3 log @Update speakfreely to 7.2. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Merge net/speakfreely and net/speakfreely-crypto. Allow building without using patented IDEA algorithm. Uses two new make variables which may be defined in mk.conf: USE_CRYPTO: YES, NO USE_IDEA: YES, NO Defaults to building with crypto but without IDEA. @ text @d3 2 a4 2 --- mike.c.orig Tue Sep 14 09:27:51 1999 +++ mike.c Sat Jan 15 12:52:38 2000 d16 1 a16 1 @@@@ -87,8 +89,10 @@@@ d27 1 a27 1 @@@@ -485,8 +489,10 @@@@ d38 1 a38 1 @@@@ -655,8 +661,12 @@@@ d51 1 a51 1 @@@@ -733,6 +743,7 @@@@ d59 1 a59 1 @@@@ -755,6 +766,7 @@@@ d67 1 a67 1 @@@@ -779,6 +791,7 @@@@ d75 1 a75 1 @@@@ -801,6 +814,7 @@@@ d83 1 a83 1 @@@@ -1659,7 +1673,7 @@@@ d92 1 a92 1 @@@@ -1683,7 +1697,7 @@@@ d101 1 a101 1 @@@@ -1723,7 +1737,9 @@@@ d111 1 a111 1 @@@@ -1753,7 +1769,7 @@@@ d120 1 a120 1 @@@@ -1946,6 +1962,7 @@@@ d128 1 a128 1 @@@@ -1963,6 +1980,7 @@@@ d136 1 a136 1 @@@@ -2181,6 +2199,7 @@@@ d144 1 a144 1 @@@@ -2270,6 +2289,7 @@@@ d152 1 a152 1 @@@@ -2281,10 +2301,15 @@@@ @ 1.1 log @Initial revision @ text @d3 88 a90 3 --- soundbyte.c.orig Tue Sep 14 08:55:17 1999 +++ soundbyte.c Mon Oct 11 01:38:35 1999 @@@@ -27,9 +27,11 @@@@ d92 26 a117 1 #include d119 49 a167 8 -#else /* FreeBSD / Linux */ +#else /* NetBSD / FreeBSD / Linux */ #ifdef LINUX #include +#elif defined(__NetBSD__) +#include #else #include @ 1.1.1.1 log @Initial import of speakfreely-7.1, an Internet phone for UN*X. * Converted to use gsm package and NetBSD's md5 routines. @ text @@