Accepting request 125845 from home:AndreasStieger:branches:network:utilities

update to upstream 1.8.0

OBS-URL: https://build.opensuse.org/request/show/125845
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=61
This commit is contained in:
2012-06-23 13:53:46 +00:00
committed by Git OBS Bridge
parent 29e0f727c7
commit 3365d9bb02
10 changed files with 166 additions and 2899 deletions

View File

@@ -1,12 +1,14 @@
--- epan/geoip_db.c.orig 2011-11-03 03:52:16.118977107 -0400
+++ epan/geoip_db.c 2011-11-03 03:56:23.711016549 -0400
@@ -165,6 +165,9 @@
geoip_dat_scan_dir(geoip_db_paths[i].path);
}
}
+ if (num_geoip_db_paths < 1) {
+ geoip_dat_scan_dir("/var/lib/GeoIP");
+ }
Index: epan/geoip_db.c
===================================================================
--- epan/geoip_db.c.orig 2012-06-05 17:33:40.000000000 +0100
+++ epan/geoip_db.c 2012-06-21 21:55:14.000000000 +0100
@@ -177,6 +177,9 @@ geoip_db_init(void) {
geoip_dat_scan_dir(geoip_db_paths[i].path);
}
}
+ if (num_geoip_db_paths < 1) {
+ geoip_dat_scan_dir("/var/lib/GeoIP");
+ }
/* add fake databases for latitude and longitude (using "City" in reality) */
{