Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package urlscan for openSUSE:Factory checked in at 2023-06-12 15:25:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/urlscan (Old) and /work/SRC/openSUSE:Factory/.urlscan.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "urlscan" Mon Jun 12 15:25:25 2023 rev:13 rq:1092579 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/urlscan/urlscan.changes 2022-12-06 15:52:16.891849065 +0100 +++ /work/SRC/openSUSE:Factory/.urlscan.new.15902/urlscan.changes 2023-06-12 15:26:06.394929588 +0200 @@ -1,0 +2,36 @@ +Mon Jun 12 12:26:37 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Also remove left over curly braces at the end of require lines + +------------------------------------------------------------------- +Mon Jun 12 11:54:29 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Removed invalid Recommends line + +------------------------------------------------------------------- +Mon Jun 12 11:45:12 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Reintroduce removing /usr/bin/env from shebang lines as well as + duplicate files them selfs + +------------------------------------------------------------------- +Mon Jun 12 11:09:31 UTC 2023 - Dominique Leuenberger <[email protected]> + +- Do not package this as multi-python flavors: urlscan is a simple + leaf application written in python. Its python code is not + consumed by others. + +------------------------------------------------------------------- +Fri Jun 2 13:50:51 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Update to urlscan 1.0.0 + * Fix search with -c flag. Fixes #131. + * Add support for IPv6 URLs. Closes #127 + * Mark items in url queue with a * + * Add version flag + * Update to pyproject.toml/hatch for builds +- Switch over to flavoured build + * Is there any way to have one major package e.g. for repeating + docs for the various flavoured sub packages? + +------------------------------------------------------------------- Old: ---- urlscan-0.9.10.tar.gz New: ---- urlscan-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ urlscan.spec ++++++ --- /var/tmp/diff_new_pack.PUGLGu/_old 2023-06-12 15:26:07.078933635 +0200 +++ /var/tmp/diff_new_pack.PUGLGu/_new 2023-06-12 15:26:07.086933682 +0200 @@ -1,7 +1,7 @@ # # spec file for package urlscan # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define python_flavor python3 +%define pythons python3 Name: urlscan -Version: 0.9.10 +Version: 1.0.0 Release: 0 Summary: An other URL extractor/viewer License: GPL-2.0-or-later @@ -27,15 +27,19 @@ Source0: https://github.com/firecat53/urlscan/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: muttrc BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRequires: python3-base BuildRequires: python3-devel -BuildRequires: python3-rpm-macros +BuildRequires: python3-hatch_vcs +BuildRequires: python3-hatchling +BuildRequires: python3-pip BuildRequires: python3-setuptools +BuildRequires: python3-wheel BuildRequires: sed -Requires: python3 Requires: python3-base -Requires: python3-urwid +Requires: python3-urwid >= 1.2.1 BuildArch: noarch +%global myname %name %description The urlscan utility displays URLs found in an email message with @@ -45,33 +49,33 @@ %prep %setup -q +install -m 0644 %{SOURCE1} muttrc %build -%python3_build +SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" +export SETUPTOOLS_SCM_PRETEND_VERSION +%pyproject_wheel %install -%python3_install -mkdir -p %{buildroot}%{_defaultdocdir}/%{name} -if test -e %{buildroot}%{_datadir}/doc/%{name}* +%pyproject_install +%{python_expand mkdir -p %{buildroot}%{_defaultdocdir}/%{$python_prefix}-%{myname} + chmod 755 %{buildroot}%{$python_sitelib}/%{name}/__main__* + sed -ri '1 { s@(/usr/bin/)env +@\1@ }' %{buildroot}%{$python_sitelib}/%{name}/__main__* + %fdupes %{buildroot}%{$python_sitelib} +} +sed -ri '1 { s@(/usr/bin/)env +@\1@;s@(/python3)\.[[:digit:]]+@\1@ }' %{buildroot}%{_bindir}/%{name} +if test -e %{buildroot}%{_datadir}/doc/%{myname}* then - rm -vf %{buildroot}%{_datadir}/doc/%{name}*/COPYING - mv %{buildroot}%{_datadir}/doc/%{name}*/* \ - %{buildroot}%{_defaultdocdir}/%{name}/ + rm -f %{buildroot}%{_datadir}/doc/%{myname}*/LICENSE fi rm -rf %{buildroot}%{_datadir}/doc/%{name}* -install -m 0644 %{SOURCE1} %{buildroot}%{_defaultdocdir}/%{name} -chmod 755 %{buildroot}%{python_sitelib}/%{name}/__main__* -sed -ri '1 { s@(/usr/bin/)env *@\1@ }' %{buildroot}%{python_sitelib}/%{name}/__main__* -%fdupes %{buildroot} %files -%license COPYING -%{_bindir}/%{name} -%{python_sitelib}/%{name} -%{python_sitelib}/%{name}-%{version}-py*.egg-info -%{_mandir}/man1/%{name}.1%{?ext_man} -%dir %{_defaultdocdir}/%{name}/ -%doc %{_defaultdocdir}/%{name}/muttrc -%doc %{_defaultdocdir}/%{name}/README.md +%{_bindir}/%{myname} +%{_mandir}/man1/%{myname}.1%{?ext_man} +%{python_sitelib}/%{myname} +%{python_sitelib}/%{myname}-%{version}*-info +%license LICENSE +%doc README.md muttrc %changelog ++++++ urlscan-0.9.10.tar.gz -> urlscan-1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/.gitignore new/urlscan-1.0.0/.gitignore --- old/urlscan-0.9.10/.gitignore 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/.gitignore 2023-06-01 20:32:27.000000000 +0200 @@ -6,4 +6,5 @@ build dist test_emails/ +urlscan/_version.py MANIFEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/COPYING new/urlscan-1.0.0/COPYING --- old/urlscan-0.9.10/COPYING 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/COPYING 1970-01-01 01:00:00.000000000 +0100 @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/LICENSE new/urlscan-1.0.0/LICENSE --- old/urlscan-0.9.10/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/urlscan-1.0.0/LICENSE 2023-06-01 20:32:27.000000000 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/MANIFEST.in new/urlscan-1.0.0/MANIFEST.in --- old/urlscan-0.9.10/MANIFEST.in 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -include COPYING -include urlscan.1 -include urlscan/assets/tlds-alpha-by-domain.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/README.md new/urlscan-1.0.0/README.md --- old/urlscan-0.9.10/README.md 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/README.md 2023-06-01 20:32:27.000000000 +0200 @@ -2,7 +2,7 @@ ## Contributors -Scott Hansen \<[email protected]\> (Author and Maintainer) +Scott Hansen \<[email protected]\> (Author and Maintainer) Maxime Chatelle \<[email protected]\> (Debian Maintainer) @@ -69,9 +69,13 @@ ## Installation and setup -To install urlscan, install from your distribution repositories (Archlinux), -from Pypi, or do a local development install with pip -e: +To install urlscan, install from your distribution repositories, from Pypi, or do +a local development install with pip -e: + pipx install urlscan + + OR + pip install --user urlscan OR @@ -193,4 +197,9 @@ sub-parts, rather than just picking one, which may lead to URLs and context appearing twice. (Bypass this by selecting the '--dedupe' option) +## Build/development + +- pyproject.toml is configured for [hatch][2] for building and submitting to pypi. + [1]: http://urwid.org/manual/displayattributes.html#display-attributes "Urwid display attributes" +[2]: https://hatch.pypa.io/latest/ "Hatch" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/pyproject.toml new/urlscan-1.0.0/pyproject.toml --- old/urlscan-0.9.10/pyproject.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/urlscan-1.0.0/pyproject.toml 2023-06-01 20:32:27.000000000 +0200 @@ -0,0 +1,59 @@ +[build-system] +requires = ["hatchling", "hatch-vcs"] +build-backend = "hatchling.build" + +[project] +name = "urlscan" +dynamic = ["version"] +description = "View/select the URLs in an email message or file" +readme = "README.md" +license = "GPL-2.0" +authors = [ + { name = "Scott Hansen", email = "[email protected]" }, +] +keywords = [ + "email", + "mutt", + "tmux", + "urlscan", + "urlview", +] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Environment :: Console :: Curses", + "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Topic :: Utilities", +] +dependencies = [ + "urwid>=1.2.1", +] + +[project.scripts] +urlscan = "urlscan.__main__:main" + +[project.urls] +Homepage = "https://github.com/firecat53/urlscan"; + +[tool.hatch.version] +source = "vcs" + +[tool.hatch.build.hooks.vcs] +version-file = "urlscan/_version.py" + +[tool.hatch.build.targets.wheel.shared-data] +LICENSE = "share/doc/urlscan/LICENSE" +"README.md" = "share/doc/urlscan/README.md" +"urlscan.1" = "share/man/man1/urlscan.1" + +[tool.hatch.build.targets.sdist] +include = [ + "/urlscan", +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/setup.py new/urlscan-1.0.0/setup.py --- old/urlscan-0.9.10/setup.py 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -#!/usr/bin/env python3 -"""urlscan setup.py""" - -from setuptools import setup - - -def long_description(): - """Generate long description from README""" - with open("README.md", encoding='utf-8') as readme: - return readme.read() - - -setup(name="urlscan", - version="0.9.10", - description="View/select the URLs in an email message or file", - long_description=long_description(), - long_description_content_type="text/markdown", - author="Scott Hansen", - author_email="[email protected]", - url="https://github.com/firecat53/urlscan";, - download_url="https://github.com/firecat53/urlscan/archive/0.9.10.zip";, - packages=['urlscan'], - entry_points={ - 'console_scripts': ['urlscan=urlscan.__main__:main'] - }, - package_data={'urlscan': ['assets/*']}, - data_files=[('share/doc/urlscan', ['README.md', 'COPYING']), - ('share/man/man1', ['urlscan.1'])], - license="GPLv2", - install_requires=["urwid>=1.2.1"], - classifiers=[ - 'Development Status :: 4 - Beta', - 'Environment :: Console', - 'Environment :: Console :: Curses', - 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Topic :: Utilities'], - keywords="urlscan, urlview, email, mutt, tmux" - ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/urlscan/__main__.py new/urlscan-1.0.0/urlscan/__main__.py --- old/urlscan-0.9.10/urlscan/__main__.py 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/urlscan/__main__.py 2023-06-01 20:32:27.000000000 +0200 @@ -5,7 +5,7 @@ """ # # Copyright (C) 2006-2007 Daniel Burrows -# Copyright (C) 2021 Scott Hansen +# Copyright (C) 2023 Scott Hansen # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,6 +28,7 @@ from email import policy from email.parser import BytesParser from urlscan import urlchoose, urlscan +from urlscan._version import version def parse_arguments(): @@ -86,6 +87,9 @@ arg_parse.add_argument('--headers', dest='headers', action='store_true', default=False, help='Scan certain message headers for URLs.') + arg_parse.add_argument('--version', '-V', dest='version', + action='store_true', default=False, + help='Print urlscan version') arg_parse.add_argument('message', nargs='?', default=sys.stdin, help="Filename of the message to parse") return arg_parse.parse_args() @@ -166,6 +170,9 @@ """ args = parse_arguments() + if args.version is True: + print(version) + return if args.genconf is True: urlchoose.URLChooser([], genconf=True) return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/urlscan/assets/tlds-alpha-by-domain.txt new/urlscan-1.0.0/urlscan/assets/tlds-alpha-by-domain.txt --- old/urlscan-0.9.10/urlscan/assets/tlds-alpha-by-domain.txt 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/urlscan/assets/tlds-alpha-by-domain.txt 2023-06-01 20:32:27.000000000 +0200 @@ -1,4 +1,4 @@ -# Version 2021100600, Last Updated Wed Oct 6 07:07:01 2021 UTC +# Version 2023060100, Last Updated Thu Jun 1 07:07:01 2023 UTC AAA AARP ABARTH @@ -17,7 +17,6 @@ ACO ACTOR AD -ADAC ADS ADULT AE @@ -25,7 +24,6 @@ AERO AETNA AF -AFAMILYCOMPANY AFL AFRICA AG @@ -177,8 +175,6 @@ BRUSSELS BS BT -BUDAPEST -BUGATTI BUILD BUILDERS BUSINESS @@ -198,7 +194,6 @@ CAM CAMERA CAMP -CANCERRESEARCH CANON CAPETOWN CAPITAL @@ -301,7 +296,6 @@ CRS CRUISE CRUISES -CSC CU CUISINELLA CV @@ -360,7 +354,6 @@ DRIVE DTV DUBAI -DUCK DUNLOP DUPONT DURBAN @@ -494,7 +487,6 @@ GIVES GIVING GL -GLADE GLASS GLE GLOBAL @@ -658,6 +650,7 @@ KH KI KIA +KIDS KIM KINDER KINDLE @@ -715,12 +708,10 @@ LIMITED LIMO LINCOLN -LINDE LINK LIPSY LIVE LIVING -LIXIL LK LLC LLP @@ -728,7 +719,6 @@ LOANS LOCKER LOCUS -LOFT LOL LONDON LOTTE @@ -748,7 +738,6 @@ LV LY MA -MACYS MADRID MAIF MAISON @@ -821,6 +810,7 @@ MTR MU MUSEUM +MUSIC MUTUAL MV MW @@ -877,7 +867,6 @@ NZ OBI OBSERVER -OFF OFFICE OKINAWA OLAYAN @@ -976,10 +965,8 @@ QPON QUEBEC QUEST -QVC RACING RADIO -RAID RE READ REALESTATE @@ -1056,7 +1043,6 @@ SCHULE SCHWARZ SCIENCE -SCJOHNSON SCOT SD SE @@ -1068,7 +1054,6 @@ SELECT SENER SERVICES -SES SEVEN SEW SEX @@ -1327,7 +1312,6 @@ XN--3DS443G XN--3E0B707E XN--3HCRJ9C -XN--3OQ18VL8PN36A XN--3PXU8K XN--42C2D9A XN--45BR5CYL @@ -1396,7 +1380,6 @@ XN--J1AMH XN--J6W193G XN--JLQ480N2RG -XN--JLQ61U9W7B XN--JVR189M XN--KCRX77D1X4A XN--KPRW13D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/urlscan/urlchoose.py new/urlscan-1.0.0/urlscan/urlchoose.py --- old/urlscan-0.9.10/urlscan/urlchoose.py 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/urlscan/urlchoose.py 2023-06-01 20:32:27.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2006-2007 Daniel Burrows -# Copyright (C) 2021 Scott Hansen +# Copyright (C) 2023 Scott Hansen # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -211,6 +211,10 @@ self.items, self.urls = self.process_urls(extractedurls, dedupe=dedupe, shorten=self.shorten) + # Original version of all items + self.items_orig = self.items + # Store items grouped into sections + self.items_org = grp_list(self.items) # Store 'compact' mode items self.items_com = [i for i in self.items if isinstance(i, urwid.Columns) is True] @@ -218,10 +222,6 @@ self.items, self.items_com = self.items_com, self.items self.urls_unesc = [i.replace('\\', '') for i in self.urls] self.unesc = False - # Original version of all items - self.items_orig = self.items - # Store items grouped into sections - self.items_org = grp_list(self.items) listbox = urwid.ListBox(self.items) self.header = (":: F1 - help/keybindings :: " "q - quit :: " @@ -399,6 +399,9 @@ self.headerwid = urwid.AttrMap(urwid.Text( self.header.format(self.link_open_modes[0], len(self.queue))), 'header') self.top.base_widget.header = self.headerwid + label = self.items[fpo][1].label + if not label.startswith("* "): + self.items[fpo][1].set_label(f"* {label}") def _del_url(self): """d""" @@ -412,6 +415,9 @@ self.headerwid = urwid.AttrMap(urwid.Text( self.header.format(self.link_open_modes[0], len(self.queue))), 'header') self.top.base_widget.header = self.headerwid + label = self.items[fpo][1].label + if label.startswith("* "): + self.items[fpo][1].set_label(label.lstrip("* ")) except ValueError: pass @@ -464,8 +470,7 @@ if self.urls: self.search = True if self.compact is True: - self.compact = False - self.items, self.items_com = self.items_com, self.items + self._context() else: return self.no_matches = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/urlscan/urlscan.py new/urlscan-1.0.0/urlscan/urlscan.py --- old/urlscan-0.9.10/urlscan/urlscan.py 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/urlscan/urlscan.py 2023-06-01 20:32:27.000000000 +0200 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2006-2007 Daniel Burrows -# Copyright (C) 2021 Scott Hansen +# Copyright (C) 2023 Scott Hansen # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -245,7 +245,7 @@ self.handle_data(f"&{name};") -URLINTERNALPATTERN = r'[{}()@\w/\\\-%?!&.=:;+,#~*]' +URLINTERNALPATTERN = r'[\[\]{}()@\w/\\\-%?!&.=:;+,#~*]' URLTRAILINGPATTERN = r'[{}(@\w/\-%&=+#$]' HTTPURLPATTERN = (r'(?:(https?|file|ftps?)://' + URLINTERNALPATTERN + r'*' + URLTRAILINGPATTERN + r')') @@ -291,6 +291,7 @@ assert URLRE.match('testurl.biz.smile.zw') assert not URLRE.match('example..biz') assert not URLRE.match('blah.baz.obviouslynotarealdomain') +assert URLRE.match('http://[2a07:3500:11a0:320::22]:8080') def parse_text_urls(mesg, regex=None): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-0.9.10/urlscan.1 new/urlscan-1.0.0/urlscan.1 --- old/urlscan-0.9.10/urlscan.1 2022-08-04 00:35:50.000000000 +0200 +++ new/urlscan-1.0.0/urlscan.1 2023-06-01 20:32:27.000000000 +0200 @@ -1,6 +1,6 @@ .\" Hey, EMACS: -*- nroff -*- -.TH URLSCAN 1 "6 March 2021" +.TH URLSCAN 1 "1 June 2023" .SH NAME urlscan \- browse the URLs in an email message from a terminal @@ -218,4 +218,4 @@ \fBmutt\fR(1) .SH AUTHOR -This manual page was written by Daniel Burrows <[email protected]> and Scott Hansen <[email protected]> +This manual page was written by Daniel Burrows <[email protected]> and Scott Hansen <[email protected]>
