From 654a036bf6dc292cf4a3116f9433216d114d9198 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Sun, 15 Apr 2007 22:22:28 +0000 Subject: [PATCH] New maintainer, removed old version Package-Manager: portage-2.1.2.3 --- net-misc/freenet6/ChangeLog | 44 +++++- net-misc/freenet6/Manifest | 36 ++--- net-misc/freenet6/files/digest-freenet6-0.9.7 | 1 - net-misc/freenet6/files/freenet6-0.9.2.diff | 149 ------------------ net-misc/freenet6/freenet6-0.9.7.ebuild | 51 ------ net-misc/freenet6/freenet6-1.0.0.ebuild | 4 +- net-misc/freenet6/metadata.xml | 11 +- 7 files changed, 63 insertions(+), 233 deletions(-) delete mode 100644 net-misc/freenet6/files/digest-freenet6-0.9.7 delete mode 100644 net-misc/freenet6/files/freenet6-0.9.2.diff delete mode 100644 net-misc/freenet6/freenet6-0.9.7.ebuild diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog index 3313bf931be0..0b0c9ecfad6a 100644 --- a/net-misc/freenet6/ChangeLog +++ b/net-misc/freenet6/ChangeLog @@ -1,6 +1,46 @@ # ChangeLog for net-misc/freenet6 -# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.14 2006/08/26 05:14:08 antarus Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.15 2007/04/15 22:22:28 voyageur Exp $ + + 15 Apr 2007; Bernard Cafarelli + -files/freenet6-0.9.2.diff, metadata.xml, -freenet6-0.9.7.ebuild: + Remove old version. Also fixes bug #169209 + + 28 Jun 2006; Chris Gianelloni files/gentoo.sh: + Added a patch from Steve Egbert to fix bug #118942. + + 28 Jun 2006; Chris Gianelloni freenet6-1.0.0.ebuild: + Add tspc to the DESCRIPTION so it shows up in searches. Closing bug #94283. + + 09 May 2006; Diego Pettenò freenet6-1.0.0.ebuild: + Add changes to build on Gentoo/*BSD (from Kiko, bug #132553) and respect + CC/CFLAGS/LDFLAGS. + + 01 May 2005; Michael Hanselmann freenet6-1.0.0.ebuild: + Stable on ppc. + + 29 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 02 Oct 2004; Markus Nigbur freenet6-0.9.7.ebuild: + hooray for epatch! + + 07 Jun 2004; Bryan Østergaard freenet6-1.0.0.ebuild: + Stable on alpha. + +*freenet6-1.0.0 (7 Dec 2003) + + 07 Dec 2003; Guy Martin files/tspc.rc, + files/tspc.conf, freenet6-1.0.0.ebuild : + Updated version. Marking stable on x86 because old version + does not connect anymore. Other arches are still unstable. + + 11 Jun 2003; Peter Johanson files/tspc.rc: + missing #!/sbin/runscript + + 10 Jun 2003; Peter Johanson freenet6-0.9.7.ebuild, + files/gentoo.sh: + Added a gentoo.sh script which matches gentoo's placement of things. bug #21865 *freenet6-0.9.7 (28 May 2003) diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest index c11c4f6c521d..a50e34d25e98 100644 --- a/net-misc/freenet6/Manifest +++ b/net-misc/freenet6/Manifest @@ -1,7 +1,3 @@ -AUX freenet6-0.9.2.diff 4538 RMD160 f5595193494d515689010d054a45e22258f04e3e SHA1 90209dccccdf1c0d210408b1f2c8ca2fd23e89b7 SHA256 ec293f618f01a20d3b5c67fd74b7999c64affef691d8509127552ab1a9d245ae -MD5 7b3923fbb5cdc1bee32e08037ff62d08 files/freenet6-0.9.2.diff 4538 -RMD160 f5595193494d515689010d054a45e22258f04e3e files/freenet6-0.9.2.diff 4538 -SHA256 ec293f618f01a20d3b5c67fd74b7999c64affef691d8509127552ab1a9d245ae files/freenet6-0.9.2.diff 4538 AUX gentoo.sh 4568 RMD160 73a809912914a3ae2801ca950721b95a1b97da86 SHA1 f7c35ec479fea7781655ff4594472ad9be789cce SHA256 27368bd036888d455abb9ea89ccf3ccced009892d8304691c6201f1346f46f86 MD5 edc450e3ee1fd520d5e2936ca0f0c949 files/gentoo.sh 4568 RMD160 73a809912914a3ae2801ca950721b95a1b97da86 files/gentoo.sh 4568 @@ -14,27 +10,19 @@ AUX tspc.rc 171 RMD160 7dc7a60cb5fe3681b006ec4f49d41d3d849bca02 SHA1 100044d089b MD5 c3987cc58f033790cf60642d69481b93 files/tspc.rc 171 RMD160 7dc7a60cb5fe3681b006ec4f49d41d3d849bca02 files/tspc.rc 171 SHA256 9890fb3253fc5300e3fb7c63ece3bc81f4df8759cf414af67cc44c743c2467d4 files/tspc.rc 171 -DIST freenet6-0.9.7.tgz 336929 DIST freenet6-1.0.0.tgz 330953 RMD160 28c7cceaaea5ffe4b740d09f7dbd4aed5abac69d SHA1 b85b6334e3fd5c3278d82fa8a325582a57c24bd3 SHA256 0d834b55538eff2abc569aa5c7831f24525bea56354727d0f6d5933d0e5f1116 -EBUILD freenet6-0.9.7.ebuild 1312 RMD160 3e7465341d50dc81e84d3622f49634b47b5478d7 SHA1 aa16f69b97ce27b7bf3f5628b24d7e9f4bc8d016 SHA256 5003baf75b6fe68886cdf6f06b992b8ae6aee2a52a360586b71b0e26fb4d23c8 -MD5 e76036547b9958ba1cbad31acf4a485e freenet6-0.9.7.ebuild 1312 -RMD160 3e7465341d50dc81e84d3622f49634b47b5478d7 freenet6-0.9.7.ebuild 1312 -SHA256 5003baf75b6fe68886cdf6f06b992b8ae6aee2a52a360586b71b0e26fb4d23c8 freenet6-0.9.7.ebuild 1312 -EBUILD freenet6-1.0.0.ebuild 1298 RMD160 e1e1500e1f948079ef6bfe4795d1ebda7219726f SHA1 a42f398912443e7c15d4fa109730c26ee10e85f5 SHA256 425ed7c80395bbd3d1c6269c5139a309724f9cd0697d0fea5dbc574f5de399ca -MD5 a97f091bc631b287e5a58cfaf7266270 freenet6-1.0.0.ebuild 1298 -RMD160 e1e1500e1f948079ef6bfe4795d1ebda7219726f freenet6-1.0.0.ebuild 1298 -SHA256 425ed7c80395bbd3d1c6269c5139a309724f9cd0697d0fea5dbc574f5de399ca freenet6-1.0.0.ebuild 1298 -MISC ChangeLog 411 RMD160 1763f7d8d549f407891d9638564395a081fd1087 SHA1 3c563f58b5335aadc6380633cfc988d08e3aefea SHA256 e9937875fde8facb276bbb2d4caa539db94594e260f2eb1bf87d26441883593e -MD5 0cff162dc32ca22a49a83697e8ec6595 ChangeLog 411 -RMD160 1763f7d8d549f407891d9638564395a081fd1087 ChangeLog 411 -SHA256 e9937875fde8facb276bbb2d4caa539db94594e260f2eb1bf87d26441883593e ChangeLog 411 -MISC metadata.xml 237 RMD160 a7d5739b05a1240abce474698cc850f1f755b000 SHA1 6f651b5209c7d7afba2ee6114e55b1e2726f5fce SHA256 ece254ed4a914f2b3757b5138bbcef308a30e20b2d372346d0e6c9d3634d34df -MD5 c5474ae1cdc7992850c57d5ad8fa8e35 metadata.xml 237 -RMD160 a7d5739b05a1240abce474698cc850f1f755b000 metadata.xml 237 -SHA256 ece254ed4a914f2b3757b5138bbcef308a30e20b2d372346d0e6c9d3634d34df metadata.xml 237 -MD5 b9d2127ddd9f73a468979e10bba5e06b files/digest-freenet6-0.9.7 63 -RMD160 239749df88a66a58c822a987cb822d45820ee535 files/digest-freenet6-0.9.7 63 -SHA256 7e5d00d46d5d32538d8b6b687bae1ccab3e2efe828435458cd8ae6d56ac92744 files/digest-freenet6-0.9.7 63 +EBUILD freenet6-1.0.0.ebuild 1291 RMD160 b52c5981bcbfbaee2cf51262b7d040121b93b4e1 SHA1 562ab3722e9571e90418369145a31241c8b172ba SHA256 67a8e67449aa7b0dbcf56e5f1989c6ad66a3f47705ea1e0dfa4aa9d3d1fefb8f +MD5 073b75f8f405b9cdd80b272ca9553965 freenet6-1.0.0.ebuild 1291 +RMD160 b52c5981bcbfbaee2cf51262b7d040121b93b4e1 freenet6-1.0.0.ebuild 1291 +SHA256 67a8e67449aa7b0dbcf56e5f1989c6ad66a3f47705ea1e0dfa4aa9d3d1fefb8f freenet6-1.0.0.ebuild 1291 +MISC ChangeLog 1973 RMD160 f0dda6553f4b0c1a34412ff14f07d96c1fe13bbb SHA1 1c9e7b3a5506efa20249f7931e988fb0470cf886 SHA256 5d4bc7bc38e6f46cfd546e3a267250c6d85597b12d1fde8f7dbf8e10dde0f786 +MD5 3ef3b33d6f4f13dea8b556d5c81e353f ChangeLog 1973 +RMD160 f0dda6553f4b0c1a34412ff14f07d96c1fe13bbb ChangeLog 1973 +SHA256 5d4bc7bc38e6f46cfd546e3a267250c6d85597b12d1fde8f7dbf8e10dde0f786 ChangeLog 1973 +MISC metadata.xml 326 RMD160 21c0abe03be38d771fe8e476c08daa93f9303c5d SHA1 391f49cb96ffa48f6fd53743078e08cd24abd36b SHA256 98c1b7e954d56b2dc5dcb2e4f8cf76a093c408a9f2bc4f0f98bbc9f72b5175d7 +MD5 fb5597d7c18663c98a358e980de4bf9d metadata.xml 326 +RMD160 21c0abe03be38d771fe8e476c08daa93f9303c5d metadata.xml 326 +SHA256 98c1b7e954d56b2dc5dcb2e4f8cf76a093c408a9f2bc4f0f98bbc9f72b5175d7 metadata.xml 326 MD5 cb720233d965392b57e29e90e0ca48ce files/digest-freenet6-1.0.0 235 RMD160 fd997b79c7cff4e98c7349221a65ac8e9d640024 files/digest-freenet6-1.0.0 235 SHA256 66295a2f3adc16dec752df43490e1be3b5bf94a259e6ec114afa8cd56a8e312c files/digest-freenet6-1.0.0 235 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 - #include - #include -+#include - #include - #include - #include -@@ -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 13f6c8e7787b..000000000000 --- a/net-misc/freenet6/freenet6-0.9.7.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# 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.9 2006/08/26 05:14:08 antarus Exp $ - -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" -DEPEND="" - - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/freenet6-0.9.2.diff || die "Failed to patch" - - 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 - - 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" -} diff --git a/net-misc/freenet6/freenet6-1.0.0.ebuild b/net-misc/freenet6/freenet6-1.0.0.ebuild index b089653dc34b..d104dc67c2c7 100644 --- a/net-misc/freenet6/freenet6-1.0.0.ebuild +++ b/net-misc/freenet6/freenet6-1.0.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-1.0.0.ebuild,v 1.11 2006/08/26 05:14:08 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-1.0.0.ebuild,v 1.12 2007/04/15 22:22:28 voyageur Exp $ DESCRIPTION="Client to configure an IPv6 tunnel to freenet6" HOMEPAGE="http://www.freenet6.net/" diff --git a/net-misc/freenet6/metadata.xml b/net-misc/freenet6/metadata.xml index cc298b3251d3..72ed51554b19 100644 --- a/net-misc/freenet6/metadata.xml +++ b/net-misc/freenet6/metadata.xml @@ -1,8 +1,11 @@ - - beu@gentoo.org - Elfyn McBratney - + + voyageur@gentoo.org + Bernard Cafarelli + + + Client to configure an IPv6 tunnel to freenet6 + -- 2.26.2