Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2022-03-28 17:00:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proftpd (Old) and /work/SRC/openSUSE:Factory/.proftpd.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd" Mon Mar 28 17:00:49 2022 rev:43 rq:965197 version:1.3.7c Changes: -------- --- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2021-10-29 22:35:40.051714625 +0200 +++ /work/SRC/openSUSE:Factory/.proftpd.new.1900/proftpd.changes 2022-03-28 17:01:41.917062088 +0200 @@ -1,0 +2,23 @@ +Sun Mar 27 13:17:21 UTC 2022 - ch...@computersalat.de + +- fix deps for SLES + +------------------------------------------------------------------- +Sat Mar 26 16:41:02 UTC 2022 - ch...@computersalat.de + +- remove configure --disable-static + +------------------------------------------------------------------- +Tue Mar 1 18:37:02 UTC 2022 - ch...@computersalat.de + +- Update to version 1.3.7c: + * http://proftpd.org/docs/NEWS-1.3.7c + * http://proftpd.org/docs/RELEASE_NOTES-1.3.7c +- Update patches + * harden_proftpd.service.patch + * proftpd-ftpasswd.patch + * proftpd-no_BuildDate.patch + * proftpd.spec + * proftpd_env-script-interpreter.patch + +------------------------------------------------------------------- Old: ---- proftpd-1.3.6e.tar.gz proftpd-1.3.6e.tar.gz.asc New: ---- proftpd-1.3.7c.tar.gz proftpd-1.3.7c.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proftpd.spec ++++++ --- /var/tmp/diff_new_pack.KEXi6M/_old 2022-03-28 17:01:42.845063348 +0200 +++ /var/tmp/diff_new_pack.KEXi6M/_new 2022-03-28 17:01:42.849063354 +0200 @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,24 @@ # +%define with_redis 1 +%define with_sodium 1 + +%if 0%{?suse_version} == 1315 || 0%{?suse_version} == 1500 +%define with_redis 0 +%endif + +%if 0%{?suse_version} == 1315 +%define with_sodium 0 +%endif + Name: proftpd Summary: Configurable GPL-licensed FTP server software # Please save your time and do not update to "rc" versions. # We only accept updates for "STABLE" Versions License: GPL-2.0-or-later Group: Productivity/Networking/Ftp/Servers -Version: 1.3.6e +Version: 1.3.7c Release: 0 URL: http://www.proftpd.org/ Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz @@ -47,19 +58,29 @@ Patch104: %{name}-no_BuildDate.patch #RPMLINT-FIX-openSUSE: env-script-interpreter Patch105: %{name}_env-script-interpreter.patch +#openSUSE:Security_Features#Systemd_hardening_effort Patch106: harden_proftpd.service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: gpg-offline +BuildRequires: cyrus-sasl-devel BuildRequires: fdupes +BuildRequires: gcc-c++ +%if 0%{?with_redis} +BuildRequires: hiredis-devel +%endif BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel -#BuildRequires: libmemcached-devel +BuildRequires: libmemcached-devel #BuildRequires: libGeoIP-devel -BuildRequires: mysql-devel +BuildRequires: libmysqld-devel +%if 0%{?with_sodium} +BuildRequires: libsodium-devel +%endif BuildRequires: ncurses-devel BuildRequires: openldap2-devel BuildRequires: pam-devel +BuildRequires: pcre-devel BuildRequires: pkg-config BuildRequires: postgresql-devel BuildRequires: sqlite3-devel @@ -147,7 +168,7 @@ %prep #gpg_verify %{S:1} %setup -q -rm README.AIX +rm README.AIX README.cygwin README.FreeBSD README.Solaris2.5x README.Unixware # %patch100 %patch101 @@ -155,7 +176,7 @@ %patch103 %patch104 %patch105 -%patch106 -p1 +%patch106 %build rm contrib/mod_wrap.c @@ -163,7 +184,7 @@ PROFTPD_SHARED_MODS="$(for spec_mod in $(find contrib -name mod_\*.c|sort); do echo "$(basename ${spec_mod%%.c})"; done | tr '\n' ':' | sed -e 's|:$||')" export CFLAGS="%{optflags} -D_GNU_SOURCE -DLDAP_DEPRECATED" export CXXFLAGS="$CFLAGS" -%configure --disable-static \ +%configure \ --bindir=%{_sbindir} \ --libexecdir=%{_libdir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} \ @@ -177,8 +198,14 @@ --enable-dso \ --enable-facl \ --enable-ipv6 \ + --enable-memcache \ --enable-nls \ --enable-openssl \ + --enable-pcre \ +%if 0%{?with_redis} + --enable-redis \ +%endif + --enable-shadow \ --with-lastlog \ --with-includes="%{_includedir}/mysql:%{_includedir}/pgsql" \ --with-shared="${PROFTPD_SHARED_MODS}" \ @@ -186,6 +213,9 @@ --disable-strip # --enable-memcache \ +# --enable-pcre \ +# --enable-redis \ +# --enable-shadow \ make %{?_smp_mflags} %install @@ -264,10 +294,12 @@ %files %else + %files -f %{name}.lang %endif %defattr(-,root,root) -%doc COPYING CREDITS ChangeLog NEWS README* RELEASE_NOTES +%license COPYING +%doc CREDITS NEWS README* RELEASE_NOTES %doc contrib/README.* %doc sample-configurations/*.conf %dir %attr(0755,root,root) %{_sysconfdir}/%{name}/ ++++++ harden_proftpd.service.patch ++++++ --- /var/tmp/diff_new_pack.KEXi6M/_old 2022-03-28 17:01:42.873063387 +0200 +++ /var/tmp/diff_new_pack.KEXi6M/_new 2022-03-28 17:01:42.877063392 +0200 @@ -1,7 +1,7 @@ -Index: proftpd-1.3.6e/contrib/dist/rpm/proftpd.service +Index: contrib/dist/rpm/proftpd.service =================================================================== ---- proftpd-1.3.6e.orig/contrib/dist/rpm/proftpd.service -+++ proftpd-1.3.6e/contrib/dist/rpm/proftpd.service +--- contrib/dist/rpm/proftpd.service.orig ++++ contrib/dist/rpm/proftpd.service @@ -4,6 +4,18 @@ Wants=network-online.target After=network-online.target nss-lookup.target local-fs.target remote-fs.target @@ -17,7 +17,7 @@ +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true -+# end of automatic additions ++# end of automatic additions Type = simple Environment = PROFTPD_OPTIONS= EnvironmentFile = -/etc/sysconfig/proftpd ++++++ proftpd-1.3.6e.tar.gz -> proftpd-1.3.7c.tar.gz ++++++ /work/SRC/openSUSE:Factory/proftpd/proftpd-1.3.6e.tar.gz /work/SRC/openSUSE:Factory/.proftpd.new.1900/proftpd-1.3.7c.tar.gz differ: char 12, line 1 ++++++ proftpd-ftpasswd.patch ++++++ --- /var/tmp/diff_new_pack.KEXi6M/_old 2022-03-28 17:01:42.925063457 +0200 +++ /var/tmp/diff_new_pack.KEXi6M/_new 2022-03-28 17:01:42.929063462 +0200 @@ -13,7 +13,7 @@ my $shell_file = "/etc/shells"; my $default_cracklib_dict = "/usr/lib/cracklib_dict"; my $cracklib_dict; -@@ -1128,6 +1128,46 @@ usage: $program [--help] [--hash|--group +@@ -1220,6 +1220,46 @@ usage: $program [--help] [--hash|--group --version Displays the version of $program. ++++++ proftpd-no_BuildDate.patch ++++++ --- /var/tmp/diff_new_pack.KEXi6M/_old 2022-03-28 17:01:42.957063501 +0200 +++ /var/tmp/diff_new_pack.KEXi6M/_new 2022-03-28 17:01:42.957063501 +0200 @@ -5,17 +5,61 @@ 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 +@@ -1928,8 +1928,8 @@ static void standalone_main(void) { + + init_bindings(); + +- 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 */ + +- 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) { + 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 -@@ -24,28 +24,26 @@ BUILD_BIN=proftpd$(EXEEXT) ftpcount$(EXE +@@ -42,28 +42,25 @@ endif all: $(BUILD_BIN) -include/buildstamp.h: -- echo \#define BUILD_STAMP \"`date +"%a %b %e %Y %H:%M:%S %Z"`\" > include/buildstamp.h - +- echo \#define BUILD_STAMP \"$(BUILD_STAMP)\" > include/buildstamp.h +- dummy: -lib: include/buildstamp.h dummy @@ -44,58 +88,17 @@ @dirs="$(DIRS)"; \ for dir in $$dirs; do \ if [ -d "$$dir" ]; then cd $$dir/ && $(MAKE); fi; \ -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: include/version.h =================================================================== --- include/version.h.orig +++ include/version.h -@@ -1,5 +1,3 @@ +@@ -25,8 +25,6 @@ + #ifndef PR_VERSION_H + #define PR_VERSION_H + -#include "buildstamp.h" - /* Application version (in various forms) */ - #define PROFTPD_VERSION_NUMBER 0x0001030610 - #define PROFTPD_VERSION_TEXT "1.3.6e" -Index: src/main.c -=================================================================== ---- src/main.c.orig -+++ src/main.c -@@ -1893,8 +1893,8 @@ static void standalone_main(void) { - - init_bindings(); - -- 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(), -@@ -1954,7 +1954,6 @@ static void show_settings(void) { - printf("%s", " Platform: " PR_PLATFORM " [unknown]\n"); - #endif /* !HAVE_UNAME */ - -- printf("%s", " Built: " BUILD_STAMP "\n"); - printf("%s", " Built With:\n configure " PR_BUILD_OPTS "\n\n"); - - printf("%s", " CFLAGS: " PR_BUILD_CFLAGS "\n"); -@@ -2534,7 +2533,6 @@ int main(int argc, char *argv[], char ** - - 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); + #define PROFTPD_VERSION_NUMBER 0x0001030708 + #define PROFTPD_VERSION_TEXT "1.3.7c" ++++++ proftpd_env-script-interpreter.patch ++++++ --- /var/tmp/diff_new_pack.KEXi6M/_old 2022-03-28 17:01:43.077063664 +0200 +++ /var/tmp/diff_new_pack.KEXi6M/_new 2022-03-28 17:01:43.081063669 +0200 @@ -16,7 +16,7 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # --------------------------------------------------------------------------- - # Copyright (C) 2008-2013 TJ Saunders <t...@castaglia.org> + # Copyright (C) 2008-2017 TJ Saunders <t...@castaglia.org> # Index: contrib/ftpquota =================================================================== @@ -37,5 +37,5 @@ +#!/usr/bin/perl # --------------------------------------------------------------------------- - # Copyright (C) 2008-2012 TJ Saunders <t...@castaglia.org> + # Copyright (C) 2008-2020 TJ Saunders <t...@castaglia.org>
