diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2015-08-15 21:10:20 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2015-08-19 19:12:45 +0000 |
| commit | bb96725754e5d0cfe68994b52141e70a3406286f (patch) | |
| tree | 8b93fcb1ed1d607153d8dc5d46a02f0487791659 /debian | |
| parent | 9380d066e266751786df82afe93a3165d62bcd22 (diff) | |
Use system's OpenLayers.js on Debian
Change-Id: Id790ee61d3443e2f96a83260514fa3a6d31d09da
Reviewed-on: https://code.wireshark.org/review/10050
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/02_use_packaged_openlayers_js.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 7 |
3 files changed, 19 insertions, 7 deletions
diff --git a/debian/control b/debian/control index 2065946841..c759cf7276 100644 --- a/debian/control +++ b/debian/control @@ -176,7 +176,7 @@ Package: libwireshark-data Section: libs Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends} +Depends: ${misc:Depends}, libjs-openlayers Conflicts: wireshark-common (<< 1.4.0~rc2-1) Replaces: wireshark-common (<< 1.4.0~rc2-1) Suggests: snmp-mibs-downloader diff --git a/debian/patches/02_use_packaged_openlayers_js.patch b/debian/patches/02_use_packaged_openlayers_js.patch new file mode 100644 index 0000000000..593efa9a9d --- /dev/null +++ b/debian/patches/02_use_packaged_openlayers_js.patch @@ -0,0 +1,17 @@ +Description: Use system's OpenLayers.js to avoid privacy breach +Forwarded: not-needed +Author: Balint Reczey <balint@balintreczey.hu> + +diff --git a/ipmap.html b/ipmap.html +index c1e83d0..94f4535 100644 +--- a/ipmap.html ++++ b/ipmap.html +@@ -8,7 +8,7 @@ + line-height: 17px; + } + </style> +- <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script> ++ <script type="text/javascript" src="file:///usr/share/javascript/openlayers/OpenLayers.js"></script> + <script type="text/javascript" src="http://openstreetmap.org/openlayers/OpenStreetMap.js"></script> + + <script type="text/javascript"> diff --git a/debian/patches/series b/debian/patches/series index 516fe3cff4..dd30417d28 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1 @@ -04_asn2wrs_ply.patch -05_note-README-when-running-as-root.patch -06_release-version.patch -08_wireshark-desktop-menu.patch -09_idl2wrs.patch -16_licence_about_location.patch +02_use_packaged_openlayers_js.patch |