diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-10-26 14:18:45 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-10-26 14:18:45 +0000 |
commit | 7b2995475746146ca11ddc47fb0ffbcf9ffa3451 (patch) | |
tree | f3961be83f82593793076c1fbe6c4791440bfe31 /net-misc/freenet6 | |
parent | use toolchain-funcs to determine compiler (Manifest recommit) (diff) | |
download | gentoo-2-7b2995475746146ca11ddc47fb0ffbcf9ffa3451.tar.gz gentoo-2-7b2995475746146ca11ddc47fb0ffbcf9ffa3451.tar.bz2 gentoo-2-7b2995475746146ca11ddc47fb0ffbcf9ffa3451.zip |
old
Diffstat (limited to 'net-misc/freenet6')
-rw-r--r-- | net-misc/freenet6/files/digest-freenet6-0.9.7 | 1 | ||||
-rw-r--r-- | net-misc/freenet6/files/freenet6-0.9.2.diff | 149 | ||||
-rw-r--r-- | net-misc/freenet6/freenet6-0.9.7.ebuild | 55 |
3 files changed, 0 insertions, 205 deletions
diff --git a/net-misc/freenet6/files/digest-freenet6-0.9.7 b/net-misc/freenet6/files/digest-freenet6-0.9.7 deleted file mode 100644 index 67a9228197e1..000000000000 --- a/net-misc/freenet6/files/digest-freenet6-0.9.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 0489d5d893089c5b8a19c3b47718dab7 freenet6-0.9.7.tgz 336929 diff --git a/net-misc/freenet6/files/freenet6-0.9.2.diff b/net-misc/freenet6/files/freenet6-0.9.2.diff deleted file mode 100644 index 1a50827467cb..000000000000 --- a/net-misc/freenet6/files/freenet6-0.9.2.diff +++ /dev/null @@ -1,149 +0,0 @@ ---- freenet6-0.9.6.orig/src/auth.c -+++ freenet6-0.9.6/src/auth.c -@@ -34,6 +34,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <stdarg.h> -+#include <time.h> - #include <sys/types.h> - #include <sys/ioctl.h> - #include <sys/socket.h> -@@ -128,26 +129,26 @@ - int len; - - flags = 0; -- *Token=*Value=NULL; -+ *Token=*Value='\0'; - for(s=e=String+11; *e; e++) { -- if(*e== ' ' || *e == '\r' || *e == '\n' || *e==NULL) { -+ if(*e== ' ' || *e == '\r' || *e == '\n' || *e=='\0') { - if(s!=e) { -- if(*Token && (*Value==NULL)) { -+ if(*Token && (*Value=='\0')) { - len = (int)((char *)e-(char *)s); - memcpy(Value, s, len); -- Value[len] = NULL; -+ Value[len] = '\0'; - } - if(*Token && *Value) { - flags += SetCapability(Token,Value); -- *Value = *Token = NULL; -+ *Value = *Token = '\0'; - } - } - s = ++e; - } -- if((*e=='=' || *e== ' ' || *e == '\r' || *e == '\n' || *e==NULL) && (e != s)) { -+ if((*e=='=' || *e== ' ' || *e == '\r' || *e == '\n' || *e=='\0') && (e != s)) { - len = (int)((char *)e-(char *)s); - memcpy(Token, s, len); -- Token[len] = NULL; -+ Token[len] = '\0'; - s = ++e; - } - } -@@ -239,32 +240,32 @@ - c->algorithm = ""; - c->charset = ""; - c->rspauth = ""; -- *Token=*Value=NULL; -+ *Token=*Value='\0'; - for(s=e=String; ; e++) { -- if(*e== ',' || *e == '\r' || *e == '\n' || *e==NULL) { -+ if(*e== ',' || *e == '\r' || *e == '\n' || *e=='\0') { - if(s!=e) { -- if(*Token && (*Value==NULL)) { -+ if(*Token && (*Value=='\0')) { - len = (int)((char *)e-(char *)s); - /* Chop the quotes */ - if((*s == '"') && len) { s++; len--; } - if((s[len-1] == '"') && len) len--; - - if(len) memcpy(Value, s, len); -- Value[len] = NULL; -+ Value[len] = '\0'; - } - if(*Token && *Value) { - InsertInChallegeStruct(c, Token,Value); -- *Value = *Token = NULL; -+ *Value = *Token = '\0'; - } - } -- if(*e == NULL) break; -+ if(*e == '\0') break; - s = ++e; - } -- if((*e=='=' || *e== ',' || *e == '\r' || *e == '\n' || *e==NULL) && (*Token == NULL) && (e != s)) { -+ if((*e=='=' || *e== ',' || *e == '\r' || *e == '\n' || *e=='\0') && (*Token == '\0') && (e != s)) { - len = (int)((char *)e-(char *)s); - memcpy(Token, s, len); -- Token[len] = NULL; -- if(*e == NULL) break; -+ Token[len] = '\0'; -+ if(*e == '\0') break; - s = ++e; - } - } ---- freenet6-0.9.6.orig/src/tspc.c -+++ freenet6-0.9.6/src/tspc.c -@@ -55,8 +55,8 @@ - - #define Identification "tspc - Tunnel Server Protocol Client\n" - --char *FileName = "tspc.conf"; --char *LogFile = "tspc.log"; -+char *FileName = "/etc/freenet6/tspc.conf"; -+char *LogFile = "/var/log/tspc.log"; - char *ScriptDir = NULL; - char *LogFileName = NULL; - tConf Conf; -@@ -77,10 +77,10 @@ - */ - # define ScriptExtension "bat" - #else -- char *TspHomeDir = "/usr/local/etc/tsp"; -+ char *TspHomeDir = "/etc/freenet6"; - char DirSeparator = '/'; - int RootUid = 0; --# define ScriptInterpretor "/bin/sh " -+# define ScriptInterpretor "" - # define ScriptExtension "sh" - #endif - -@@ -269,10 +269,10 @@ - if(Value) { - for(;*Value; Value++) { - if(strchr(AllowedChars, *Value) == NULL) -- return NULL; -+ return 0; - } - } else { -- return NULL; -+ return 0; - } - return 1; - } -@@ -427,15 +427,21 @@ - if(IsPresent(Conf->dns_server)) { - char *Server; - char *dns = strdup(Conf->dns_server); -+ int result; -+ struct addrinfo *contact; - if (eq(Conf->host_type, "host")) { - Display(1,ELError, "VerifyConfig", "DNS delegation is not support for host_type=host"); - status = 1; - } - for(Server = strtok(dns, ":");Server; Server = strtok(NULL, ":")) { -- if(gethostbyname(Server) == NULL) { -- Display(1,ELError, "VerifyConfig", "DNS server name %s is not resolving.", Server); -+ if( result=getaddrinfo(Server, "domain", 0, &contact)) { -+ Display(1,ELError, "VerifyConfig", -+ "DNS server name %s is not resolving.", Server); - status = 1; - } -+ else { -+ freeaddrinfo(contact); -+ } - } - free(dns); - } diff --git a/net-misc/freenet6/freenet6-0.9.7.ebuild b/net-misc/freenet6/freenet6-0.9.7.ebuild deleted file mode 100644 index ef82d4085e11..000000000000 --- a/net-misc/freenet6/freenet6-0.9.7.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-0.9.7.ebuild,v 1.7 2004/10/01 23:12:39 pyrania Exp $ - -inherit eutils - -DESCRIPTION="Client to configure an IPv6 tunnel to freenet6" -HOMEPAGE="http://www.freenet6.net/" -SRC_URI="mirror://gentoo/${P}.tgz" - -LICENSE="VPL-1.0" -SLOT="0" -KEYWORDS="x86 ~ppc ~sparc ~alpha" -IUSE="" -DEPEND="" - - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/freenet6-0.9.2.diff || die "Failed to epatch" - - mv -f src/Makefile ${T} - sed "s:gcc -g -I\$(INC) -Wall:${CC} -I\$(INC) ${CFLAGS}:" \ - ${T}/Makefile > src/Makefile -} - -src_compile() { - emake all target=linux || die "Build Failed" -} - -src_install() { - dosbin bin/tspc - - insopts -m 600 - insinto /etc/freenet6 - doins ${FILESDIR}/tspc.conf - exeinto /etc/freenet6/template - doexe template/{linux,checktunnel}.sh - doexe ${FILESDIR}/gentoo.sh - - dodoc CONTRIB.txt LEGAL LEGAL.html README - doman man/{man5/tspc.conf.5,man8/tspc.8} - - exeinto /etc/init.d - newexe ${FILESDIR}/tspc.rc tspc -} - -pkg_postinst() { - einfo "The freenet6 ebuild installs an init script named 'tspc'" - einfo "to coincide with the name of the client binary installed" - einfo "To add support for a freenet6 connection at startup, do" - einfo "" - einfo "# rc-update add tspc default" -} |