Do not use getaddrinfo from rst lib
This commit is contained in:
		
							parent
							
								
									a06a2d7955
								
							
						
					
					
						commit
						607f51280f
					
				
							
								
								
									
										108
									
								
								bind99-rh1205168.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										108
									
								
								bind99-rh1205168.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,108 @@ | ||||
| diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in
 | ||||
| index 299928b..4f11cea 100644
 | ||||
| --- a/bind/bind/lib/irs/include/irs/netdb.h.in
 | ||||
| +++ b/bind/bind/lib/irs/include/irs/netdb.h.in
 | ||||
| @@ -158,6 +158,100 @@ struct addrinfo {
 | ||||
|  #define	NI_DGRAM	0x00000010 | ||||
|   | ||||
|  /* | ||||
| + * Define to map into irs_ namespace.
 | ||||
| + */
 | ||||
| +
 | ||||
| +#define IRS_NAMESPACE
 | ||||
| +
 | ||||
| +#ifdef IRS_NAMESPACE
 | ||||
| +
 | ||||
| +/*
 | ||||
| + * Use our versions not the ones from the C library.
 | ||||
| + */
 | ||||
| +
 | ||||
| +#ifdef getnameinfo
 | ||||
| +#undef getnameinfo
 | ||||
| +#endif
 | ||||
| +#define getnameinfo irs_getnameinfo
 | ||||
| +
 | ||||
| +#ifdef getaddrinfo
 | ||||
| +#undef getaddrinfo
 | ||||
| +#endif
 | ||||
| +#define getaddrinfo irs_getaddrinfo
 | ||||
| +
 | ||||
| +#ifdef freeaddrinfo
 | ||||
| +#undef freeaddrinfo
 | ||||
| +#endif
 | ||||
| +#define freeaddrinfo irs_freeaddrinfo
 | ||||
| +
 | ||||
| +#ifdef gai_strerror
 | ||||
| +#undef gai_strerror
 | ||||
| +#endif
 | ||||
| +#define gai_strerror irs_gai_strerror
 | ||||
| +
 | ||||
| +#endif
 | ||||
| +
 | ||||
| +extern int getaddrinfo (const char *name,
 | ||||
| +			const char *service,
 | ||||
| +			const struct addrinfo *req,
 | ||||
| +			struct addrinfo **pai);
 | ||||
| +extern int getnameinfo (const struct sockaddr *sa,
 | ||||
| +			socklen_t salen, char *host,
 | ||||
| +			socklen_t hostlen, char *serv,
 | ||||
| +			socklen_t servlen, int flags);
 | ||||
| +extern void freeaddrinfo (struct addrinfo *ai);
 | ||||
| +extern const char *gai_strerror (int ecode);
 | ||||
| +
 | ||||
| +/*
 | ||||
| + * Define to map into irs_ namespace.
 | ||||
| + */
 | ||||
| +
 | ||||
| +#define IRS_NAMESPACE
 | ||||
| +
 | ||||
| +#ifdef IRS_NAMESPACE
 | ||||
| +
 | ||||
| +/*
 | ||||
| + * Use our versions not the ones from the C library.
 | ||||
| + */
 | ||||
| +
 | ||||
| +#ifdef getnameinfo
 | ||||
| +#undef getnameinfo
 | ||||
| +#endif
 | ||||
| +#define getnameinfo irs_getnameinfo
 | ||||
| +
 | ||||
| +#ifdef getaddrinfo
 | ||||
| +#undef getaddrinfo
 | ||||
| +#endif
 | ||||
| +#define getaddrinfo irs_getaddrinfo
 | ||||
| +
 | ||||
| +#ifdef freeaddrinfo
 | ||||
| +#undef freeaddrinfo
 | ||||
| +#endif
 | ||||
| +#define freeaddrinfo irs_freeaddrinfo
 | ||||
| +
 | ||||
| +#ifdef gai_strerror
 | ||||
| +#undef gai_strerror
 | ||||
| +#endif
 | ||||
| +#define gai_strerror irs_gai_strerror
 | ||||
| +
 | ||||
| +int
 | ||||
| +getaddrinfo(const char *hostname, const char *servname,
 | ||||
| +	    const struct addrinfo *hints, struct addrinfo **res);
 | ||||
| +
 | ||||
| +int
 | ||||
| +getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
 | ||||
| +	    char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
 | ||||
| +	    char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
 | ||||
| +	    IRS_GETNAMEINFO_FLAGS_T flags);
 | ||||
| +
 | ||||
| +void freeaddrinfo (struct addrinfo *ai);
 | ||||
| +
 | ||||
| +IRS_GAISTRERROR_RETURN_T
 | ||||
| +gai_strerror(int ecode);
 | ||||
| +
 | ||||
| +#endif
 | ||||
| +
 | ||||
| +/*
 | ||||
|   * Tell Emacs to use C mode on this file. | ||||
|   * Local variables: | ||||
|   * mode: c | ||||
| -- 
 | ||||
| 2.9.5 | ||||
| 
 | ||||
| @ -15,7 +15,7 @@ | ||||
| Summary:  Dynamic host configuration protocol software | ||||
| Name:     dhcp | ||||
| Version:  4.4.2 | ||||
| Release:  12.b1%{?dist} | ||||
| Release:  13.b1%{?dist} | ||||
| 
 | ||||
| # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to | ||||
| # dcantrell maintaining the package) made incorrect use of the epoch and | ||||
| @ -62,7 +62,7 @@ Patch26 : 0026-Add-dhclient-5-B-option-description.patch | ||||
| Patch27:  0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch | ||||
| 
 | ||||
| Patch100: dhcp-statement_parser.patch | ||||
| 
 | ||||
| Patch101: bind99-rh1205168.patch | ||||
| 
 | ||||
| 
 | ||||
| BuildRequires: autoconf | ||||
| @ -513,6 +513,9 @@ done | ||||
| %endif | ||||
| 
 | ||||
| %changelog | ||||
| * Mon Jun 14 2021 Pavel Zhukov <pzhukov@redhat.com> - 12:4.4.2-13.b1 | ||||
| - Do not use getaddrinfo from rst lib (#1823749) | ||||
| 
 | ||||
| * Fri Jun 11 2021 Pavel Zhukov <pzhukov@redhat.com> - 12:4.4.2-12.b1 | ||||
| - Drop compat package finally | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user