diff --git a/proftpd-1.3.7a-fix-environment-sensitive-tests-failure.patch b/proftpd-1.3.7a-fix-environment-sensitive-tests-failure.patch new file mode 100644 index 0000000..0b05eb3 --- /dev/null +++ b/proftpd-1.3.7a-fix-environment-sensitive-tests-failure.patch @@ -0,0 +1,84 @@ +diff -ruNa proftpd-1.3.7a/tests/api/netacl.c proftpd-1.3.7a-fix/tests/api/netacl.c +--- proftpd-1.3.7a/tests/api/netacl.c 2020-07-22 01:25:51.000000000 +0800 ++++ proftpd-1.3.7a-fix/tests/api/netacl.c 2021-01-13 14:44:00.679322360 +0800 +@@ -773,8 +773,10 @@ + res = pr_netacl_match(acl, addr); + if (getenv("CI") == NULL && + getenv("TRAVIS") == NULL) { +- fail_unless(res == 1, "Failed to positively match ACL to addr: %s", +- strerror(errno)); ++ if(strcmp(getenv("HOSTNAME"), "localhost") == 0 || strcmp(getenv("HOSTNAME"), "localhost.localdomain") == 0) { ++ fail_unless(res == 1, "Failed to positively match ACL to addr: %s", ++ strerror(errno)); ++ } + } + + if (!have_localdomain) { +@@ -790,8 +790,10 @@ + res = pr_netacl_match(acl, addr); + if (getenv("CI") == NULL && + getenv("TRAVIS") == NULL) { +- fail_unless(res == -1, "Failed to negatively match ACL to addr: %s", +- strerror(errno)); ++ if(strcmp(getenv("HOSTNAME"), "localhost") == 0 || strcmp(getenv("HOSTNAME"), "localhost.localdomain") == 0) { ++ fail_unless(res == -1, "Failed to negatively match ACL to addr: %s", ++ strerror(errno)); ++ } + } + + acl_str = "!www.google.com"; +@@ -816,8 +816,10 @@ + res = pr_netacl_match(acl, addr); + if (getenv("CI") == NULL && + getenv("TRAVIS") == NULL) { +- fail_unless(res == 1, "Failed to positively match ACL to addr: %s", +- strerror(errno)); ++ if(strcmp(getenv("HOSTNAME"), "localhost") == 0 || strcmp(getenv("HOSTNAME"), "localhost.localdomain") == 0) { ++ fail_unless(res == 1, "Failed to positively match ACL to addr: %s", ++ strerror(errno)); ++ } + } + + if (!have_localdomain) { +@@ -833,8 +835,10 @@ + res = pr_netacl_match(acl, addr); + if (getenv("CI") == NULL && + getenv("TRAVIS") == NULL) { +- fail_unless(res == -1, "Failed to negatively match ACL to addr: %s", +- strerror(errno)); ++ if(strcmp(getenv("HOSTNAME"), "localhost") == 0 || strcmp(getenv("HOSTNAME"), "localhost.localdomain") == 0) { ++ fail_unless(res == -1, "Failed to negatively match ACL to addr: %s", ++ strerror(errno)); ++ } + } + + acl_str = "!www.g*g.com"; +diff -ruNa proftpd-1.3.7a/tests/api/netaddr.c proftpd-1.3.7a-fix/tests/api/netaddr.c +--- proftpd-1.3.7a/tests/api/netaddr.c 2021-01-13 14:30:47.467322360 +0800 ++++ proftpd-1.3.7a-fix/tests/api/netaddr.c 2021-01-13 14:42:45.851322360 +0800 +@@ -417,7 +417,9 @@ + if (getenv("CI") == NULL && + getenv("TRAVIS") == NULL) { + /* This test is sensitive the environment. */ +- fail_unless(res == TRUE, "Expected TRUE, got %d", res); ++ if(strcmp(getenv("HOSTNAME"), "localhost") == 0 || strcmp(getenv("HOSTNAME"), "localhost.localdomain") == 0) { ++ fail_unless(res == TRUE, "Expected TRUE, got %d", res); ++ } + } + + flags = PR_NETADDR_MATCH_IP; +@@ -879,9 +881,11 @@ + if (getenv("CI") == NULL && + getenv("TRAVIS") == NULL) { + /* This test is sensitive the environment. */ +- fail_unless(strcmp(res, "localhost") == 0 || +- strcmp(res, "localhost.localdomain") == 0, +- "Expected '%s', got '%s'", "localhost or localhost.localdomain", res); ++ if(strcmp(getenv("HOSTNAME"), "localhost") == 0 || strcmp(getenv("HOSTNAME"), "localhost.localdomain") == 0) { ++ fail_unless(strcmp(res, "localhost") == 0 || ++ strcmp(res, "localhost.localdomain") == 0, ++ "Expected '%s', got '%s'", "localhost or localhost.localdomain", res); ++ } + } + } + END_TEST diff --git a/proftpd.spec b/proftpd.spec index 7943cec..cee7568 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -20,7 +20,7 @@ Name: proftpd Version: 1.3.7c -Release: 1 +Release: 2 Summary: Flexible, stable and highly-configurable FTP server License: GPLv2+ URL: http://www.proftpd.org/ @@ -42,7 +42,8 @@ Patch3: proftpd-1.3.4rc1-mod_vroot-test.patch Patch4: proftpd-1.3.6-no-mod-wrap.patch Patch5: proftpd-1.3.6-no-mod-geoip.patch Patch6: proftpd-1.3.7rc3-logging-not-systemd.patch -Patch7: proftpd-1.3.7a-Adjusting-unit-test-timeouts-for-netacl.patch +Patch7: proftpd-1.3.7a-Adjusting-unit-test-timeouts-for-netacl.patch +Patch8: proftpd-1.3.7a-fix-environment-sensitive-tests-failure.patch BuildRequires: coreutils BuildRequires: gcc @@ -234,6 +235,7 @@ sed -i -e '/killall/s/test.*/systemctl reload proftpd.service/' \ %endif %patch7 -p1 +%patch8 -p1 # Avoid docfile dependencies chmod -c -x contrib/xferstats.holger-preiss @@ -511,6 +513,12 @@ fi %{_mandir}/man1/ftpwho.1* %changelog +* Fri Jan 07 2022 gaihuiying - 1.3.7c-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix environment sensitive tests failure + * Sat Dec 04 2021 quanhongfei - 1.3.7c-1 - Type:requirement - ID:NA