diff --git a/proftpd-1.3.3-dist.patch b/proftpd-1.3.3-dist.patch deleted file mode 100644 index ebda64c..0000000 --- a/proftpd-1.3.3-dist.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -Nur proftpd-1.3.3rc3.orig/contrib/dist/rpm/ftp.pamd proftpd-1.3.3rc3/contrib/dist/rpm/ftp.pamd ---- proftpd-1.3.3rc3.orig/contrib/dist/rpm/ftp.pamd 2007-10-04 04:25:03.000000000 +0200 -+++ proftpd-1.3.3rc3/contrib/dist/rpm/ftp.pamd 2010-02-09 14:40:29.198747815 +0100 -@@ -1,6 +1,7 @@ - #%PAM-1.0 -+ - auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed --auth required pam_unix.so shadow nullok -+#auth required pam_unix.so shadow nullok - - # If this is enabled, anonymous logins will fail because the 'ftp' user does - # not have a "valid" shell, as listed in /etc/shells. -@@ -11,5 +12,8 @@ - # - #auth required pam_shells.so - --account required pam_unix.so --session required pam_unix.so -+auth required pam_unix2.so -+auth required pam_shells.so -+account required pam_unix2.so -+password required pam_unix2.so -+session required pam_unix2.so -diff -Nur proftpd-1.3.3rc3.orig/contrib/dist/rpm/proftpd.logrotate proftpd-1.3.3rc3/contrib/dist/rpm/proftpd.logrotate ---- proftpd-1.3.3rc3.orig/contrib/dist/rpm/proftpd.logrotate 2009-05-27 18:14:24.000000000 +0200 -+++ proftpd-1.3.3rc3/contrib/dist/rpm/proftpd.logrotate 2010-02-09 14:41:59.734217959 +0100 -@@ -1,7 +1,31 @@ --/var/log/xferlog { -- missingok -- notifempty -- postrotate -- kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true -- endscript --} -+/var/log/proftpd/xferlog /var/log/proftpd/proftpd.log { -+ compress -+ dateext -+ maxage 365 -+ rotate 99 -+ size=+4096k -+ notifempty -+ missingok -+ create 640 root root -+ sharedscripts -+ postrotate -+ /etc/init.d/proftpd reload -+ #/etc/init.d/xinetd reload -+ endscript -+ } -+ -+#/var/log/proftpd/access.log /var/log/proftpd/auth.log /var/log/proftpd/paranoid.log { -+# compress -+# dateext -+# maxage 365 -+# rotate 99 -+# size=+4096k -+# notifempty -+# missingok -+# create 640 root root -+# sharedscripts -+# postrotate -+# /etc/init.d/proftpd reload -+# #/etc/init.d/xinetd reload -+# endscript -+#} -diff -Nur proftpd-1.3.3rc3.orig/contrib/dist/rpm/xinetd proftpd-1.3.3rc3/contrib/dist/rpm/xinetd ---- proftpd-1.3.3rc3.orig/contrib/dist/rpm/xinetd 2003-08-28 02:33:27.000000000 +0200 -+++ proftpd-1.3.3rc3/contrib/dist/rpm/xinetd 2010-02-09 14:40:29.198747815 +0100 -@@ -2,11 +2,15 @@ - # description: The ProFTPD FTP server - service ftp - { -- flags = REUSE - socket_type = stream -+ protocol = tcp - wait = no -+# bind = IP -+ instances = 30 - user = root - server = /usr/sbin/proftpd -- log_on_failure += USERID -- disable = no -+ log_on_success += PID HOST USERID EXIT DURATION -+ log_on_failure += HOST USERID ATTEMPT -+# nice = 10 -+ disable = yes - } -I file proftpd-1.3.3rc3.orig/.ltmain.sh.rej.swp e proftpd-1.3.3rc3/.ltmain.sh.rej.swp sono diversi diff --git a/proftpd-1.3.3g.tar.bz2 b/proftpd-1.3.3g.tar.bz2 deleted file mode 100644 index 3be0568..0000000 --- a/proftpd-1.3.3g.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1104a91e5e4dfafb0aa876492c073cf24b7d00b3e8528fa4443c108d963ae15 -size 4204504 diff --git a/proftpd-1.3.3g-basic.conf.patch b/proftpd-1.3.4a-basic.conf.patch similarity index 95% rename from proftpd-1.3.3g-basic.conf.patch rename to proftpd-1.3.4a-basic.conf.patch index 3ee908d..d3d67bc 100644 --- a/proftpd-1.3.3g-basic.conf.patch +++ b/proftpd-1.3.4a-basic.conf.patch @@ -1,6 +1,7 @@ -diff -ruN proftpd-1.3.3g-orig/sample-configurations/basic.conf proftpd-1.3.3g/sample-configurations/basic.conf ---- proftpd-1.3.3g-orig/sample-configurations/basic.conf 2008-01-21 18:44:06.000000000 +0100 -+++ proftpd-1.3.3g/sample-configurations/basic.conf 2011-11-18 15:53:36.000000000 +0100 +Index: sample-configurations/basic.conf +=================================================================== +--- sample-configurations/basic.conf.orig ++++ sample-configurations/basic.conf @@ -3,19 +3,29 @@ # and a single anonymous login. It assumes that you have a user/group # "nobody" and "ftp" for normal operation and anon. @@ -37,7 +38,7 @@ diff -ruN proftpd-1.3.3g-orig/sample-configurations/basic.conf proftpd-1.3.3g/sa # To prevent DoS attacks, set the maximum number of child processes # to 30. If you need to allow more than 30 concurrent connections -@@ -23,43 +33,190 @@ +@@ -23,43 +33,190 @@ Umask 022 # in standalone mode, in inetd mode you should use an inetd server # that allows you to limit maximum number of processes per service # (such as xinetd). diff --git a/proftpd-1.3.4a-dist.patch b/proftpd-1.3.4a-dist.patch new file mode 100644 index 0000000..2f54bb3 --- /dev/null +++ b/proftpd-1.3.4a-dist.patch @@ -0,0 +1,72 @@ +Index: contrib/dist/rpm/ftp.pamd +=================================================================== +--- contrib/dist/rpm/ftp.pamd.orig ++++ contrib/dist/rpm/ftp.pamd +@@ -1,6 +1,7 @@ + #%PAM-1.0 ++ + auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed +-auth required pam_unix.so shadow nullok ++#auth required pam_unix.so shadow nullok + + # If this is enabled, anonymous logins will fail because the 'ftp' user does + # not have a "valid" shell, as listed in /etc/shells. +@@ -11,5 +12,8 @@ auth required pam_unix.so shadow n + # + #auth required pam_shells.so + +-account required pam_unix.so +-session required pam_unix.so ++auth required pam_unix2.so ++auth required pam_shells.so ++account required pam_unix2.so ++password required pam_unix2.so ++session required pam_unix2.so +Index: contrib/dist/rpm/proftpd.logrotate +=================================================================== +--- contrib/dist/rpm/proftpd.logrotate.orig ++++ contrib/dist/rpm/proftpd.logrotate +@@ -1,10 +1,16 @@ +-/var/log/proftpd/*.log /var/log/xferlog { ++/var/log/proftpd/xferlog /var/log/proftpd/*.log { + compress +- missingok ++ dateext ++ maxage 365 ++ rotate 99 ++ size=+4096k + notifempty ++ missingok ++ create 640 root root + sharedscripts + postrotate +- test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || : ++ /etc/init.d/proftpd reload ++ #/etc/init.d/xinetd reload + endscript + } + +Index: contrib/dist/rpm/xinetd +=================================================================== +--- contrib/dist/rpm/xinetd.orig ++++ contrib/dist/rpm/xinetd +@@ -2,13 +2,15 @@ + # description: The ProFTPD FTP server + service ftp + { +- flags = REUSE + socket_type = stream ++ protocol = tcp + wait = no ++# bind = IP ++ instances = 30 + user = root + server = /usr/sbin/in.proftpd +- log_on_success += DURATION +- log_on_failure += USERID +- nice = 10 ++ log_on_success += PID HOST USERID EXIT DURATION ++ log_on_failure += HOST USERID ATTEMPT ++# nice = 10 + disable = yes + } diff --git a/proftpd-1.3.1-ftpasswd.patch b/proftpd-1.3.4a-ftpasswd.patch similarity index 89% rename from proftpd-1.3.1-ftpasswd.patch rename to proftpd-1.3.4a-ftpasswd.patch index 29c0225..95e9ba9 100644 --- a/proftpd-1.3.1-ftpasswd.patch +++ b/proftpd-1.3.4a-ftpasswd.patch @@ -1,7 +1,8 @@ -diff -ruN proftpd-1.3.1-orig/contrib/ftpasswd proftpd-1.3.1/contrib/ftpasswd ---- proftpd-1.3.1-orig/contrib/ftpasswd 2004-10-07 21:17:58.000000000 +0000 -+++ proftpd-1.3.1/contrib/ftpasswd 2008-11-03 14:11:33.159343152 +0000 -@@ -34,8 +34,8 @@ +Index: contrib/ftpasswd +=================================================================== +--- contrib/ftpasswd.orig ++++ contrib/ftpasswd +@@ -33,8 +33,8 @@ use Getopt::Long; $Getopt::Long::auto_abbrev = 0; my $program = basename($0); @@ -12,7 +13,7 @@ diff -ruN proftpd-1.3.1-orig/contrib/ftpasswd proftpd-1.3.1/contrib/ftpasswd my $shell_file = "/etc/shells"; my $default_cracklib_dict = "/usr/lib/cracklib_dict"; my $cracklib_dict; -@@ -882,6 +882,46 @@ +@@ -928,6 +928,46 @@ usage: $program [--help] [--hash|--group --version Displays the version of $program. diff --git a/proftpd-1.3.3-strip.patch b/proftpd-1.3.4a-strip.patch similarity index 61% rename from proftpd-1.3.3-strip.patch rename to proftpd-1.3.4a-strip.patch index 6964812..d9c5c45 100644 --- a/proftpd-1.3.3-strip.patch +++ b/proftpd-1.3.4a-strip.patch @@ -1,7 +1,8 @@ -diff -Nur proftpd-1.3.3rc3.orig/ltmain.sh proftpd-1.3.3rc3/ltmain.sh ---- proftpd-1.3.3rc3.orig/ltmain.sh 2009-11-17 19:26:43.000000000 +0100 -+++ proftpd-1.3.3rc3/ltmain.sh 2010-02-11 13:37:15.000000000 +0100 -@@ -2056,7 +2056,10 @@ +Index: ltmain.sh +=================================================================== +--- ltmain.sh.orig ++++ ltmain.sh +@@ -2056,7 +2056,10 @@ func_mode_install () ;; esac if test -n "$tstripme" && test -n "$striplib"; then diff --git a/proftpd-1.3.4a.tar.bz2 b/proftpd-1.3.4a.tar.bz2 new file mode 100644 index 0000000..c7b2132 --- /dev/null +++ b/proftpd-1.3.4a.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad92eec86deccc385ac144e3925f9b9cbe085e60f10b33d1de6da91d32f39f3e +size 6805631 diff --git a/proftpd.changes b/proftpd.changes index 7ef28a7..ab0a0f0 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Dec 12 15:00:18 UTC 2011 - chris@computersalat.de + +- update to 1.3.4a + + Fixed mod_load/mod_wrap2 build issues. +- 1.3.4 + + New "NoEmptyFragments" TLSOption added; see the TLSOptions documentation + for details. + + Improved configure script for cross-compiling. + + Reworked the proftpd.spec RPM file + + Fixed mod_sql_mysql "Alarm clock" bug on FreeBSD. + + New "IgnoreSFTPSetTimes" SFTPOption added; see the SFTPOptions + documentation for details. + + Fixed response pool use-after-free issue. +- for more info please see the RELEASE_NOTES file +- reworked patches + * now p0 patches + ------------------------------------------------------------------- Fri Nov 18 14:56:41 UTC 2011 - chris@computersalat.de diff --git a/proftpd.spec b/proftpd.spec index 5557a95..b0c863d 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: proftpd Summary: Highly configurable GPL-licensed FTP server software +License: GPL-2.0+ +Group: Productivity/Networking/Ftp/Servers # Please save your time and do not update to "rc" versions. # We only accept updates for "STABLE" Versions -Version: 1.3.3g -Release: 1 -License: GPLv2+ -Group: Productivity/Networking/Ftp/Servers -AutoReqProv: on +Version: 1.3.4a +Release: 0 Url: http://www.proftpd.org/ Source: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.passwd -#PATCH-FIX-UPSTREAM CVE-2009-3639 fix mod_tls security issue (bnc#549740) -Patch100: %{name}-1.3.3-dist.patch -Patch101: %{name}-1.3.3g-basic.conf.patch -Patch102: %{name}-1.3.1-ftpasswd.patch -Patch103: %{name}-1.3.3-strip.patch +#PATCH-FIX-openSUSE: pam, logrotate, xinet +Patch100: %{name}-1.3.4a-dist.patch +#PATCH-FIX-openSUSE: provide a useful default config +Patch101: %{name}-1.3.4a-basic.conf.patch +#PATCH-FIX: provide more info on usage ;) +Patch102: %{name}-1.3.4a-ftpasswd.patch +#PATCH-FIX: fix strip +Patch103: %{name}-1.3.4a-strip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: krb5-devel BuildRequires: libacl-devel @@ -57,7 +57,6 @@ operating systems. See the README.ports file for more details about the platforms on which ProFTPD in known or thought to build and run. %package ldap - Summary: LDAP Module for ProFTPD Group: Productivity/Networking/Ftp/Servers Requires: %{name} = %{version} @@ -66,7 +65,6 @@ Requires: %{name} = %{version} This is the LDAP Module for ProFTPD %package mysql - Summary: MySQL Module for ProFTPD Group: Productivity/Networking/Ftp/Servers Requires: %{name} = %{version} @@ -75,7 +73,6 @@ Requires: %{name} = %{version} This is the MySQL Module for ProFTPD %package pgsql - Summary: PostgreSQL Module for ProFTPD Group: Productivity/Networking/Ftp/Servers Requires: %{name} = %{version} @@ -84,7 +81,6 @@ Requires: %{name} = %{version} This is the PostgreSQL Module for ProFTPD %package radius - Summary: Radius Module for ProFTPD Group: Productivity/Networking/Ftp/Servers Requires: %{name} = %{version} @@ -93,7 +89,6 @@ Requires: %{name} = %{version} This is the Radius Module for ProFTPD %package sqlite - Summary: SQLite Module for ProFTPD Group: Productivity/Networking/Ftp/Servers Requires: %{name} = %{version} @@ -102,7 +97,6 @@ Requires: %{name} = %{version} This is the SQLite Module for ProFTPD %package devel - Summary: Development files for ProFTPD Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -111,7 +105,6 @@ Requires: %{name} = %{version} This package contains Development files for ProFTPD %package doc - Summary: Documentation for ProFTPD Group: Documentation/HTML Requires: %{name} = %{version} @@ -122,13 +115,13 @@ Here are Documentation for ProFTPD %prep %setup -q %{__rm} README.AIX -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 +%patch100 +%patch101 +%patch102 +%patch103 %build -PROFTPD_SHARED_MODS="$(for spec_mod in mod_load $(find contrib -name mod_\*.c); do echo "$(basename ${spec_mod%%.c})"; done | tr '\n' ':' | sed -e 's|:$||')" +PROFTPD_SHARED_MODS="$(for spec_mod in $(find contrib -name mod_\*.c); do echo "$(basename ${spec_mod%%.c})"; done | tr '\n' ':' | sed -e 's|:$||')" export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" export CXXFLAGS="$CFLAGS" %configure \