[proftpd] Update to 1.3.5
Paul Howarth
pghmcfc at fedoraproject.org
Fri May 16 14:27:11 UTC 2014
commit f2afd01fee2ed221ba002d992da29ac4a66ce926
Author: Paul Howarth <paul at city-fan.org>
Date: Fri May 16 15:05:35 2014 +0100
Update to 1.3.5
- New upstream release 1.3.5 (see NEWS for details)
- Drop upstreamed patches
- Drop sysv-to-systemd migration script
- No longer need to support pam_stack
.gitignore | 8 +-
proftpd-1.3.4a-bug3720.patch | 160 -----------------
proftpd-1.3.4a-bug3745.patch | 35 ----
proftpd-1.3.4a-bug3746.patch | 157 -----------------
proftpd-1.3.4c-bug3744.patch | 327 ----------------------------------
proftpd-1.3.4d-bug3973.patch | 152 ----------------
proftpd-1.3.4d-bz1044586.patch | 348 -------------------------------------
proftpd-sftp-dh7680-bug4002.patch | 68 -------
proftpd.spec | 75 ++-------
sources | 5 +-
10 files changed, 19 insertions(+), 1316 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 911e184..9273359 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
-# master/f19/f18/f17
+# master/el7
+/proftpd-1.3.5.tar.gz
+/proftpd-mod-geoip-0.3.tar.gz
+/proftpd-mod-vroot-0.9.2.tar.gz
+/Test-Unit-0.14.tar.gz
+# f20/f19
/proftpd-1.3.4d.tar.gz
/proftpd-mod-geoip-0.3.tar.gz
/proftpd-mod-vroot-0.9.2.tar.gz
@@ -11,3 +16,4 @@
/proftpd-1.3.3g.tar.bz2
/proftpd-mod-geoip-0.2.tar.gz
/proftpd-mod-vroot-0.8.5.tar.gz
+/proftpd-1.3.5.tar.gz
diff --git a/proftpd.spec b/proftpd.spec
index e19aed9..c772ee5 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -22,8 +22,8 @@
%global rundir_tmpfs 1
%endif
-# Support systemd presets from Fedora 18 onwards
-%if 0%{?fedora} > 17
+# Support systemd presets from Fedora 18, RHEL 7
+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
%global preset_support 1
%endif
@@ -41,11 +41,11 @@
%define _hardened_build 1
#global prever rc3
-%global rpmrel 5
+%global rpmrel 1
Summary: Flexible, stable and highly-configurable FTP server
Name: proftpd
-Version: 1.3.4d
+Version: 1.3.5
Release: %{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
License: GPLv2+
Group: System Environment/Daemons
@@ -62,23 +62,14 @@ Source11: http://www.castaglia.org/proftpd/modules/proftpd-mod-geoip-0.3.tar.gz
# (they are disabled by default); it is not included as part of the built package and should therefore
# not fall foul of the rules against library bundling
Source13: http://search.cpan.org/CPAN/authors/id/C/CL/CLEMBURG/Test-Unit-0.14.tar.gz
-Patch1: cap-setuid-bug3945.patch
Patch2: proftpd.conf-no-memcached.patch
Patch4: proftpd-1.3.4rc1-mod_vroot-test.patch
Patch5: proftpd-1.3.4-utf8.patch
-Patch14: proftpd-1.3.4a-bug3720.patch
-Patch23: proftpd-1.3.4c-bug3744.patch
-Patch24: proftpd-1.3.4a-bug3745.patch
-Patch25: proftpd-1.3.4a-bug3746.patch
Patch27: proftpd-mod-vroot-0.9.2-bug3841.patch
-Patch28: proftpd-1.3.4d-bug3973.patch
-Patch29: proftpd-1.3.4d-bz1044586.patch
-Patch30: proftpd-sftp-dh7680-bug4002.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires(preun): coreutils, findutils
%if %{use_systemd}
BuildRequires: systemd-units
-Requires(pre): systemd-sysv, /sbin/chkconfig
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -215,41 +206,10 @@ cp -p %{SOURCE1} proftpd.conf
# Fix character encoding in docs
%patch5 -p1 -b .utf8
-# Fix spurious log messages at session close
-# http://bugs.proftpd.org/show_bug.cgi?id=3945
-%patch1
-
-# Various module logfile permissions are 0600 instead of 0640
-# http://bugs.proftpd.org/show_bug.cgi?id=3720
-%patch14 -p0
-
-# Support ls(1) -1 option for LIST command
-# http://bugs.proftpd.org/show_bug.cgi?id=3744
-%patch23 -p0
-
-# Reject PASV command if no IPv4 address available
-# http://bugs.proftpd.org/show_bug.cgi?id=3745
-%patch24 -p0
-
-# Support applying ListOptions only to NLST or to LIST commands
-# http://bugs.proftpd.org/show_bug.cgi?id=3746
-%patch25 -p0
-
# Fix possible symlink race when applying UserOwner to newly created directory
# http://bugs.proftpd.org/show_bug.cgi?id=3841
%patch27
-# Fix mod_sftp/mod_sftp_pam invalid pool allocation during kbdint authentication
-# http://bugs.proftpd.org/show_bug.cgi?id=3973
-%patch28
-
-# Fix support for 8192-bit DH parameters (#1044586)
-%patch29
-
-# Add 3072-bit and 7680-bit DH parameters
-# http://bugs.proftpd.org/show_bug.cgi?id=4002
-%patch30
-
# Avoid documentation name conflicts
mv contrib/README contrib/README.contrib
@@ -274,17 +234,6 @@ chmod -x contrib/xferstats.holger-preiss
if [ ! -f /etc/pam.d/password-auth ]; then
sed -i -e s/password-auth/system-auth/ contrib/dist/rpm/proftpd.pam
fi
-# The "include" syntax used in our PAM configuration file was introduced in
-# PAM 0.78 and is therefore supported in FC-5 and EL-5 onwards; older
-# distributions such as EL-4 (PAM 0.77) need to fall back to using the
-# now-deprecated pam_stack module. Since the pam-devel package doesn't
-# include a pkgconfig file from which we could check the version number, we
-# instead check for the absence of the file /etc/pam.d/config-util, which is
-# present in all PAM packages from 0.80 onwards and acts as a useful
-# indicator of the need to fall back to pam_stack.
-[ ! -f /etc/pam.d/config-util ] && sed -i -e \
- 's/include[[:space:]]*system-auth/required'\ \ \ \ \ 'pam_stack.so service=system-auth/' \
- contrib/dist/rpm/proftpd.pam
# Remove bogus exec permissions from source files
chmod -c -x include/tpl.h lib/tpl.c
@@ -377,15 +326,6 @@ fi
%clean
rm -rf %{buildroot}
-%if %{use_systemd}
-%pre
-# SysV-to-systemd migration
-if [ $1 -gt 1 -a ! -e %{_unitdir}/proftpd.service -a -e %{_sysconfdir}/rc.d/init.d/proftpd ]; then
- /usr/bin/systemd-sysv-convert --save proftpd &>/dev/null
- /sbin/chkconfig --del proftpd &>/dev/null || :
-fi
-%endif
-
%post
%if %{use_systemd}
/bin/systemctl daemon-reload &>/dev/null || :
@@ -471,6 +411,7 @@ fi
%{_sbindir}/ftpshut
%{_sbindir}/in.proftpd
%{_sbindir}/proftpd
+%{_mandir}/man5/proftpd.conf.5*
%{_mandir}/man5/xferlog.5*
%{_mandir}/man8/ftpdctl.8*
%{_mandir}/man8/ftpscrub.8*
@@ -546,6 +487,12 @@ fi
%{_mandir}/man1/ftpwho.1*
%changelog
+* Fri May 16 2014 Paul Howarth <paul at city-fan.org> 1.3.5-1
+- Update to 1.3.5 (see NEWS for details)
+- Drop upstreamed patches
+- Drop sysv-to-systemd migration script
+- No longer need to support pam_stack
+
* Fri Dec 20 2013 Paul Howarth <paul at city-fan.org> 1.3.4d-5
- Fix support for 8192-bit DH parameters (#1044586)
- Add 3072-bit and 7680-bit DH parameters (upstream bug 4002)
diff --git a/sources b/sources
index 2149f04..3054b9a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-13c6fd7ce320886adc371c81a3e23f07 proftpd-1.3.4d.tar.gz
-cc0e479406436e474ca7d59994fa73bb proftpd-mod-geoip-0.3.tar.gz
-6db495b25e9da2ba0c901e7c44e119bc proftpd-mod-vroot-0.9.2.tar.gz
-ad574713bcd00f62883ff2f9a84eec1f Test-Unit-0.14.tar.gz
+aff1bff40e675244d72c4667f203e5bb proftpd-1.3.5.tar.gz
More information about the scm-commits
mailing list