dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 09:32:37 +01:00
Code Issues Releases Wiki Activity

net-misc/ipcalc-ng: update patch

Browse Source
This commit is contained in:
David GUGLIELMI
2018-05-18 14:28:34 +02:00
parent 1e1522dd8f
commit 525adef02a
2 changed files with 9 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-misc/ipcalc-ng/Manifest
View File

@@ -1,4 +1,4 @@
AUX ipcalc-ng-0.2.2-fix-geoip-linking.patch 3469 BLAKE2B 923018cb6d937c0fa603d1b9739118a5f2a1413c3cd1142a49338a02cc818a886c82a479b6323a27286beeda551edf86dc71b386054aef5f30d9d9983303f5bd SHA512 cd9047d16a729b29308c014155fc5266d7c9f3757424d80327c0b40a70e51b8513759981dcd8f007a330c6e9f5912722766c2ac5a6fe9441a5d91a9b8661d1b9
AUX ipcalc-ng-0.2.2-fix-geoip-linking.patch 1515 BLAKE2B c69c886c7e52f9e3d4e19022373a3ba44a771b413a452447860214e064b6ff88f172361c64c8eb36504509eebf154d5c856f8c1d62635f2aee569457c75a8197 SHA512 17cf1bc0a6ab2224a3f5b303d848ac9d292d2052c88595c738f8baf8c398bde784e4aab9a901fd330b72f960fbc927ddecff304df2abfa38b4dd4aefbb0b2fb7
AUX ipcalc-ng-0.2.2-ipcalc-h-guard-header.patch 906 BLAKE2B 58bcbd47bc28556ce22c23781b816d2b2fe87f26cf62f5973dd1eae860c9d212f090524740dd660e1f16e60270bca3f99d9063b14ee2956ba9c5cf979104fb1e SHA512 41992e48057e25173c08f6695a912fd8186d5434004e3f5c10c37f6d139f42e7ac826ef20230aaadf56afb0dafed0be977bd58cb540bd53115e705f2a6fda16c
DIST ipcalc-ng-0.2.2.tar.gz 36523 BLAKE2B 12afd7bf31dc641a7563a8e9b7f3283f0fbaca3e13acc2c9e30a6268498a13a1567151f839620c64a4317639452ffd7be934e416bd1311ec9f8e7e89ab7ce9dc SHA512 f70a8b8b98e308e2ec31703dae752658161df4ef0d530b86f27ec6a1c65e9942928b375c573a74ef1eac9bda112f25f9ce22487c34d3a2632282b62bd85702be
EBUILD ipcalc-ng-0.2.2.ebuild 831 BLAKE2B 8c295e8915e6dd7175473a11cec2573878b52c0a53d8b280463086f5f82f48105a822360ab1ca052d255a86c146fddf224e0df77fb25f208668c4fc55865177c SHA512 c693f0104420e682c8db03df3955928daa2dcc8af903ff3343d6ff5717e2a06912b3575038567aac01cee09988402ac1b0b429e689f5723b34ab55b08e410d31

85
net-misc/ipcalc-ng/files/ipcalc-ng-0.2.2-fix-geoip-linking.patch
View File

@@ -1,5 +1,5 @@
diff --git a/ipcalc-geoip.c b/ipcalc-geoip.c
index 6be38fe..4cae8c0 100644
index 6be38fe..17b6346 100644
--- a/ipcalc-geoip.c
+++ b/ipcalc-geoip.c
@@ -34,6 +34,22 @@
@@ -48,86 +48,17 @@ index 6be38fe..4cae8c0 100644
int geo_setup(void)
{
static void *ld = NULL;
@@ -141,8 +141,10 @@ void geo_ipv4_lookup(struct in_addr ip, char **country, char **ccode, char **cit
int country_id;
const char *p;
+#ifdef USE_DYN_GEOIP
if (geo_setup() != 0)
return;
+#endif
ip.s_addr = ntohl(ip.s_addr);
@@ -207,8 +209,10 @@ void geo_ipv6_lookup(struct in6_addr *ip, char **country, char **ccode, char **c
int country_id;
const char *p;
+#ifdef USE_DYN_GEOIP
if (geo_setup() != 0)
return;
+#endif
p_GeoIP_setup_dbfilename();
diff --git a/ipcalc.c b/ipcalc.c
index 5437ea8..411e1b0 100644
--- a/ipcalc.c
+++ b/ipcalc.c
@@ -709,8 +709,10 @@ int get_ipv4_info(const char *ipStr, int prefix, ip_info_st * info,
ipv4_prefix_to_hosts(info->hosts, sizeof(info->hosts), prefix);
+#ifdef USE_GEOIP
if (flags & FLAG_GET_GEOIP)
geo_ipv4_lookup(ip, &info->geoip_country, &info->geoip_ccode, &info->geoip_city, &info->geoip_coord);
+#endif
if (flags & FLAG_RESOLVE_HOST) {
info->hostname = get_hostname(AF_INET, &ip);
@@ -927,9 +929,10 @@ int get_ipv6_info(const char *ipStr, int prefix, ip_info_st * info,
ipv6_prefix_to_hosts(info->hosts, sizeof(info->hosts), prefix);
-
+#ifdef USE_GEOIP
if (flags & FLAG_GET_GEOIP)
geo_ipv6_lookup(&ip6, &info->geoip_country, &info->geoip_ccode, &info->geoip_city, &info->geoip_coord);
+#endif
if (flags & FLAG_RESOLVE_HOST) {
info->hostname = get_hostname(AF_INET6, &ip6);
@@ -1290,8 +1293,15 @@ int main(int argc, char **argv)
if (hostname)
flags |= FLAG_RESOLVE_IP;
+#ifdef USE_GEOIP
+#ifdef USE_DYN_GEOIP
if (geo_setup() == 0 && ((flags & FLAG_SHOW_ALL_INFO) == FLAG_SHOW_ALL_INFO))
flags |= FLAG_GET_GEOIP;
+#else
+ if ((flags & FLAG_SHOW_ALL_INFO) == FLAG_SHOW_ALL_INFO)
+ flags |= FLAG_GET_GEOIP;
+#endif
+#endif
if ((hostname && randomStr) || (hostname && splitStr) || (randomStr && splitStr)) {
if (!beSilent)
diff --git a/ipcalc.h b/ipcalc.h
index a3f13bc..a9a3c0f 100644
index a3f13bc..9af367a 100644
--- a/ipcalc.h
+++ b/ipcalc.h
@@ -23,11 +23,9 @@
#ifdef USE_GEOIP
@@ -24,6 +24,9 @@
void geo_ipv4_lookup(struct in_addr ip, char **country, char **ccode, char **city, char **coord);
void geo_ipv6_lookup(struct in6_addr *ip, char **country, char **ccode, char **city, char **coord);
+#ifdef USE_DYN_GEOIP
int geo_setup(void);
-#else
-# define geo_ipv4_lookup(x,y,z,w,a)
-# define geo_ipv6_lookup(x,y,z,w,a)
-# define geo_setup() -1
+#ifndef USE_DYN_GEOIP
+# define geo_setup() 0
+#endif
#endif
char __attribute__((warn_unused_result)) *safe_strdup(const char *str);
#else
# define geo_ipv4_lookup(x,y,z,w,a)
# define geo_ipv6_lookup(x,y,z,w,a)