diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | docbook/user-guide-docinfo.xml | 2 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_libraries.asciidoc | 5 | ||||
| -rw-r--r-- | epan/print.c | 2 | ||||
| -rw-r--r-- | epan/proto.c | 2 | ||||
| -rwxr-xr-x | packaging/macosx/native-gtk/build-gtk.sh | 5 | ||||
| -rwxr-xr-x | tools/win-setup.sh | 8 |
7 files changed, 11 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c0da586b34..ecd5240012 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ cmake_policy(SET CMP0015 NEW) # If our target platform is enforced by our generator, set # WIRESHARK_TARGET_PLATFORM accordingly. Otherwise use # %WIRESHARK_TARGET_PLATFORM%. + if(WIN32) if("${CMAKE_GENERATOR}" MATCHES ".*Win64$") set(WIRESHARK_TARGET_PLATFORM win64) diff --git a/docbook/user-guide-docinfo.xml b/docbook/user-guide-docinfo.xml index 814c1c85fb..35b9cd6627 100644 --- a/docbook/user-guide-docinfo.xml +++ b/docbook/user-guide-docinfo.xml @@ -131,7 +131,7 @@ <revremark>Updated for Ethereal 0.10.5.</revremark> </revision> -<!-- Earlier versions in http://anonsvn.wireshark.org/wireshark-doc/ --> +<!-- Earlier versions in https://anonsvn.wireshark.org/wireshark-doc/ --> </revhistory> diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc index 78130d229f..98cc52e612 100644 --- a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc @@ -1,7 +1,7 @@ ++++++++++++++++++++++++++++++++++++++ <!-- WSDG Chapter Libraries --> ++++++++++++++++++++++++++++++++++++++ - + [[ChapterLibraries]] == Library Reference @@ -228,7 +228,7 @@ platform, you can get it at http://c-ares.haxx.se/[]. ==== Win32 MSVC C-Ares is cross-compiled using MinGW32 and is available at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsZlib]] @@ -413,4 +413,3 @@ https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. ++++++++++++++++++++++++++++++++++++++ <!-- End of WSDG Chapter Libraries --> ++++++++++++++++++++++++++++++++++++++ - diff --git a/epan/print.c b/epan/print.c index 8072f8393c..5dd4800980 100644 --- a/epan/print.c +++ b/epan/print.c @@ -235,7 +235,7 @@ write_pdml_preamble(FILE *fh, const gchar *filename) fputs("<?xml version=\"1.0\"?>\n", fh); fputs("<?xml-stylesheet type=\"text/xsl\" href=\"" PDML2HTML_XSL "\"?>\n", fh); - fprintf(fh, "<!-- You can find " PDML2HTML_XSL " in %s or at http://anonsvn.wireshark.org/trunk/wireshark/" PDML2HTML_XSL ". -->\n", get_datafile_dir()); + fprintf(fh, "<!-- You can find " PDML2HTML_XSL " in %s or at https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob_plain;f=" PDML2HTML_XSL ". -->\n", get_datafile_dir()); fputs("<pdml version=\"" PDML_VERSION "\" ", fh); fprintf(fh, "creator=\"%s/%s\" time=\"%s\" capture_file=\"%s\">\n", PACKAGE, VERSION, ts, filename ? filename : ""); } diff --git a/epan/proto.c b/epan/proto.c index e48566363a..c9a8884548 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5026,7 +5026,7 @@ proto_tree_move_item(proto_tree *tree, proto_item *fixed_item, proto_item *item_to_move) { - /* Revert part of: http://anonsvn.wireshark.org/viewvc?view=rev&revision=32443 + /* Revert part of: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=00c05ed3fdfa9287422e6e1fc9bd6ea8b31ca4ee * See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5500 */ /* This function doesn't generate any values. It only reorganizes the prococol tree diff --git a/packaging/macosx/native-gtk/build-gtk.sh b/packaging/macosx/native-gtk/build-gtk.sh index 8cc870670a..5b9d6909f2 100755 --- a/packaging/macosx/native-gtk/build-gtk.sh +++ b/packaging/macosx/native-gtk/build-gtk.sh @@ -181,7 +181,7 @@ fi SOURCE=${SOURCE-$HOME/Source/gtk} CAIROCVSROOT=${CAIROCVSROOT-:pserver:anoncvs@cvs.freedesktop.org:/cvs/cairo} -WIRESHARKSVNURL="http://anonsvn.wireshark.org/wireshark/trunk +WIRESHARKSVNURL="https://anonsvn.wireshark.org/wireshark/trunk GNOMESVNURL=${GNOMESVNURL-https://svn.gnome.org/svn} if [ x$1 = xrun ]; then @@ -653,6 +653,3 @@ fi process_modules echo "Done." - - - diff --git a/tools/win-setup.sh b/tools/win-setup.sh index 023975f134..92788fcb13 100755 --- a/tools/win-setup.sh +++ b/tools/win-setup.sh @@ -172,13 +172,13 @@ case "$1" in err_exit "WIRESHARK_TARGET_PLATFORM not defined" fi # DOWNLOAD_PREFIX MUST be in the form - # http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages + # https://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages # or - # http://anonsvn.wireshark.org/wireshark-win64-libs/tags/<date>/packages + # https://anonsvn.wireshark.org/wireshark-win64-libs/tags/<date>/packages # or # /packages to test uploads before creating the tag. - #DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/trunk/packages" - DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages" + #DOWNLOAD_PREFIX="https://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/trunk/packages" + DOWNLOAD_PREFIX="https://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages" PACKAGE=$(basename "$PACKAGE_PATH") echo "" |