diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/COMMITMENT b/COMMITMENT deleted file mode 100644 index a687e0d..0000000 --- a/COMMITMENT +++ /dev/null @@ -1,46 +0,0 @@ -GPL Cooperation Commitment -Version 1.0 - -Before filing or continuing to prosecute any legal proceeding or claim -(other than a Defensive Action) arising from termination of a Covered -License, we commit to extend to the person or entity ('you') accused -of violating the Covered License the following provisions regarding -cure and reinstatement, taken from GPL version 3. As used here, the -term 'this License' refers to the specific Covered License being -enforced. - - However, if you cease all violation of this License, then your - license from a particular copyright holder is reinstated (a) - provisionally, unless and until the copyright holder explicitly - and finally terminates your license, and (b) permanently, if the - copyright holder fails to notify you of the violation by some - reasonable means prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is - reinstated permanently if the copyright holder notifies you of the - violation by some reasonable means, this is the first time you - have received notice of violation of this License (for any work) - from that copyright holder, and you cure the violation prior to 30 - days after your receipt of the notice. - -We intend this Commitment to be irrevocable, and binding and -enforceable against us and assignees of or successors to our -copyrights. - -Definitions - -'Covered License' means the GNU General Public License, version 2 -(GPLv2), the GNU Lesser General Public License, version 2.1 -(LGPLv2.1), or the GNU Library General Public License, version 2 -(LGPLv2), all as published by the Free Software Foundation. - -'Defensive Action' means a legal proceeding or claim that We bring -against you in response to a prior proceeding or claim initiated by -you or your affiliate. - -'We' means each contributor to this repository as of the date of -inclusion of this file, including subsidiaries of a corporate -contributor. - -This work is available under a Creative Commons Attribution-ShareAlike -4.0 International license (https://creativecommons.org/licenses/by-sa/4.0/). diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d159169..0000000 --- a/LICENSE +++ /dev/null @@ -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. - - - Copyright (C) - - 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. - - , 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 --git a/README.md b/README.md index 091885b..bd55c47 100644 --- a/README.md +++ b/README.md @@ -1,3 +1 @@ -# spamassassin - -Repository for spamassassin CI tests \ No newline at end of file +Public tests have been moved to: https://gitlab.com/redhat/centos-stream/tests/ diff --git a/Regression/bz1211696-razor_timeout-causes-warnings/local.cf b/Regression/bz1211696-razor_timeout-causes-warnings/local.cf deleted file mode 100644 index f6382fb..0000000 --- a/Regression/bz1211696-razor_timeout-causes-warnings/local.cf +++ /dev/null @@ -1,11 +0,0 @@ -# These values can be overridden by editing ~/.spamassassin/user_prefs.cf -# (see spamassassin(1) for details) - -# These should be safe assumptions and allow for simple visual sifting -# without risking lost emails. - -required_hits 5 -report_safe 0 -rewrite_header Subject [SPAM] -razor_timeout 10 - diff --git a/Regression/bz1211696-razor_timeout-causes-warnings/main.fmf b/Regression/bz1211696-razor_timeout-causes-warnings/main.fmf deleted file mode 100644 index be54a3b..0000000 --- a/Regression/bz1211696-razor_timeout-causes-warnings/main.fmf +++ /dev/null @@ -1,26 +0,0 @@ -summary: Usage of razor_timeout leads to warnings and is being skipped. -description: | - Related bugs: - https://bugzilla.redhat.com/show_bug.cgi?id=1211696 -author: Frantisek Sumsal -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -enabled: true -tag: - - Tier1 -tier: '1' -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1211696 -adjust+: - - enabled: false - when: distro < rhel-6 - continue: false -extra-nitrate: TC#0488602 -extra-summary: /CoreOS/spamassassin/Regression/bz1211696-razor_timeout-causes-warnings -extra-task: /CoreOS/spamassassin/Regression/bz1211696-razor_timeout-causes-warnings -id: 5d882458-462b-424b-93ba-1aade9148827 diff --git a/Regression/bz1211696-razor_timeout-causes-warnings/runtest.sh b/Regression/bz1211696-razor_timeout-causes-warnings/runtest.sh deleted file mode 100755 index 231f952..0000000 --- a/Regression/bz1211696-razor_timeout-causes-warnings/runtest.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Regression/bz1211696-razor_timeout-causes-warnings -# Description: Usage of razor_timeout leads to warnings and is being skipped. -# Author: Frantisek Sumsal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2015 Red Hat, Inc. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TESTDIR=$(pwd)" - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlFileBackup "/etc/mail/spamassassin/local.cf" - rlRun "cp -f $TESTDIR/local.cf /etc/mail/spamassassin/local.cf" - rlPhaseEnd - - rlPhaseStartTest - rlRun "spamassassin --lint &> output.log" 0-255 - rlAssertNotGrep "failed to parse line, skipping, in \"/etc/mail/spamassassin/local.cf\": razor_timeout" "output.log" - rlRun "cat output.log" - rlPhaseEnd - - rlPhaseStartCleanup - rlFileRestore - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Regression/bz1607372-spamassassin-Drop-GeoIP-support/main.fmf b/Regression/bz1607372-spamassassin-Drop-GeoIP-support/main.fmf deleted file mode 100644 index 1ee12fb..0000000 --- a/Regression/bz1607372-spamassassin-Drop-GeoIP-support/main.fmf +++ /dev/null @@ -1,23 +0,0 @@ -summary: Test for BZ#1607372 (spamassassin Drop GeoIP support) -description: | - Bug summary: spamassassin: Drop GeoIP support - Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1607372 -author: Patrik Mosko -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 1m -enabled: true -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1607372 -adjust+: - - enabled: false - when: distro < rhel-8 - continue: false -extra-nitrate: TC#0575742 -extra-summary: /CoreOS/spamassassin/Regression/bz1607372-spamassassin-Drop-GeoIP-support -extra-task: /CoreOS/spamassassin/Regression/bz1607372-spamassassin-Drop-GeoIP-support -id: 7ce74654-0434-470d-864c-808bd0b8ac79 diff --git a/Regression/bz1607372-spamassassin-Drop-GeoIP-support/runtest.sh b/Regression/bz1607372-spamassassin-Drop-GeoIP-support/runtest.sh deleted file mode 100755 index b2d475e..0000000 --- a/Regression/bz1607372-spamassassin-Drop-GeoIP-support/runtest.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Regression/bz1607372-spamassassin-Drop-GeoIP-support -# Description: Test for BZ#1607372 (spamassassin Drop GeoIP support) -# Author: Patrik Mosko -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2018 Red Hat, Inc. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlIsRHEL '>=8' && rlAssertNotRpm "GeoIP" # GeoIP was removed from RHEL-8 - rlPhaseEnd - - rlPhaseStartTest - rlRun "grep -iv geo <(rpm -q --requires spamassassin)" 0 "spamassassin shouldn't require GeoIP package" - rlPhaseEnd - -rlJournalPrintText -rlJournalEnd - diff --git a/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed/main.fmf b/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed/main.fmf deleted file mode 100644 index a984c17..0000000 --- a/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed/main.fmf +++ /dev/null @@ -1,25 +0,0 @@ -summary: Test for BZ#1630362 (Obsolete channel sought.conf should be removed) -description: | - Bug summary: Obsolete channel sought.conf should be removed - Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1630362 -author: Ondrej Lysonek -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -enabled: true -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1630362 -adjust+: - - enabled: false - when: distro < rhel-8 - continue: false -extra-nitrate: TC#0607902 -extra-summary: - /CoreOS/spamassassin/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed -extra-task: - /CoreOS/spamassassin/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed -id: 7e1ab153-5079-4be7-be70-cf7530283a74 diff --git a/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed/runtest.sh b/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed/runtest.sh deleted file mode 100755 index 79b3aea..0000000 --- a/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed/runtest.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Regression/bz1630362-Obsolete-channel-sought-conf-should-be-removed -# Description: Test for BZ#1630362 (Obsolete channel sought.conf should be removed) -# Author: Ondřej Lysoněk -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 Red Hat, Inc. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest - rlRun "rpm -ql spamassassin | grep -i sought" 1 "SOUGHT channel should not get installed" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to/main.fmf b/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to/main.fmf deleted file mode 100644 index deb8046..0000000 --- a/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to/main.fmf +++ /dev/null @@ -1,32 +0,0 @@ -summary: Test for BZ#1787382 (Add support for SHA-256/SHA512 signatures to) -description: | - Bug summary: Add support for SHA-256/SHA512 signatures to sa-update - Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1787382 -author: Ondrej Lysonek -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin - - rng-tools - - gnupg2 - - bind - - httpd -duration: 40m -enabled: true -tag: - - Tier3 -tier: '3' -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1787382 -adjust+: - - enabled: false - when: distro < rhel-7 - continue: false -extra-nitrate: TC#0605445 -extra-summary: - /CoreOS/spamassassin/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to -extra-task: - /CoreOS/spamassassin/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to -id: d39b420a-9f40-46f6-831f-fbdc247d476f diff --git a/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to/runtest.sh b/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to/runtest.sh deleted file mode 100755 index 1a69b6f..0000000 --- a/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to/runtest.sh +++ /dev/null @@ -1,219 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Regression/bz1787382-Add-support-for-SHA-256-SHA512-signatures-to -# Description: Test for BZ#1787382 (Add support for SHA-256/SHA512 signatures to) -# Author: Ondřej Lysoněk -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 Red Hat, Inc. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup 'Prepare for sa-update using --install and local files' - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlLog "Available entropy: $(cat /proc/sys/kernel/random/entropy_avail)" - rlServiceStart "rngd" - rngd -r /dev/urandom -o /dev/random - sleep 60 - rlLog "Available entropy: $(cat /proc/sys/kernel/random/entropy_avail)" - rlRun 'rlFileBackup --clean /var/lib/spamassassin/' - rlRun 'rlFileBackup --clean /etc/mail/spamassassin/sa-update-keys' - rlRun 'rlFileBackup --clean /root/.spamassassin' - cat > key-gen-attrs <" | cut -d: -f5 | tail -c9 > keyid' - rlRun "gpg2 --batch --homedir $gpgdir --armor --export > key.asc" - rlRun 'sa-update --import key.asc' - - rlRun "echo '# my rule file' > rules.cf" - # Make sure the revision number in the archive name is bigger - # than any released rules tarball. - rules_revision='9999999' - tarball="$rules_revision.tar.gz" - rlRun "tar czf $tarball rules.cf" - rlRun "gpg2 --batch --homedir $gpgdir --armor --detach-sign $tarball" - rlPhaseEnd - - rlPhaseStartTest 'SHA1, SHA256 and SHA512 signatures present' - rlRun 'rm -rf /var/lib/spamassassin/*' - rlRun "rm -f $tarball.sha*" - rlRun "sha1sum $tarball > $tarball.sha1" - rlRun "sha256sum $tarball > $tarball.sha256" - rlRun "sha512sum $tarball > $tarball.sha512" - - rlRun "sa-update --channel foo --gpgkey $(< keyid) --install $tarball" - rlRun 'ls /var/lib/spamassassin/*/foo/rules.cf' - rlPhaseEnd - - rlPhaseStartTest 'SHA256 and SHA512 signatures present' - rlRun 'rm -rf /var/lib/spamassassin/*' - rlRun "rm -f $tarball.sha*" - rlRun "sha256sum $tarball > $tarball.sha256" - rlRun "sha512sum $tarball > $tarball.sha512" - - rlRun "sa-update --channel foo --gpgkey $(< keyid) --install $tarball" - rlRun 'ls /var/lib/spamassassin/*/foo/rules.cf' - rlPhaseEnd - -# SHA-1 signatures are not supported in spamassassin from RHEL-8 -if rlIsRHEL 7; then - rlPhaseStartTest 'Only SHA1 signature present' - rlRun 'rm -rf /var/lib/spamassassin/*' - rlRun "rm -f $tarball.sha*" - rlRun "sha1sum $tarball > $tarball.sha1" - - rlRun "sa-update --channel foo --gpgkey $(< keyid) --install $tarball" - rlRun 'ls /var/lib/spamassassin/*/foo/rules.cf' - rlPhaseEnd -fi - - rlPhaseStartTest 'Only SHA512 signature present' - rlRun 'rm -rf /var/lib/spamassassin/*' - rlRun "rm -f $tarball.sha*" - rlRun "sha512sum $tarball > $tarball.sha512" - - rlRun "sa-update --channel foo --gpgkey $(< keyid) --install $tarball" - rlRun 'ls /var/lib/spamassassin/*/foo/rules.cf' - rlPhaseEnd - - # Has to be in one phase because beaker does not survive non functional network on phase end. - rlPhaseStartSetup 'Prepare for remote sa-update using http://channel/' - rlRun 'rlFileBackup --clean /etc/named.conf' - rlRun 'rlFileBackup --clean /etc/resolv.conf' - rlRun 'rlFileBackup --clean /var/www/html' - rlRun 'rlFileBackup --clean /etc/rndc.key' - rlRun 'rlFileBackup --clean /var/named/data/named.run' - - rlRun "cp $tarball $tarball.asc /var/www/html/" - # Remove unneeded files so that they don't get in our way by - # accident - rlRun "rm -f ${tarball}*" - - read verA verB verC < <(spamassassin -V | grep 'SpamAssassin version' | grep -o '[0-9.]*' | sed -e 's/\./ /g' ) - cat >> /etc/named.conf <> /var/named/mychannel.foo.zone <> /var/www/html/MIRRORED.BY < /etc/resolv.conf' - rlRun 'rlServiceStart httpd' - - rlLog 'Remote channel test; SHA1, SHA256 and SHA512 signatures present' - rlRun 'rm -rf /var/lib/spamassassin/*' - - rlRun 'pushd /var/www/html' - rlRun "rm -f $tarball.sha*" - rlRun "sha1sum $tarball > $tarball.sha1" - rlRun "sha256sum $tarball > $tarball.sha256" - rlRun "sha512sum $tarball > $tarball.sha512" - rlRun 'popd' - - rlRun "sa-update --channel mychannel.foo --gpgkey $(< keyid)" - rlRun 'ls /var/lib/spamassassin/*/mychannel_foo/rules.cf' - - rlLog 'Remote channel test; SHA256 and SHA512 signatures present' - rlRun 'rm -rf /var/lib/spamassassin/*' - - rlRun 'pushd /var/www/html' - rlRun "rm -f $tarball.sha*" - rlRun "sha256sum $tarball > $tarball.sha256" - rlRun "sha512sum $tarball > $tarball.sha512" - rlRun 'popd' - - rlRun "sa-update --channel mychannel.foo --gpgkey $(< keyid)" - rlRun 'ls /var/lib/spamassassin/*/mychannel_foo/rules.cf' - - # SHA-1 signatures are not supported in spamassassin from RHEL-8 - if rlIsRHEL 7; then - rlLog 'Remote channel test; Only SHA1 signature present' - rlRun 'rm -rf /var/lib/spamassassin/*' - - rlRun 'pushd /var/www/html' - rlRun "rm -f $tarball.sha*" - rlRun "sha1sum $tarball > $tarball.sha1" - rlRun 'popd' - - rlRun "sa-update --channel mychannel.foo --gpgkey $(< keyid)" - rlRun 'ls /var/lib/spamassassin/*/mychannel_foo/rules.cf' - fi - - rlLog 'Remote channel test; Only SHA512 signature present' - rlRun 'rm -rf /var/lib/spamassassin/*' - - rlRun 'pushd /var/www/html' - rlRun "rm -f $tarball.sha*" - rlRun "sha512sum $tarball > $tarball.sha512" - rlRun 'popd' - - rlRun "sa-update --channel mychannel.foo --gpgkey $(< keyid)" - rlRun 'ls /var/lib/spamassassin/*/mychannel_foo/rules.cf' - rlRun 'rlServiceRestore named' - sleep 20 - - rlPhaseStartCleanup - rlRun 'rlFileRestore' - rlRun 'rm -f /var/named/mychannel.foo.zone' - rlRun 'rlServiceRestore httpd' - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Regression/bz1947442-config-files-requiere-old-version-after-update/main.fmf b/Regression/bz1947442-config-files-requiere-old-version-after-update/main.fmf deleted file mode 100644 index 9b7161a..0000000 --- a/Regression/bz1947442-config-files-requiere-old-version-after-update/main.fmf +++ /dev/null @@ -1,26 +0,0 @@ -summary: Test for BZ#1947442 (configuration files demand older version of spamassassin) -description: '' -author: Richard Lescak -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -enabled: true -tag: - - Tier1 -tier: '1' -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1947442 -adjust+: - - enabled: false - when: distro < rhel-6 - continue: false -extra-nitrate: TC#0611258 -extra-summary: - /CoreOS/spamassassin/Regression/bz1947442-config-files-require-old-version-after-update -extra-task: - /CoreOS/spamassassin/Regression/bz1947442-config-files-require-old-version-after-update -id: e246eaee-e5d7-4949-872b-bf8d86f840d7 diff --git a/Regression/bz1947442-config-files-requiere-old-version-after-update/runtest.sh b/Regression/bz1947442-config-files-requiere-old-version-after-update/runtest.sh deleted file mode 100755 index 91f1a76..0000000 --- a/Regression/bz1947442-config-files-requiere-old-version-after-update/runtest.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Regression/bz1947442-config-files-requiere-old-version-after-update -# Description: sages from spamassassin after update from 3.004004 to 3.004005 (configuration files demand older version) -# Author: Richard Lescak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 Red Hat, Inc. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest - rlRun "/usr/bin/spamassassin -t &> output.log /dev/null" 0-255 "Getting output from spamassassin" - rlAssertNotGrep "requires version [0-9]*\.[0-9]+ of SpamAssassin, but this is code version [0-9]*\.[0-9]+" "output.log" -Eo - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/main.fmf b/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/main.fmf deleted file mode 100644 index 701d9a2..0000000 --- a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/main.fmf +++ /dev/null @@ -1,28 +0,0 @@ -summary: Test for BZ#892348 (SpamAssassin does not detect HTTP(S) URL multiline) -description: | - Bug summary: SpamAssassin does not detect HTTP(S) URL multiline mismatches in base64 encoded e-mail - Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=892348 -author: Robin Hack -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -enabled: true -tag: - - Tier1 -tier: '1' -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=892348 - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=893614 - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1017136 - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1017138 - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1035642 -extra-nitrate: TC#0268899 -extra-summary: - /CoreOS/spamassassin/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline -extra-task: - /CoreOS/spamassassin/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline -id: 1f96f494-076d-4c68-8fbb-fa822bbb3d11 diff --git a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/runtest.sh b/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/runtest.sh deleted file mode 100755 index 9d235b3..0000000 --- a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/runtest.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline -# Description: Test for BZ#892348 (SpamAssassin does not detect HTTP(S) URL multiline) -# Author: Robin Hack -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2013 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlFileBackup ~/.spamassassin/user_prefs - rlRun "mkdir -p ~/.spamassassin/" 0-255 "Create SA config dir" - rlRun "cat ./spam-config > ~/.spamassassin/user_prefs" 0 "Setup SA user prefs" - rlPhaseEnd - - rlPhaseStartTest - rlRun "xzcat ./sample1.eml.xz | spamassassin | grep HTTPS_HTTP_MISMATCH" 0 "Should contain HTTPS_HTTP_MISMATCH" - rlRun "xzcat ./sample2.eml.xz | spamassassin | grep HTTPS_HTTP_MISMATCH" 0 "Should contain HTTPS_HTTP_MISMATCH" - rlRun "xzcat ./sample3.eml.xz | spamassassin | grep HTTPS_HTTP_MISMATCH" 0 "Should contain HTTPS_HTTP_MISMATCH" - rlPhaseEnd - - rlPhaseStartCleanup - rlFileRestore - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample1.eml.xz b/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample1.eml.xz deleted file mode 100644 index 23a9d79..0000000 Binary files a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample1.eml.xz and /dev/null differ diff --git a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample2.eml.xz b/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample2.eml.xz deleted file mode 100644 index 0a47ffe..0000000 Binary files a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample2.eml.xz and /dev/null differ diff --git a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample3.eml.xz b/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample3.eml.xz deleted file mode 100644 index ee20128..0000000 Binary files a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/sample3.eml.xz and /dev/null differ diff --git a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/spam-config b/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/spam-config deleted file mode 100644 index e991609..0000000 --- a/Regression/bz892348-SpamAssassin-does-not-detect-HTTP-S-URL-multiline/spam-config +++ /dev/null @@ -1,4 +0,0 @@ -body HTTPS_HTTP_MISMATCH eval:check_https_http_mismatch(1,10) -describe HTTPS_HTTP_MISMATCH HTTPSMismatch -score HTTPS_HTTP_MISMATCH 7.0 - diff --git a/Regression/outlook-express-xp-sp3/main.fmf b/Regression/outlook-express-xp-sp3/main.fmf deleted file mode 100644 index 3496b6e..0000000 --- a/Regression/outlook-express-xp-sp3/main.fmf +++ /dev/null @@ -1,24 +0,0 @@ -summary: checks if spamassing has FORGED_MUA_OUTLOOK rule fixed to not fire on messages - generated by OE from WinXP SP3 -description: |+ - Test Name: outlook-express-xp-sp3 - Location: /CoreOS/spamassassin/Regression/outlook-express-xp-sp3 - - Short Description: checks if spamassing has FORGED_MUA_OUTLOOK rule fixed to not fire on messages generated by OE from WinXP SP3 - -author: Ales Zelinka -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -enabled: true -tag: - - Tier3 -tier: '3' -extra-nitrate: TC#0058416 -extra-summary: /CoreOS/spamassassin/Regression/outlook-express-xp-sp3 -extra-task: /CoreOS/spamassassin/Regression/outlook-express-xp-sp3 -id: 4e2db0f7-5dc5-4223-b854-6b31850d3299 diff --git a/Regression/outlook-express-xp-sp3/otlak.mail b/Regression/outlook-express-xp-sp3/otlak.mail deleted file mode 100644 index 6a1318c..0000000 --- a/Regression/outlook-express-xp-sp3/otlak.mail +++ /dev/null @@ -1,78 +0,0 @@ -From jon@e-nox.net Tue Mar 11 17:06:25 2008 -Return-Path: -Received: from ppsw-5.csi.cam.ac.uk (ppsw-5-intramail.csi.cam.ac.uk [192.168.128.135]) - by cyrus-27.csi.private.cam.ac.uk (Cyrus v2.3.11) with LMTPA; - Tue, 11 Mar 2008 17:06:25 +0000 -X-Sieve: CMU Sieve 2.3 -X-Cam-SpamScore: ssss -X-Cam-SpamDetails: scanned, SpamAssassin-3.2.3 (score=4.2, - FORGED_MUA_OUTLOOK 4.20, STOX_REPLY_TYPE 0.00) -X-Cam-AntiVirus: Not scanned -X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ -Received: from kilo.fastwebhosting.net ([91.102.64.140]:37062) - by ppsw-5.csi.cam.ac.uk (mx.cam.ac.uk [131.111.8.145]:25) - with esmtp id 1JZ7vi-0005a4-JF (Exim 4.67) for postmaster@hermes.cam.ac.uk - (return-path ); Tue, 11 Mar 2008 17:06:23 +0000 -Received: (qmail 7541 invoked from network); 11 Mar 2008 17:06:22 +0000 -Received: from cpc1-cmbg6-0-0-cust343.cmbg.cable.ntl.com (HELO node3) (81.101.137.88) - by kilo.fastwebhosting.net with SMTP; 11 Mar 2008 17:06:22 +0000 -Message-ID: -From: "Jon Heras" -To: -References: -Subject: Re: Ref 27700: SpamAssasin problem -Date: Tue, 11 Mar 2008 17:06:22 -0000 -MIME-Version: 1.0 -Content-Type: text/plain; - format=flowed; - charset="iso-8859-1"; - reply-type=original -Content-Transfer-Encoding: 7bit -X-Priority: 3 -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook Express 6.00.3790.3959 -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.4133 - -Hi Tony, - -I'm using Outlook Express 6.00.3790.3959 on Windows XP 64-bit - -My email is provided by www.ehosting.com (who are probably the same company -as fastwebhosting.net), and they require me to use authentication on the -outgoing server. - -Cheers, - - Jon - - - - ------ Original Message ----- -From: "Tony Finch" -To: "Jon Heras" -Cc: -Sent: Tuesday, March 11, 2008 2:35 PM -Subject: Re: Ref 27700: SpamAssasin problem - - ->> I keep having my emails filtered by the University spam filter, giving ->> the ->> "FORGED_MUA_OUTLOOK" reason (see below). I'm using Outlook Express, and ->> I ->> believe it's being incorrectly identified as trying to spoof an Outlook ->> ID. ->> A quick google shows bug issues with an old version of Spam Assasin, and ->> gives various workarounds - I was hoping you could look into this? Is ->> there ->> any additional information you need? -> -> How are you sending email? Your message has trace lines from -> fastwebhosting.net to our systems, but it looks like whatever is making -> the message look suspicious is happening just before that, on the machine -> that sent the message to fastwebhosting.net. -> -> -- -> postmaster@hermes.cam.ac.uk - - diff --git a/Regression/outlook-express-xp-sp3/runtest.sh b/Regression/outlook-express-xp-sp3/runtest.sh deleted file mode 100755 index 834fe27..0000000 --- a/Regression/outlook-express-xp-sp3/runtest.sh +++ /dev/null @@ -1,42 +0,0 @@ -# runtest.sh - outlook-express-xp-sp3 -# Author: Ales Zelinka -# Location: /CoreOS/spamassassin/Regression/outlook-express-xp-sp3/runtest.sh - -# Description: checks if spamassing has FORGED_MUA_OUTLOOK rule fixed to not fire on messages generated by OE from WinXP SP3 - -# Copyright (c) 2008 Red Hat, Inc. All rights reserved. This copyrighted material -# is made available to anyone wishing to use, modify, copy, or -# redistribute it subject to the terms and conditions of the GNU General -# Public License v.2. -# -# 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. - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE=spamassassin - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest Test - rlRun "spamassassin < otlak.mail |grep 'X-Spam-Status.*FORGED_MUA_OUTLOOK'" 1 "ham message did not fire FORGED_MUA_OUTLOOK" - rlCreateLogFromJournal > ${OUTPUTFILE} - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Regression/store-bayes-tokens-in-mariadb/bayes_mysql.sql b/Regression/store-bayes-tokens-in-mariadb/bayes_mysql.sql deleted file mode 100644 index 3a2440f..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/bayes_mysql.sql +++ /dev/null @@ -1,47 +0,0 @@ --- bayes_mysql.sql - -CREATE TABLE bayes_expire ( - id int(11) NOT NULL default '0', - runtime int(11) NOT NULL default '0', - PRIMARY KEY (id) -) ENGINE=InnoDB; - -CREATE TABLE bayes_global_vars ( - variable varchar(30) NOT NULL default '', - value varchar(200) NOT NULL default '', - PRIMARY KEY (variable) -) ENGINE=InnoDB; - -INSERT INTO bayes_global_vars VALUES ('VERSION','3'); - -CREATE TABLE bayes_seen ( - id int(11) NOT NULL default '0', - msgid varchar(200) binary NOT NULL default '', - flag char(1) NOT NULL default '', - PRIMARY KEY (id,msgid) -) ENGINE=InnoDB; - -CREATE TABLE bayes_token ( - id int(11) NOT NULL default '0', - token binary(5) NOT NULL default '', - spam_count int(11) NOT NULL default '0', - ham_count int(11) NOT NULL default '0', - atime int(11) NOT NULL default '0', - PRIMARY KEY (id, token), - INDEX bayes_token_idx1 (id, atime) -) ENGINE=InnoDB; - -CREATE TABLE bayes_vars ( - id int(11) NOT NULL AUTO_INCREMENT, - username varchar(200) NOT NULL default '', - spam_count int(11) NOT NULL default '0', - ham_count int(11) NOT NULL default '0', - token_count int(11) NOT NULL default '0', - last_expire int(11) NOT NULL default '0', - last_atime_delta int(11) NOT NULL default '0', - last_expire_reduce int(11) NOT NULL default '0', - oldest_token_age int(11) NOT NULL default '2147483647', - newest_token_age int(11) NOT NULL default '0', - PRIMARY KEY (id), - UNIQUE bayes_vars_idx1 (username) -) ENGINE=InnoDB; diff --git a/Regression/store-bayes-tokens-in-mariadb/create_db_user.sql b/Regression/store-bayes-tokens-in-mariadb/create_db_user.sql deleted file mode 100644 index 2cc2ef6..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/create_db_user.sql +++ /dev/null @@ -1,6 +0,0 @@ --- create_db_user.sql - -CREATE DATABASE spamassassin; -CREATE USER 'spamassassin'@'localhost' IDENTIFIED BY 'password'; -GRANT ALL PRIVILEGES ON spamassassin.* TO 'spamassassin'@'localhost'; -FLUSH PRIVILEGES; diff --git a/Regression/store-bayes-tokens-in-mariadb/drop_tables_and_db.sql b/Regression/store-bayes-tokens-in-mariadb/drop_tables_and_db.sql deleted file mode 100644 index c29aed4..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/drop_tables_and_db.sql +++ /dev/null @@ -1,13 +0,0 @@ --- drop_tables_and_db.sql - -USE spamassassin; - -DROP TABLE IF EXISTS bayes_expire; -DROP TABLE IF EXISTS bayes_global_vars; -DROP TABLE IF EXISTS bayes_seen; -DROP TABLE IF EXISTS bayes_token; -DROP TABLE IF EXISTS bayes_vars; - -DROP DATABASE IF EXISTS spamassassin; -DROP USER IF EXISTS 'spamassassin'@'localhost'; -FLUSH PRIVILEGES; diff --git a/Regression/store-bayes-tokens-in-mariadb/local.cf b/Regression/store-bayes-tokens-in-mariadb/local.cf deleted file mode 100644 index cf30fad..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/local.cf +++ /dev/null @@ -1,7 +0,0 @@ -# local.cf - -bayes_store_module Mail::SpamAssassin::BayesStore::MySQL -bayes_sql_dsn DBI:MariaDB:database=spamassassin;host=localhost -bayes_sql_username spamassassin -bayes_sql_password password -bayes_sql_override_username amavis \ No newline at end of file diff --git a/Regression/store-bayes-tokens-in-mariadb/main.fmf b/Regression/store-bayes-tokens-in-mariadb/main.fmf deleted file mode 100644 index a7160ae..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/main.fmf +++ /dev/null @@ -1,37 +0,0 @@ -summary: Test store bayes token in mariadb -description: '' -author: Frantisek Hrdina -component: - - spamassassin -test: ./test.sh -framework: beakerlib -recommend: - - spamassassin - - mariadb-server - - mariadb mariadb-connector-c - - mariadb-connector-c-devel - - perl-DBI - - perl-DBD-MySQL - - sscg -duration: 5m -enabled: true -tag: - - Tier1 -tier: '1' -link: - - verifies: https://issues.redhat.com/browse/RHEL-43418 -adjust+: - - enabled: false - when: distro < rhel-9 - continue: false - - enabled: false - when: distro < centos-stream-9 - continue: false - - enabled: false - when: distro >= rhel-10 - continue: false - - enabled: false - when: distro >= centos-stream-10 - continue: false -extra-nitrate: TC#0617651 -id: c9219396-c493-4bf9-8f56-0532ee3cdc81 \ No newline at end of file diff --git a/Regression/store-bayes-tokens-in-mariadb/mariadb-SSL-sscg-setup.sh b/Regression/store-bayes-tokens-in-mariadb/mariadb-SSL-sscg-setup.sh deleted file mode 100755 index cbbc423..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/mariadb-SSL-sscg-setup.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# This script will generate a simple SSL certificates that can be used for testing the SSL/TLS connections -# to the database -# It uses the `sscg` tool for generating the keys and certificates - -hostname=$(hostname) - -DIR=$(mktemp -d) -pushd "$DIR" - -# Generate SSL certificate and keys -sscg --hostname=$hostname --ca-mode=0644 --ca-key-mode=0640 --cert-key-mode=0640 - -# Move them to appropriate path -mv ca.crt /etc/pki/tls/certs/ -mv service-key.pem /etc/pki/tls/private/ -mv service.pem /etc/pki/tls/certs/ - -# Fix group and reset selinux permissions -chgrp mysql /etc/pki/tls/private/service-key.pem -restorecon -Rv /etc/pki/tls - -# Add configuration for mariadb client -MARIADB_CONF=/etc/my.cnf.d/zzz-mariadb-ssl.cnf -echo "[mariadb]" > $MARIADB_CONF -echo "ssl_cert = /etc/pki/tls/certs/service.pem" >> $MARIADB_CONF -echo "ssl_key = /etc/pki/tls/private/service-key.pem" >> $MARIADB_CONF -echo "ssl_ca = /etc/pki/tls/certs/ca.crt" >> $MARIADB_CONF - -popd -rm -rf "$DIR" diff --git a/Regression/store-bayes-tokens-in-mariadb/spam.txt b/Regression/store-bayes-tokens-in-mariadb/spam.txt deleted file mode 100644 index e6d12e2..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/spam.txt +++ /dev/null @@ -1,30 +0,0 @@ -Delivered-To: lists-bikini@bruce-guenter.dyndns.org -Received: (qmail 16879 invoked from network); 8 Jan 2017 08:13:51 -0000 -Received: from localhost (localhost [127.0.0.1]) - by bruce-guenter.dyndns.org ([192.168.1.2]); 08 Jan 2017 08:13:51 -0000 -Received: from zak.futurequest.net ([127.0.0.1]) - by localhost ([127.0.0.1]) - with SMTP via TCP; 08 Jan 2017 08:13:51 -0000 -Received: (qmail 23999 invoked from network); 8 Jan 2017 08:13:50 -0000 -Received: from dlhbyjp.ijagdad7.net (113.212.140.216) - by zak.futurequest.net with SMTP; 8 Jan 2017 08:13:50 -0000 -Received: from hisxyokcsn (feotrwa.ijagdad7.net [113.212.140.163]) - by dkocemk.ijagdad7.net (Postfix) with ESMTP id 5101F709478 - for ; Sun, 8 Jan 2017 17:13:49 +0900 (JST) -Received: from localhost (61-63-36-host226.kbtelecom.net.tw [61.63.36.226]) - by hisxyokcsn (Postfix) with ESMTP id 2646F5000B7 - for ; Sun, 8 Jan 2017 17:13:49 +0900 (JST) -To: lists-bikini@bruce-guenter.dyndns.org -Message-ID: -Date: Sun, 08 Jan 2017 17:13:49 +0900 -From: "guide@mpw9ukmq.net" -Subject: =?Shift_JIS?B?gXmTwZXKlrOXv5LKkE2ShoF6ia2SUIjKgsaCooKklJyR5YLIi+CKeoLFgreCqoFBjoSCqpPGjqmCxZGXi+CC8JJTk5aCs4K5gsSSuIKrgtyCt4FCgXmOypBek1mVdJdMguiBeg==?=!!! -MIME-Version: 1.0 -Content-Type: text/plain; charset=Shift_JIS -Content-Transfer-Encoding: base64 - -j6yRgZDskLmOcYFAgrOC8YKpgueDgYNig1qBW4NXgqqTzYKrgtyCtYK9DQoNCluDXoNDg2eDi10N -CoF5k8GVypazl7+SypBNkoaBeomtklCIyoLGgqKCpJSckeWCyIvginqCxYK3gqqBQY6EgqqTxo6p -gsWRl4vggvCSU5OWgrOCuYLEkriCq4LcgreBQoF5jsqQXpNZlXSXTILogXoNCg0KW5GxgquC8JPH -gt5dDQpodHRwOi8vaGNydm1jbWJldDQ0cnZ0aGhtdHVqaC5tcHc5dWttcS5uZXQNCg0KW47zkE2D -e4Nig06DWF0NCmh0dHA6Ly9oY3J2bWNtYmV0a2gubXB3OXVrbXEubmV0 \ No newline at end of file diff --git a/Regression/store-bayes-tokens-in-mariadb/test.sh b/Regression/store-bayes-tokens-in-mariadb/test.sh deleted file mode 100755 index 373985e..0000000 --- a/Regression/store-bayes-tokens-in-mariadb/test.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -DB_NAME="spamassassin" -DB_USER="spamassassin" -DB_PASSWORD="password" -DB_HOST="localhost" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm spamassassin - - rlFileBackup --missing-ok "/var/lib/mysql" - rlFileBackup --missing-ok "/etc/mail/spamassassin" - rlFileBackup --missing-ok "/var/spool/spamassassin" - rlFileBackup --missing-ok "/root/.spamassasin" - - rlRun "./mariadb-SSL-sscg-setup.sh" 0 "Generate simple SSL certificates" - - TestDir=$(pwd) - CREATE_DB_USER_SQL="$TestDir/create_db_user.sql" - CREATE_TABLES_SQL="$TestDir/bayes_mysql.sql" - SPAMASSASSIN_CONFIG="$TestDir/local.cf" - DROP_TABLES_AND_DB_SQL="$TestDir/drop_tables_and_db.sql" - - - rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" - rlRun "pushd $tmp" - rlRun "systemctl start mariadb" 0 "Running mariadb" - rlRun "systemctl enable mariadb" 0 "Enable mariadb service" - -mysql_secure_installation < /tmp/ham.txt - rlRun "sa-learn --ham /tmp/ham.txt" - rlRun "sa-learn -D --spam $TestDir/spam.txt &> sa-learn.log" - - rlAssertGrep "Learned tokens" sa-learn.log - rlAssertNotGrep "dbg: bayes: _put_tokens: SQL error: Column 'id' cannot be null" "sa-learn.log" - rlAssertNotGrep "dbg: bayes: _put_tokens: SQL error: Data too long for column 'token' at row 1" "sa-learn.log" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "mysql -u root -prootpassword < ${DROP_TABLES_AND_DB_SQL}" - rlRun "systemctl stop spamassassin" 0 "Stopping spamassassin" - rlRun "systemctl stop mariadb" 0 "Stopping mariadb" - rlRun "systemctl disable mariadb" 0 "Disable mariadb service" - rlFileRestore - rlRun "popd" - rlRun "rm -r $tmp" 0 "Remove tmp directory" - rlPhaseEnd -rlJournalEnd diff --git a/Sanity/Upstream-test-suite/main.fmf b/Sanity/Upstream-test-suite/main.fmf deleted file mode 100644 index 7a48c28..0000000 --- a/Sanity/Upstream-test-suite/main.fmf +++ /dev/null @@ -1,39 +0,0 @@ -summary: Run the upstream test suite -description: '' -enabled: true -tag: - - Tier1 - - rhel8-buildroot - - rhel-buildroot -tier: '1' -adjust+: - - enabled: false - when: distro < rhel-6 - continue: false - - enabled: false - when: distro > rhel-8 - continue: false - - enabled: false - when: distro > fedora-37 - continue: false - - enabled: false - when: distro > centos-8 - continue: false -author: Ondrej Lysonek -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin - - rpm-build - - perl(Test::Builder) - - perl(Test) - - perl(DBI) - - perl(DBD::mysql) - - perl(Net::DNS::Nameserver) -duration: 60m -extra-nitrate: TC#0608995 -extra-summary: /CoreOS/spamassassin/Sanity/Upstream-test-suite -extra-task: /CoreOS/spamassassin/Sanity/Upstream-test-suite -id: 76ea1290-a0c0-4016-af01-cabc321842db diff --git a/Sanity/Upstream-test-suite/runtest.sh b/Sanity/Upstream-test-suite/runtest.sh deleted file mode 100755 index 4f356fb..0000000 --- a/Sanity/Upstream-test-suite/runtest.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Sanity/Upstream-test-suite -# Description: Run the upstream test suite -# Author: Ondřej Lysoněk -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 Red Hat, Inc. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - - if rlIsRHEL 8 && dnf config-manager --help >/dev/null; then - # Some build dependencies are not in repositories enabled - # by default - dnf config-manager --set-enabled rhel-buildroot - dnf config-manager --set-enabled rhel-CRB - dnf config-manager --set-enabled beaker-CRB - dnf config-manager --set-enabled beaker-buildroot - #not checking return code: 1mt and beaker uses different names for repo - fi - - rm -f ${PACKAGE}*.src.rpm - rlFetchSrcForInstalled $PACKAGE - - if rlIsRHEL; then - rlRun "yum builddep -y ./*.src.rpm" - else - rlRun "yum builddep -y $PACKAGE" - fi - - fname=$(ls $PACKAGE-*) - installed=$(rpm -q $PACKAGE) - rlAssertEquals "Check the installed package matches the downloaded srpm" \ - "${fname%.src.rpm}" "${installed%.*}" - rlFileBackup --clean ~/rpmbuild - rlRun "rm -rf ~/rpmbuild" - rlRun "rpmbuild -rp ./$PACKAGE-*.src.rpm" - # Copy the tests elsewhere to make sure we're running against - # the installed perl modules rather than those in ~/rpmbuild. - rlRun "cp -r ~/rpmbuild/BUILD/*/{t,rules,sample-nonspam.txt,sample-spam.txt} ." - rlRun "mkdir build" - rlRun "cp ~/rpmbuild/BUILD/*/build/parse-rules-for-masses build/" - rlPhaseEnd - - rlPhaseStartTest - rlRun "SPAMASSASSIN_SCRIPT=$(which spamassassin) SPAMC_SCRIPT=$(which spamc) \ - SALEARN_SCRIPT=$(which sa-learn) SPAMD_SCRIPT=$(which spamd) \ - SAAWL_SCRIPT=$(which sa-awl) SACHECKSPAMD_SCRIPT=$(which sa-check_spamd) \ - prove" - rlPhaseEnd - - rlPhaseStartCleanup - rlFileRestore - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Sanity/functionality/main.fmf b/Sanity/functionality/main.fmf deleted file mode 100644 index 3cf3e65..0000000 --- a/Sanity/functionality/main.fmf +++ /dev/null @@ -1,31 +0,0 @@ -summary: tests spamassassin with sample spam files shipped with the binary -description: |+ - Test Name: functionality - Author: Ondrej Hudlicky , Ales Zelinka - Location: /CoreOS/spamassassin/Sanity/functionality - - Short Description: tests spamassassin with sample spam/non-spam files shipped with the binary - -author: - - Ondrej Hudlicky - - Ales Zelinka - - Patrik Mosko -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -enabled: true -tag: - - Tier1 -tier: '1' -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=836952 - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1567073 - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1053061 -extra-nitrate: TC#0051570 -extra-summary: /CoreOS/spamassassin/Sanity/functionality -extra-task: /CoreOS/spamassassin/Sanity/functionality -id: 4bffc844-6221-4df7-8ffa-80be49e0a9a6 diff --git a/Sanity/functionality/runtest.sh b/Sanity/functionality/runtest.sh deleted file mode 100755 index d12b64b..0000000 --- a/Sanity/functionality/runtest.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Sanity/functionality -# Description: tests sample spam/non-spam files shipped within the spamassassin binary -# Author: Ondrej Hudlicky -# Ales Zelinka -# Patrik Mosko -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2008,2020 Red Hat, Inc. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - GSPAM="X-Spam-Status\:\ Yes" - GNOSPAM="X-Spam-Status\:\ No" - - SPAM=`rpm -ql $PACKAGE |grep sample-spam.txt` - NOSPAM=`rpm -ql $PACKAGE |grep sample-nonspam.txt` - rlAssertNotEquals "found sample-spam.txt file" "x" "x$SPAM" - rlAssertNotEquals "found sample-nonspam.txt file" "x" "x$NOSPAM" - - rlServiceStart "spamassassin" - rlPhaseEnd - - rlPhaseStartTest - rlRun "spamc <$SPAM | grep \"$GSPAM\"" 0 "spamc test: spam" - rlRun "spamc <$NOSPAM | grep \"$GNOSPAM\"" 0 "spamc test: nospam" - rlRun "spamassassin <$SPAM | grep \"$GSPAM\"" 0 "spamassassin test: spam" - rlRun "spamassassin <$NOSPAM | grep \"$GNOSPAM\"" 0 "spamassassin test: nospam" - rlPhaseEnd - - rlPhaseStartCleanup - rlServiceRestore "spamassassin" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Sanity/init-script-exit-codes/main.fmf b/Sanity/init-script-exit-codes/main.fmf deleted file mode 100644 index 953129a..0000000 --- a/Sanity/init-script-exit-codes/main.fmf +++ /dev/null @@ -1,26 +0,0 @@ -summary: init script LSB compliance test -description: |4+ - - -enabled: true -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=530957 -tag: - - Tier3 -tier: '3' -adjust+: - - enabled: false - when: distro < rhel-6 - continue: false -author: Ales Zelinka -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 10m -extra-nitrate: TC#0058414 -extra-summary: /CoreOS/spamassassin/Sanity/init-script-exit-codes -extra-task: /CoreOS/spamassassin/Sanity/init-script-exit-codes -id: bf9b87ea-74de-4646-abd3-94c6c91499ec diff --git a/Sanity/init-script-exit-codes/runtest.sh b/Sanity/init-script-exit-codes/runtest.sh deleted file mode 100755 index a264dc4..0000000 --- a/Sanity/init-script-exit-codes/runtest.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/spamassassin/Sanity/init-script-exit-codes -# Description: init script LSB compliance test -# Author: Ales Zelinka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2009 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="spamassassin" -SERVICE="spamassassin" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlServiceStop $SERVICE - rlPhaseEnd - - rlPhaseStartTest "Start" - rlRun "service $SERVICE start" 0 - rlRun "service $SERVICE status --no-pager" 0 - rlRun "service $SERVICE start" 0 - rlRun "service $SERVICE status --no-pager" 0 - rlRun "service $SERVICE restart" 0 - rlRun "service $SERVICE status --no-pager" 0 - rlPhaseEnd - - rlPhaseStartTest "Stop" - rlRun "service $SERVICE stop" 0 - rlRun "service $SERVICE status --no-pager" 3 - rlRun "service $SERVICE stop" 0 - rlRun "service $SERVICE status --no-pager" 3 - rlPhaseEnd - - rlPhaseStartTest "Lock file" - rlRun "touch /var/lock/subsys/$SERVICE" - rlRun "service $SERVICE start" 0 - rlRun "pkill spamd" 0 - rlRun "service $SERVICE status --no-pager" 2,3 - rlPhaseEnd - - rlPhaseStartTest "restarts-reloads" - rlRun "service $SERVICE condrestart" 0 - rlRun "service $SERVICE status --no-pager" 0 - rlPhaseEnd - - rlPhaseStartCleanup - rlServiceRestore $SERVICE - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/Sanity/rules-lint/main.fmf b/Sanity/rules-lint/main.fmf deleted file mode 100644 index e153d59..0000000 --- a/Sanity/rules-lint/main.fmf +++ /dev/null @@ -1,25 +0,0 @@ -summary: checks configs and rule files with --lint param -description: |+ - Test Name: rules-lint - Location: /CoreOS/spamassassin/Sanity/rules-lint - - Short Description: checks configs and rule files with --lint param - -author: Ales Zelinka -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -enabled: true -tag: - - Tier2 -tier: '2' -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=836952 -extra-nitrate: TC#0051572 -extra-summary: /CoreOS/spamassassin/Sanity/rules-lint -extra-task: /CoreOS/spamassassin/Sanity/rules-lint -id: 2f5450c6-fb54-4797-bfa2-b1486307d575 diff --git a/Sanity/rules-lint/runtest.sh b/Sanity/rules-lint/runtest.sh deleted file mode 100755 index 39e3092..0000000 --- a/Sanity/rules-lint/runtest.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# Author: Ales Zelinka -# Location: /CoreOS/spamassassin/Sanity/rules-lint/runtest.sh - -# Description: checks configs and rule files with --lint param - -# Copyright (c) 2008 Red Hat, Inc. All rights reserved. This copyrighted material -# is made available to anyone wishing to use, modify, copy, or -# redistribute it subject to the terms and conditions of the GNU General -# Public License v.2. -# -# 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. - - -PACKAGE=spamassassin -NAME=`basename $TEST` - -# Include rhts environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest Test - rpm -V spamassassin |grep -v local.cf |grep -v '.......T'|grep -q cf$ - rlAssertNotEquals "default rules are present and unchanged" $? 0 - rlRun "spamassassin --lint" 0 "default rules and config are syntactically correct" - rlRun "echo 'mwahahaha-$NAME' >> /etc/mail/spamassassin/local.cf" 0 "adding some garbled line into local.cf file" - rlRun "spamassassin --lint" 1 "damaged config file detected" - rlRun "sed -i '/mwahahaha-$NAME/ d' /etc/mail/spamassassin/local.cf" 0 "fixing local.cf" - RULEFILE=`rpm -ql $PACKAGE |grep drugs |head -1` - rlAssertExists $RULEFILE - rlRun "echo 'haaaamwahahaha-$NAME' >> $RULEFILE" 0 "adding some garbled line into a rule file" - sleep 10 - rlRun "spamassassin --lint" 1 "damaged rule file detected" - rlRun "spamassassin --lint" 1 "damaged rule file detected" - rlRun "spamassassin --lint" 1 "damaged rule file detected" - rlRun "sed -i '/mwahahaha-$NAME/ d' $RULEFILE" 0 "fixing rule file" - rpm -V spamassassin |grep -v local.cf |grep -v '.......T'|grep -q cf$ - rlAssertNotEquals "rules and config are back in shape" $? 0 - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalEnd -rlJournalPrintText diff --git a/Sanity/sa-update/main.fmf b/Sanity/sa-update/main.fmf deleted file mode 100644 index 2afac49..0000000 --- a/Sanity/sa-update/main.fmf +++ /dev/null @@ -1,30 +0,0 @@ -summary: runs sa-update and checks if it exits successfully -description: | - Test Name: sa-update - Location: /CoreOS/spamassassin/Sanity/sa-update - - Short Description: runs sa-update and checks if it exits successfully - - - - Short Description: runs sa-update and checks if it exits successfully -enabled: true -tag: - - Tier3 -tier: '3' -adjust+: - - enabled: false - when: distro < rhel-6 - continue: false -author: Ales Zelinka -component: - - spamassassin -test: ./runtest.sh -framework: beakerlib -recommend: - - spamassassin -duration: 5m -extra-nitrate: TC#0058413 -extra-summary: /CoreOS/spamassassin/Sanity/sa-update -extra-task: /CoreOS/spamassassin/Sanity/sa-update -id: 58b2ef45-1b26-43bc-8d01-697ec3030ccb diff --git a/Sanity/sa-update/runtest.sh b/Sanity/sa-update/runtest.sh deleted file mode 100755 index 6455585..0000000 --- a/Sanity/sa-update/runtest.sh +++ /dev/null @@ -1,38 +0,0 @@ -# runtest.sh - sa-update -# Author: Ales Zelinka -# Location: /CoreOS/spamassassin/Sanity/sa-update/runtest.sh - -# Description: runs sa-update and checks if it exits successfully - -# Copyright (c) 2008 Red Hat, Inc. All rights reserved. This copyrighted material -# is made available to anyone wishing to use, modify, copy, or -# redistribute it subject to the terms and conditions of the GNU General -# Public License v.2. -# -# 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. - - -PACKAGE="spamassassin" - -# Include rhts environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -rlJournalStart - rlPhaseStartSetup "Preparation" - rlAssertRpm $PACKAGE - rlRun "rm -rf /var/lib/spamassassin/" 0 "removing already downloaded uploads" - rlPhaseEnd - - rlPhaseStartTest "Test" - rlRun "sa-update -D" 0 "updating rules" - NEWRULES=`find /var/lib/spamassassin/ |grep \.cf$ |wc -l` - rlAssertGreater "some updated rules found ($NEWRULES)" $NEWRULES 0 - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/main.fmf b/main.fmf deleted file mode 100644 index ebd6395..0000000 --- a/main.fmf +++ /dev/null @@ -1,12 +0,0 @@ -# QE owner -contact: Frantisek Hrdina -component: spamassassin -adjust: - - enabled: false - when: distro >= rhel-10 - continue: false - - enabled: false - when: distro >= centos-stream-10 - continue: false -check: - - how: avc \ No newline at end of file diff --git a/plans/all.fmf b/plans/all.fmf deleted file mode 100644 index e1a0780..0000000 --- a/plans/all.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Run all tests -discover: - how: fmf -execute: - how: tmt diff --git a/plans/others.fmf b/plans/others.fmf deleted file mode 100644 index dae6db4..0000000 --- a/plans/others.fmf +++ /dev/null @@ -1,20 +0,0 @@ -/public: - summary: Public other tests - discover: - how: fmf - filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -multihost' - url: "https://src.fedoraproject.org/tests/spamassassin.git" - execute: - how: tmt - -/internal: - summary: Internal other tests - discover: - how: fmf - filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -multihost' - url: https://gitlab.com/redhat/rhel/tests/spamassassin - adjust: - enabled: false - when: distro == centos-stream or distro == fedora - execute: - how: tmt \ No newline at end of file diff --git a/plans/tier1.fmf b/plans/tier1.fmf deleted file mode 100644 index 8ec2c6a..0000000 --- a/plans/tier1.fmf +++ /dev/null @@ -1,20 +0,0 @@ -/public: - summary: Public Tier1 tests - discover: - how: fmf - filter: 'tier: 1' - url: "https://src.fedoraproject.org/tests/spamassassin.git" - execute: - how: tmt - -/internal: - summary: Internal Tier1 tests - discover: - how: fmf - filter: 'tier: 1' - url: https://gitlab.com/redhat/rhel/tests/spamassassin - adjust: - enabled: false - when: distro == centos-stream or distro == fedora - execute: - how: tmt diff --git a/plans/tier2-tier3.fmf b/plans/tier2-tier3.fmf deleted file mode 100644 index abb9d78..0000000 --- a/plans/tier2-tier3.fmf +++ /dev/null @@ -1,20 +0,0 @@ -/public: - summary: Public Tier2 and Tier3 tests - discover: - how: fmf - filter: 'tier: 2 | tier: 3' - url: "https://src.fedoraproject.org/tests/spamassassin.git" - execute: - how: tmt - -/internal: - summary: Internal Tier2 and Tier3 tests - discover: - how: fmf - filter: 'tier: 2 | tier: 3' - url: https://gitlab.com/redhat/rhel/tests/spamassassin - adjust: - enabled: false - when: distro == centos-stream or distro == fedora - execute: - how: tmt