rpms/pure-ftpd/devel pure-ftpd.spec,1.3,1.4

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13706/devel

Modified Files:
	pure-ftpd.spec 
Log Message:
- build feature-complete by default
- add TLS support
- see bug #162849




Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pure-ftpd.spec	23 Mar 2005 22:19:44 -0000	1.3
+++ pure-ftpd.spec	1 Aug 2005 20:24:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.20
-Release:    2.fc4
+Release:    3%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -17,10 +17,10 @@
 Provides:   ftpserver
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pam-devel, perl, python, libcap-devel
-#BuildRequires: openssl-devel
-%{?_with_ldap:BuildRequires:  openldap-devel}
-%{?_with_mysql:BuildRequires: mysql-devel}
-%{?_with_pgsql:BuildRequires: postgresql-devel}
+%{!?_without_ldap:BuildRequires:  openldap-devel}
+%{!?_without_mysql:BuildRequires: mysql-devel}
+%{!?_without_pgsql:BuildRequires: postgresql-devel}
+%{!?_without_tls:BuildRequires: openssl-devel}
 
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
@@ -38,10 +38,11 @@
 ports for passive downloads, UL/DL ratios, native LDAP and SQL support,
 Apache log files and more.
 Rebuild switches:
---with ldap     enable ldap support
---with mysql    enable mysql support
---with pgsql    enable postgresql support
---with extauth  enable external authentication
+--without ldap     disable ldap support
+--without mysql    disable mysql support
+--without pgsql    disable postgresql support
+--without extauth  disable external authentication
+--without tls      disable SSL/TLS
 
 
 %prep
@@ -71,12 +72,12 @@
             --with-virtualchroot \
             --with-largefile \
             --sysconfdir=%{_sysconfdir}/%{name} \
-            --without-tls \
             --without-rendezvous \
-            %{?_with_ldap} \
-            %{?_with_mysql} \
-            %{?_with_pgsql} \
-            %{?_with_extauth}
+            %{!?_without_tls:--with-tls --with-certfile=%{_sysconfdir}/pki/%{name}/%{name}.pem} \
+            %{!?_without_ldap:--with-ldap} \
+            %{!?_without_mysql:--with-mysql} \
+            %{!?_without_pgsql:--with-pgsql} \
+            %{!?_without_extauth:--with-extauth}
 
 make %{?_smp_mflags}
 
@@ -90,6 +91,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/ftp
+%{!?_without_tls:install -d -m 700 $RPM_BUILD_ROOT%{_sysconfdir}/pki/%{name}}
 
 # Conf 
 install -p -m 755 configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}
@@ -168,11 +170,17 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %config %{_sysconfdir}/pam.d/pure-ftpwho
 %config %{_sysconfdir}/security/console.apps/pure-ftpwho
+%{!?_without_tls:%{_sysconfdir}/pki/%{name}}
 %{_mandir}/man8/*
 %dir /var/ftp/
 
 
 %changelog
+* Mon Aug 01 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-3
+- build feature-complete by default
+- add TLS support
+- see bug #162849
+
 * Wed Mar 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.20-2.fc4
 - implement Jose's RFE in bug 151337: pure-ftpwho can be run
   by a normal user.