forked from pool/proftpd
3eecc63a4d
Update to 1.3.8b, fix for CVE-2023-48795 OBS-URL: https://build.opensuse.org/request/show/1135388 OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=97
104 lines
3.0 KiB
Diff
104 lines
3.0 KiB
Diff
---
|
|
Makefile.in | 14 ++++++--------
|
|
contrib/mod_snmp/db.c | 2 +-
|
|
include/version.h | 2 --
|
|
src/main.c | 6 ++----
|
|
4 files changed, 9 insertions(+), 15 deletions(-)
|
|
|
|
Index: contrib/mod_snmp/db.c
|
|
===================================================================
|
|
--- contrib/mod_snmp/db.c.orig
|
|
+++ contrib/mod_snmp/db.c
|
|
@@ -1122,7 +1122,7 @@ int snmp_db_get_value(pool *p, unsigned
|
|
return 0;
|
|
|
|
case SNMP_DB_DAEMON_F_VERSION:
|
|
- *str_value = "ProFTPD Version " PROFTPD_VERSION_TEXT " (built at " BUILD_STAMP ")";
|
|
+ *str_value = "ProFTPD Version " PROFTPD_VERSION_TEXT;
|
|
*str_valuelen = strlen(*str_value);
|
|
|
|
pr_trace_msg(trace_channel, 19,
|
|
Index: src/main.c
|
|
===================================================================
|
|
--- src/main.c.orig
|
|
+++ src/main.c
|
|
@@ -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);
|
|
|
|
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");
|
|
@@ -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);
|
|
|
|
Index: Makefile.in
|
|
===================================================================
|
|
--- Makefile.in.orig
|
|
+++ Makefile.in
|
|
@@ -47,17 +47,17 @@ include/buildstamp.h:
|
|
|
|
dummy:
|
|
|
|
-lib: include/buildstamp.h dummy
|
|
+lib: dummy
|
|
cd lib/ && $(MAKE) lib
|
|
|
|
-src: include/buildstamp.h dummy
|
|
+src: dummy
|
|
cd src/ && $(MAKE) src
|
|
|
|
-modules: include/buildstamp.h dummy
|
|
+modules: dummy
|
|
cd modules/ && $(MAKE) static
|
|
test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" || (cd modules/ && $(MAKE) shared)
|
|
|
|
-utils: include/buildstamp.h dummy
|
|
+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)
|
|
|
|
-dirs: include/buildstamp.h dummy
|
|
+dirs: dummy
|
|
@dirs="$(DIRS)"; \
|
|
for dir in $$dirs; do \
|
|
if [ -d "$$dir" ]; then cd $$dir/ && $(MAKE); fi; \
|
|
Index: include/version.h
|
|
===================================================================
|
|
--- include/version.h.orig
|
|
+++ include/version.h
|
|
@@ -25,8 +25,6 @@
|
|
#ifndef PR_VERSION_H
|
|
#define PR_VERSION_H
|
|
|
|
-#include "buildstamp.h"
|
|
-
|
|
/* Application version (in various forms) */
|
|
#define PROFTPD_VERSION_NUMBER 0x0001030807
|
|
#define PROFTPD_VERSION_TEXT "1.3.8b"
|