rpms/pure-ftpd/EL-5 .cvsignore, 1.3, 1.4 pure-ftpd.spec, 1.17, 1.18 sources, 1.3, 1.4 pure-ftpd-1.0.20-libdir.patch, 1.1, NONE pure-ftpd-1.0.21-utime.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/pure-ftpd/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23123

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Removed Files:
	pure-ftpd-1.0.20-libdir.patch pure-ftpd-1.0.21-utime.patch 
Log Message:
* Thu May 13 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.0.29-1.1
- Bump to a later release (per request from Tristan Santore)
- Pull Fedora changes:
- make pam and consolehelper's conf files noreplace (Aurelien Bompard)
- fix bug #586513 (Aurelien Bompard)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Feb 2006 18:56:27 -0000	1.3
+++ .cvsignore	13 May 2010 17:21:28 -0000	1.4
@@ -1 +1 @@
-pure-ftpd-1.0.21.tar.bz2
+pure-ftpd-1.0.29.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/EL-5/pure-ftpd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pure-ftpd.spec	8 May 2009 17:11:24 -0000	1.17
+++ pure-ftpd.spec	13 May 2010 17:21:29 -0000	1.18
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.21
-Release:    16%{?dist}
+Version:    1.0.29
+Release:    1%{?dist}.1
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.21.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -14,10 +14,8 @@ Source4:    pure-ftpd.pure-ftpwho.pam
 Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Source6:    pure-ftpd.README.SELinux
 Source7:    pure-ftpd.pureftpd.te
-Patch0:     pure-ftpd-1.0.21-config.patch
-Patch1:     pure-ftpd-1.0.20-libdir.patch
+Patch0:     pure-ftpd-1.0.27-config.patch
 Patch2:     pure-ftpd-paminclude.patch
-Patch3:     pure-ftpd-1.0.21-utime.patch
 Provides:   ftpserver
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pam-devel, perl, python, libcap-devel
@@ -73,9 +71,7 @@ Pure-FTPd to be protected in the same wa
 %prep
 %setup -q
 %patch0 -p0 -b .config
-%patch1 -p0 -b .libdir
 %patch2 -p0 -b .paminclude
-%patch3 -p1 -b .utime
 install -pm 644 %{SOURCE6} README.SELinux
 mkdir selinux
 cp -p %{SOURCE7} selinux/pureftpd.te
@@ -208,15 +204,15 @@ fi
 %post selinux
 if [ "$1" -le "1" ]; then # Fist install
     semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || :
-    fixfiles -R pure-ftpd restore
-    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 
+    fixfiles -R pure-ftpd restore || :
+    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 || :
 fi
 
 %preun selinux
 if [ "$1" -lt "1" ]; then # Final removal
     semodule -r pureftpd 2>/dev/null || :
-    fixfiles -R pure-ftpd restore
-    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 
+    fixfiles -R pure-ftpd restore || :
+    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 || :
 fi
 
 %postun selinux
@@ -232,7 +228,7 @@ fi
 %defattr(-, root, root, -)
 %doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
 %doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
-%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
+%doc README.LDAP README.PGSQL README.MySQL README.Donations README.TLS
 %doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
 %{_bindir}/pure-*
 %{_sbindir}/pure-*
@@ -241,8 +237,8 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
-%config %{_sysconfdir}/pam.d/pure-ftpwho
-%config %{_sysconfdir}/security/console.apps/pure-ftpwho
+%config(noreplace) %{_sysconfdir}/pam.d/pure-ftpwho
+%config(noreplace) %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{!?_without_tls:%{_sysconfdir}/pki/%{name}}
 %{_mandir}/man8/*
 %dir /var/ftp/
@@ -255,6 +251,12 @@ fi
 
 
 %changelog
+* Thu May 13 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.0.29-1.1
+- Bump to a later release (per request from Tristan Santore)
+- Pull Fedora changes:
+- make pam and consolehelper's conf files noreplace (Aurelien Bompard)
+- fix bug #586513 (Aurelien Bompard)
+
 * Fri May 08 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.0.21-16
 - Fix SITE UTIME (Nickolay Bunev, #498431)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Feb 2006 18:56:27 -0000	1.3
+++ sources	13 May 2010 17:21:29 -0000	1.4
@@ -1 +1 @@
-ca8a8dbec0cd9c8ea92fc4c37ea9c410  pure-ftpd-1.0.21.tar.bz2
+12a074824b509f9e7684fab333ed6915  pure-ftpd-1.0.29.tar.bz2


--- pure-ftpd-1.0.20-libdir.patch DELETED ---


--- pure-ftpd-1.0.21-utime.patch DELETED ---