From 8098028448eb2af25bc56510932bb880716b65ba Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Feb 09 2006 18:30:16 +0000 Subject: Update to 1.3.0rc3. --- diff --git a/.cvsignore b/.cvsignore index 6eef123..25cce15 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -proftpd-1.2.10.tar.bz2 +proftpd-1.3.0rc3.tar.bz2 diff --git a/proftpd.spec b/proftpd.spec index bc40f45..cb05760 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -1,11 +1,11 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd -Version: 1.2.10 -Release: 7%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist} +Version: 1.3.0 +Release: 0.1.rc3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ -Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2 +Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc3.tar.bz2 Source1: proftpd.conf Source2: proftpd.init Source3: proftpd-xinetd @@ -38,11 +38,11 @@ needed scripts to have it run by xinetd instead are included. Available rpmbuild rebuild options : --without : tls ---with : ldap mysql postgresql +--with : ldap mysql postgresql ipv6 %prep -%setup +%setup -n %{name}-%{version}rc3 %build @@ -64,6 +64,7 @@ fi %configure \ --localstatedir="/var/run" \ --with-includes="%{_includedir}%{!?_without_tls:${OPENSSL_INC}}%{?_with_mysql::%{_includedir}/mysql}" \ + %{?_with_ipv6:--enable-ipv6} \ %{?_with_mysql:--with-libraries="%{_libdir}/mysql"} \ %{?_with_postgresql:--with-libraries="%{_libdir}"} \ --with-modules=mod_readme:mod_auth_pam%{?_with_ldap::mod_ldap}%{?_with_mysql::mod_sql:mod_sql_mysql}%{?_with_postgresql::mod_sql:mod_sql_postgres}%{!?_without_tls::mod_tls} @@ -75,12 +76,16 @@ fi %makeinstall rundir="%{buildroot}%{_localstatedir}/run/proftpd" \ INSTALL_USER=`id -un` \ INSTALL_GROUP=`id -gn` -%{__install} -D -m 640 %{SOURCE1} %{buildroot}%{_sysconfdir}/proftpd.conf -%{__install} -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd -%{__install} -D -m 640 %{SOURCE3} %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd -%{__install} -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/proftpd -%{__install} -D -m 644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg -%{__install} -D -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd +%{__install} -D -p -m 640 %{SOURCE1} \ + %{buildroot}%{_sysconfdir}/proftpd.conf +%{__install} -D -p -m 755 %{SOURCE2} \ + %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd +%{__install} -D -p -m 640 %{SOURCE3} \ + %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd +%{__install} -D -p -m 644 %{SOURCE4} \ + %{buildroot}%{_sysconfdir}/logrotate.d/proftpd +%{__install} -D -p -m 644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg +%{__install} -D -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd %{__mkdir_p} %{buildroot}/var/ftp/uploads %{__mkdir_p} %{buildroot}/var/ftp/pub %{__mkdir_p} %{buildroot}/var/log/proftpd @@ -140,8 +145,11 @@ fi %changelog +* Thu Feb 9 2006 Matthias Saou 1.3.0-0.1.rc3 +- Update to 1.3.0rc3, which builds with the latest openssl. + * Thu Nov 17 2005 Matthias Saou 1.2.10-7 -- Rebuild against new openssl library. +- Rebuild against new openssl library... not. * Wed Jul 13 2005 Matthias Saou 1.2.10-6 - The provided pam.d file no longer works, use our own based on the one from diff --git a/sources b/sources index 5786226..01e5844 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 +050c3e2caec0d930f8a331e7b3ec0931 proftpd-1.3.0rc3.tar.bz2