rpms/pure-ftpd/EL-5 pure-ftpd-paminclude.patch, NONE, 1.1 pure-ftpd.spec, 1.14, 1.15

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/pure-ftpd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4795/EL-5

Modified Files:
	pure-ftpd.spec 
Added Files:
	pure-ftpd-paminclude.patch 
Log Message:
Merge from devel

pure-ftpd-paminclude.patch:

--- NEW FILE pure-ftpd-paminclude.patch ---
--- ./pam/pure-ftpd.paminclude	2006-10-27 09:28:40.000000000 +0200
+++ ./pam/pure-ftpd	2006-10-27 09:37:22.000000000 +0200
@@ -4,13 +4,13 @@
 # Install it in /etc/pam.d/pure-ftpd or add to /etc/pam.conf
 
 auth       required     pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth       required     pam_stack.so service=system-auth
+auth       include      system-auth
 auth       required     pam_shells.so
 auth       required     pam_nologin.so
 
-account    required     pam_stack.so service=system-auth
+account    include      system-auth
 
-password   required     pam_stack.so service=system-auth
+password   include      system-auth
 
-session    required     pam_stack.so service=system-auth
+session    include      system-auth
 


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/EL-5/pure-ftpd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pure-ftpd.spec	30 Aug 2006 16:33:57 -0000	1.14
+++ pure-ftpd.spec	23 Apr 2008 07:33:45 -0000	1.15
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.21
-Release:    9%{?dist}
+Release:    15%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -16,6 +16,7 @@
 Source7:    pure-ftpd.pureftpd.te
 Patch0:     pure-ftpd-1.0.21-config.patch
 Patch1:     pure-ftpd-1.0.20-libdir.patch
+Patch2:     pure-ftpd-paminclude.patch
 Provides:   ftpserver
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pam-devel, perl, python, libcap-devel
@@ -24,9 +25,10 @@
 %{!?_without_pgsql:BuildRequires: postgresql-devel}
 %{!?_without_tls:BuildRequires: openssl-devel}
 # SELinux module
-BuildRequires: selinux-policy, selinux-policy-targeted, checkpolicy, m4
-%if "%{fedora}" >= "6"
-BuildRequires: selinux-policy-devel
+%if 0%{?fedora} == 5
+BuildRequires: checkpolicy, selinux-policy >= 2.2.40, m4
+%else
+BuildRequires: checkpolicy, selinux-policy-devel
 %endif
 
 Requires(post):   chkconfig
@@ -71,6 +73,7 @@
 %setup -q
 %patch0 -p0 -b .config
 %patch1 -p0 -b .libdir
+%patch2 -p0 -b .paminclude
 install -pm 644 %{SOURCE6} README.SELinux
 mkdir selinux
 cp -p %{SOURCE7} selinux/pureftpd.te
@@ -179,6 +182,14 @@
 if [ "$1" -le "1" ]; then # fist install
     /sbin/chkconfig --add pure-ftpd
 fi
+%if 0%{!?_without_tls:1}
+# TLS Certificate
+if [ ! -f %{_sysconfdir}/pki/%{name}/%{name}.pem ]; then
+  %{_sysconfdir}/pki/tls/certs/make-dummy-cert \
+    %{_sysconfdir}/pki/%{name}/%{name}.pem
+fi
+%endif
+
 
 %preun
 if [ "$1" -lt "1" ]; then
@@ -242,6 +253,21 @@
 
 
 %changelog
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.21-15
+- Autorebuild for GCC 4.3
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.0.21-14
+- Rebuild for deps
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-13
+- rebuild for BuildID
+
+* Sat Dec 09 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-12
+- rebuild
+
+* Sat Dec 09 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-11
+- rebuild
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-9
 - rebuild