diff --git a/proftpd-1.3.7f.tar.gz b/proftpd-1.3.7f.tar.gz deleted file mode 100644 index 7c096c1..0000000 --- a/proftpd-1.3.7f.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1177d11367fc2da5d7b5695d3ab0aec434f72e2ab02e154fa61a75a4b0689acf -size 20433355 diff --git a/proftpd-1.3.7f.tar.gz.asc b/proftpd-1.3.7f.tar.gz.asc deleted file mode 100644 index c1b2d1f..0000000 --- a/proftpd-1.3.7f.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: GPGTools - https://gpgtools.org - -iEYEABECAAYFAmOM8XMACgkQt46JP6URl2p8JACgpdHitMp82z21CGXIX1YIyVTN -KP4AoLXY5x07uLo+B8j6xXEQRIAUqH8S -=RDRA ------END PGP SIGNATURE----- diff --git a/proftpd-1.3.8a.tar.gz b/proftpd-1.3.8a.tar.gz new file mode 100644 index 0000000..1d9e715 --- /dev/null +++ b/proftpd-1.3.8a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56093b890a712220b09b98e29de2974a590e8fae6b36ed78c698a90945466aaf +size 19749900 diff --git a/proftpd-1.3.8a.tar.gz.asc b/proftpd-1.3.8a.tar.gz.asc new file mode 100644 index 0000000..b4750cb --- /dev/null +++ b/proftpd-1.3.8a.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - https://gpgtools.org + +iEYEABECAAYFAmUjQZQACgkQt46JP6URl2qpFwCggqITzFB6fkGfBU5z0+AX3aGn +EVgAnRC//qyIouovEZcf/STTg6CDAbMn +=sgjA +-----END PGP SIGNATURE----- diff --git a/proftpd-1.3.8a.tar.gz.sha256 b/proftpd-1.3.8a.tar.gz.sha256 new file mode 100644 index 0000000..679ece4 --- /dev/null +++ b/proftpd-1.3.8a.tar.gz.sha256 @@ -0,0 +1 @@ +56093b890a712220b09b98e29de2974a590e8fae6b36ed78c698a90945466aaf proftpd-1.3.8a.tar.gz diff --git a/proftpd-ftpasswd.patch b/proftpd-ftpasswd.patch index 860a9f1..9303550 100644 --- a/proftpd-ftpasswd.patch +++ b/proftpd-ftpasswd.patch @@ -13,7 +13,7 @@ Index: contrib/ftpasswd my $shell_file = "/etc/shells"; my $default_cracklib_dict = "/usr/lib/cracklib_dict"; my $cracklib_dict; -@@ -1220,6 +1220,46 @@ usage: $program [--help] [--hash|--group +@@ -1218,6 +1218,46 @@ usage: $program [--help] [--hash|--group --version Displays the version of $program. diff --git a/proftpd-no_BuildDate.patch b/proftpd-no_BuildDate.patch index 9c83d95..8deb853 100644 --- a/proftpd-no_BuildDate.patch +++ b/proftpd-no_BuildDate.patch @@ -22,44 +22,39 @@ Index: src/main.c =================================================================== --- src/main.c.orig +++ src/main.c -@@ -1928,8 +1928,8 @@ static void standalone_main(void) { - - init_bindings(); +@@ -1989,8 +1989,8 @@ static void standalone_main(void) { + exit(1); + } - pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s (built %s) standalone mode STARTUP", - PROFTPD_VERSION_TEXT " " PR_STATUS, BUILD_STAMP); + pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s standalone mode STARTUP", + PROFTPD_VERSION_TEXT " " PR_STATUS); - if (pr_pidfile_write() < 0) { - fprintf(stderr, "error opening PidFile '%s': %s\n", pr_pidfile_get(), -@@ -1989,7 +1989,6 @@ static void show_settings(void) { - printf("%s", " Platform: " PR_PLATFORM " [unknown]\n"); - #endif /* !HAVE_UNAME */ + daemon_loop(); + } +@@ -2145,7 +2145,6 @@ static void show_settings(void) { + + show_os_release(); - printf("%s", " Built: " BUILD_STAMP "\n"); printf("%s", " Built With:\n configure " PR_BUILD_OPTS "\n\n"); printf("%s", " CFLAGS: " PR_BUILD_CFLAGS "\n"); -@@ -2571,7 +2570,6 @@ int main(int argc, char *argv[], char ** - if (show_version == 2) { +@@ -2742,7 +2741,6 @@ int main(int argc, char *argv[], char ** + if (show_version >= 2) { printf("ProFTPD Version: %s", PROFTPD_VERSION_TEXT " " PR_STATUS "\n"); printf(" Scoreboard Version: %08x\n", PR_SCOREBOARD_VERSION); - printf(" Built: %s\n\n", BUILD_STAMP); modules_list2(NULL, PR_MODULES_LIST_FL_SHOW_VERSION); - exit(0); + Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in -@@ -42,28 +42,25 @@ endif +@@ -47,17 +47,17 @@ include/buildstamp.h: - all: $(BUILD_BIN) - --include/buildstamp.h: -- echo \#define BUILD_STAMP \"$(BUILD_STAMP)\" > include/buildstamp.h -- dummy: -lib: include/buildstamp.h dummy @@ -79,6 +74,11 @@ Index: Makefile.in +utils: dummy cd utils/ && $(MAKE) utils + clang-tidy: +@@ -66,10 +66,10 @@ clang-tidy: + -cd modules/ && $(MAKE) clang-tidy + # cd utils/ && $(MAKE) clang-tidy + -locale: include/buildstamp.h dummy +locale: dummy test -z "$(ENABLE_NLS)" || (cd locale/ && $(MAKE) locale) @@ -99,5 +99,5 @@ Index: include/version.h -#include "buildstamp.h" - /* Application version (in various forms) */ - #define PROFTPD_VERSION_NUMBER 0x0001030711 - #define PROFTPD_VERSION_TEXT "1.3.7f" + #define PROFTPD_VERSION_NUMBER 0x0001030806 + #define PROFTPD_VERSION_TEXT "1.3.8a" diff --git a/proftpd.changes b/proftpd.changes index e653e6b..2219a2b 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 2 16:24:34 UTC 2023 - chris@computersalat.de + +- 1.3.8a - Released 08-Oct-2023 + * http://proftpd.org/docs/NEWS-1.3.8a + * Fixed builds when using OpenSSL 3.x + ------------------------------------------------------------------- Wed Jan 25 21:05:11 UTC 2023 - chris@computersalat.de diff --git a/proftpd.spec b/proftpd.spec index 847be51..60b2ae7 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -33,7 +33,7 @@ Summary: Configurable GPL-licensed FTP server software # We only accept updates for "STABLE" Versions License: GPL-2.0-or-later Group: Productivity/Networking/Ftp/Servers -Version: 1.3.7f +Version: 1.3.8a Release: 0 URL: http://www.proftpd.org/ Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz diff --git a/proftpd_env-script-interpreter.patch b/proftpd_env-script-interpreter.patch index ac83a59..82d5112 100644 --- a/proftpd_env-script-interpreter.patch +++ b/proftpd_env-script-interpreter.patch @@ -6,7 +6,7 @@ Index: contrib/ftpasswd -#!/usr/bin/env perl +#!/usr/bin/perl # --------------------------------------------------------------------------- - # Copyright (C) 2000-2020 TJ Saunders + # Copyright (C) 2000-2021 TJ Saunders # Index: contrib/ftpmail ===================================================================