change URL for downloading manuf list to new wireshark.org URL, idaho…

…lab#306
mmguero-dev · Dec 5, 2023 · b0f39c3 · b0f39c3
1 parent 1329815
commit b0f39c3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfiles/arkime.Dockerfile b/Dockerfiles/arkime.Dockerfile
@@ -216,7 +216,7 @@ RUN [ ${#MAXMIND_GEOIP_DB_LICENSE_KEY} -gt 1 ] && for DB in ASN Country City; do
       rm -f "GeoLite2-$DB*"; \
     done; \
   curl -s -S -L -o $ARKIME_DIR/etc/ipv4-address-space.csv "https://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.csv" && \
-  curl -s -S -L -o $ARKIME_DIR/etc/oui.txt "https://gitlab.com/wireshark/wireshark/raw/release-4.0/manuf"
+  curl -s -S -L -o $ARKIME_DIR/etc/oui.txt "https://www.wireshark.org/download/automated/data/manuf"
 
 RUN groupadd --gid $DEFAULT_GID $PGROUP && \
     useradd -M --uid $DEFAULT_UID --gid $DEFAULT_GID --home $ARKIME_DIR $PUSER && \

diff --git a/arkime/scripts/arkime_update_geo.sh b/arkime/scripts/arkime_update_geo.sh
@@ -8,7 +8,7 @@ wget -nv --no-check-certificate -O ipv4-address-space.csv_new https://www.iana.o
   mv -f ipv4-address-space.csv_new ipv4-address-space.csv || \
   rm -f ipv4-address-space.csv_new
 
-wget -nv -O oui.txt_new https://gitlab.com/wireshark/wireshark/raw/release-4.0/manuf && \
+wget -nv -O oui.txt_new https://www.wireshark.org/download/automated/data/manuf && \
   mv -f oui.txt_new oui.txt || \
   rm -f oui.txt_new
 

diff --git a/sensor-iso/build.sh b/sensor-iso/build.sh
@@ -167,7 +167,7 @@ if [ -d "$WORKDIR" ]; then
     fi
   fi
   curl -s -S -L -o ipv4-address-space.csv "https://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.csv"
-  curl -s -S -L -o oui.txt "https://gitlab.com/wireshark/wireshark/raw/release-4.0/manuf"
+  curl -s -S -L -o oui.txt "https://www.wireshark.org/download/automated/data/manuf"
   popd >/dev/null 2>&1
 
   # clone and build Arkime .deb package in its own clean environment (rather than in hooks/)

diff --git a/shared/bin/manuf-oui-parse.py b/shared/bin/manuf-oui-parse.py
@@ -17,7 +17,7 @@
 except ImportError:
     import yaml
 
-DEFAULT_MANUF_URL = "https://gitlab.com/wireshark/wireshark/raw/release-4.0/manuf"
+DEFAULT_MANUF_URL = "https://www.wireshark.org/download/automated/data/manuf"
 padded_mac_low = '00:00:00:00:00:00'
 padded_mac_high = 'FF:FF:FF:FF:FF:FF'
 mac_pattern = re.compile(r"[-:\.]")