Yaroslav,
On 03/21/2013 07:33 PM, Yaroslav Halchenko wrote:
> Main concern is, that despite the overall license of the project being
> X11/Expat-like, there are files with explicit statements restricting the
> domain
> of use, e.g.
>
> src/port/misc/inetutil.c
> src/port/misc/inetutil.h
>
> i.e. the "resale" restriction:
>
> * Copyright 1991, University Corporation for Atmospheric Research.
> * Not for Direct Resale. All copies to include this notice.
I've enclosed replacements for the two mentioned files that don't have
that restriction.
> and some files with FORD's copyright without stating license terms
>
> xgks_2.6.1-3/src/fontdb/hf2gsk.c:4
> * COPYRIGHT, 1990, FORD MOTOR COMPANY *
> xgks_2.6.1-3/src/bugs/hershey-fonts.mail:114
> * COPYRIGHT, 1990, FORD MOTOR COMPANY *
> xgks_2.6.1-3/src/bugs/hershey-fonts.mail:18
> .\" * COPYRIGHT, 1990, FORD MOTOR COMPANY *
I was never able to get the provider of the Hershey fonts to remove
their license restriction, so I'm afraid you're on your own regarding them.
My understanding, however, is that the Hershey fonts themselves are
free. I am not a lawyer, however.
> as Alastair mentions in the bug report, later ones seems could be simply
> stripped.
>
> But could you please clarify the situation with inetutils.* files? since
> they render the whole library "non-free". Could they be "relicensed" under
> the
> main license of the library (may be they just were left there by a
> mistake...)?
Likely a mistake. Use the attached files.
--Steve
/*
* Copyright 1991, University Corporation for Atmospheric Research.
* All rights reserved.
*
* See file COPYRIGHT in the top-level source-directory for licensing
* conditions.
*/
/* $Id: inetutil.c,v 1.1 2000/08/07 23:15:03 emmerson Exp $ */
/*
* Miscellaneous functions to make dealing with internet addresses easier.
*/
/*LINTLIBRARY*/
#if defined(_AIX) && !defined(_ALL_SOURCE)
# define _ALL_SOURCE
#endif
#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <sys/param.h> /* MAXHOSTNAMELEN */
#include <string.h>
#include "inetutil.h"
/*
* convenience wrapper around gethostname(2)
* !NO_INET_FQ_KLUDGE ==> try to make sure it is "fully qualified"
*/
char *
ghostname()
{
static char hostname[MAXHOSTNAMELEN+1] ;
if(gethostname(hostname, MAXHOSTNAMELEN) < 0)
return NULL ;
#ifndef NO_INET_FQ_KLUDGE
if(strchr(hostname, '.') == NULL)
{
/* gethostname return not fully qualified */
struct hostent *hp ;
hp = gethostbyname(hostname) ;
if(hp == NULL || hp->h_addrtype != AF_INET)
{
return hostname ;
}
/* else, hope hp->h_name is fully qualified */
return hp->h_name ;
}
#endif
return hostname ;
}
/*
* Return a string identifying the internet host referred to
* by paddr. If the hostname lookup fails, returns "dotted quad"
* form of the address.
*/
char *
hostbyaddr(paddr)
struct sockaddr_in *paddr ;
{
struct hostent *hp ;
char *otherguy = NULL ;
hp = gethostbyaddr((char *) &paddr->sin_addr,
sizeof (paddr->sin_addr), AF_INET) ;
if(hp != NULL)
otherguy = hp->h_name ;
else
otherguy = inet_ntoa(paddr->sin_addr) ;
return otherguy ;
}
/*
* get the sockaddr_in corresponding to 'hostname' (name or NNN.NNN.NNN.NNN)
*/
int
addrbyhost(hostname, paddr)
char *hostname ;
struct sockaddr_in *paddr ; /* modified on return */
{
paddr->sin_addr.s_addr = inet_addr(hostname) ; /* handle number form */
if((int) (paddr->sin_addr.s_addr) == -1)
{
struct hostent *hp ;
hp = gethostbyname(hostname) ;
if(hp == NULL || hp->h_addrtype != AF_INET)
{
return -1 ;
}
memmove((char *)&paddr->sin_addr, hp->h_addr, hp->h_length) ;
}
paddr->sin_family= AF_INET ;
paddr->sin_port= 0 ;
memset(paddr->sin_zero, 0, sizeof (paddr->sin_zero)) ;
return 0 ;
}
char *
s_sockaddr_in(paddr)
struct sockaddr_in *paddr ;
{
static char buf[64] ;
(void) sprintf(buf,
"sin_port %5d, sin_addr %s",
paddr->sin_port,
inet_ntoa(paddr->sin_addr)) ;
return buf ;
}
/*
* Puts the address of the current host into *paddr
* Returns 0 on success, -1 failure
*/
int
gethostaddr_in(paddr)
struct sockaddr_in *paddr ;
{
char hostname[MAXHOSTNAMELEN] ;
struct hostent *hp ;
if(gethostname(hostname,MAXHOSTNAMELEN) == -1)
return -1 ;
hp = gethostbyname(hostname) ;
if(hp == NULL)
return -1 ;
(void) memmove(&paddr->sin_addr, hp->h_addr, hp->h_length) ;
return 0 ;
}
/*
* Return the well known port for (servicename, proto)
* or -1 on failure.
*/
int
getservport(servicename, proto)
char *servicename ;
char *proto ;
{
struct servent *se ;
se = getservbyname(servicename, proto) ;
if(se == NULL)
return -1 ;
/* else */
return se->s_port ;
}
/*
* Attempt to connect to a unix domain socket.
* Create & connect.
* Returns (socket) descriptor or -1 on error.
*/
int
usopen(name)
char *name ; /* name of socket */
{
int sock = -1 ;
struct sockaddr addr ; /* AF_UNIX address */
sock = socket(AF_UNIX, SOCK_DGRAM, 0) ;
if(sock == -1)
return -1 ;
/* else */
addr.sa_family = AF_UNIX;
(void) strncpy(addr.sa_data, name, sizeof(addr.sa_data)) ;
if (connect(sock, &addr, sizeof(addr)) == -1)
{
(void) close(sock) ;
return -1 ;
}
/* else */
return sock ;
}
/*
* Attempt to connect to a internet domain udp socket.
* Create & connect.
* Returns (socket) descriptor or -1 on error.
*/
int
udpopen(hostname, servicename)
char *hostname ;
char *servicename ;
{
int sock = -1 ;
int port = -1 ;
struct sockaddr_in addr ; /* AF_INET address */
sock = socket(AF_INET, SOCK_DGRAM, 0) ;
if(sock == -1)
return -1 ;
/* else */
if(addrbyhost(hostname, &addr) == -1)
{
(void) close(sock) ;
return -1 ;
}
/* else */
if((port = (short) getservport(servicename, "udp")) == -1)
{
(void) close(sock) ;
return -1 ;
}
/* else */
addr.sin_port = port ;
if (connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1)
{
(void) close(sock) ;
return -1 ;
}
/* else */
return sock ;
}
/*
* Copyright 1991 University Corporation for Atmospheric Research
* All rights reserved.
*
* See file COPYRIGHT in the top-level source-directory for licensing
* conditions.
*/
/* $Id: inetutil.h,v 1.1 2000/08/07 23:15:03 emmerson Exp $ */
/*
* Miscellaneous functions to make dealing with internet addresses easier.
*/
#ifndef _INETUTIL_H_
#define _INETUTIL_H_
extern char *ghostname(/* void */) ;
extern char *hostbyaddr(/* struct sockaddr_in *paddr */) ;
extern int addrbyhost(/* char *hostname, struct sockpaddr_in *paddr */) ;
extern char *s_sockaddr_in(/* struct sockaddr_in *paddr */) ;
extern int gethostaddr_in(/* struct sockaddr_in *paddr */) ;
extern int getservport(/* char *servicename, char *proto */) ;
extern int usopen(/* char *name */) ;
extern int udpopen(/* char *hostname, char *servicename */) ;
#endif /* !_INETUTIL_H_ */
