diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-10 20:34:10 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-10 20:34:10 +0000 |
| commit | e4ba6dbc3f1e76890b22773807ea37fe8fa2b1bc (patch) | |
| tree | 68cb5ef9081156392f1dd62a00c6ccc1451b93df /packaging/debian/patches | |
| parent | Initial commit. (diff) | |
| download | wireshark-e4ba6dbc3f1e76890b22773807ea37fe8fa2b1bc.tar.xz wireshark-e4ba6dbc3f1e76890b22773807ea37fe8fa2b1bc.zip | |
Adding upstream version 4.2.2.upstream/4.2.2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/debian/patches')
| -rw-r--r-- | packaging/debian/patches/09_idl2wrs.patch | 48 | ||||
| -rw-r--r-- | packaging/debian/patches/series | 1 |
2 files changed, 49 insertions, 0 deletions
diff --git a/packaging/debian/patches/09_idl2wrs.patch b/packaging/debian/patches/09_idl2wrs.patch new file mode 100644 index 00000000..87cb8c38 --- /dev/null +++ b/packaging/debian/patches/09_idl2wrs.patch @@ -0,0 +1,48 @@ +Description: Do not try to locate wireshark_be.py and wireshark_gen.py in + non-standard places. +Author: Frederic Peters <fpeters@debian.org> + +--- a/tools/idl2wrs ++++ b/tools/idl2wrs +@@ -65,41 +65,8 @@ + exit 1; + fi + +-# +-# Run wireshark backend, looking for wireshark_be.py and wireshark_gen.py +-# in pythons's "site-packages" directory. If cannot find that, then +-# try looking in current directory. If still cannot, then exit with +-# error. +- +-if [ -f $PYTHONPATH/site-packages/wireshark_be.py ] && [ -f $PYTHONPATH/site-packages/wireshark_gen.py ]; then +- exec omniidl -p $PYTHONPATH/site-packages -b wireshark_be $@ +- /* not reached */ +-fi +- +-# Try current directory. +- +-if [ -f ./wireshark_be.py ] && [ -f ./wireshark_gen.py ]; then +- exec omniidl -p ./ -b wireshark_be $@ +- /* not reached */ +-fi +- +-# Could not find both wireshark_be.py AND wireshark_gen.py +-# So let's just try to run it without -p, hoping that the installation +-# set up a valid path. +- + exec omniidl -b wireshark_be $@ + +-old code: not reached +- +-echo "idl2wrs Error: Could not find both wireshark_be.py AND wireshark_gen.py." +-echo "Please ensure you have the PYTHONPATH variable set, or that wireshark_be.py " +-echo "and wireshark_gen.py exist in the current directory. " +-echo +-echo "On this system, PYTHONPATH is : $PYTHONPATH" +-echo +- +-exit 2 +- + + # + # Editor modelines - https://www.wireshark.org/tools/modelines.html diff --git a/packaging/debian/patches/series b/packaging/debian/patches/series new file mode 100644 index 00000000..339a8663 --- /dev/null +++ b/packaging/debian/patches/series @@ -0,0 +1 @@ +09_idl2wrs.patch |