packages: proftpd/proftpd.spec - BR: acl-devel for mod_facl, moved from cor...

Mon Jun 8 02:54:03 CEST 2009

Author: gotar                        Date: Mon Jun  8 00:54:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: acl-devel for mod_facl, moved from core to DSO,
- moved auth_file and ident from core to DSO (enabled by default), other
  modules are either unshareable or won't build this way (ctrls, log, site, delay, facts),
- build ifsession and lang DSOs, no extra deps so included in common subpackage,
- BR: libcap-devel for mod_cap,
- rewritten conf.d/*.conf files generation, create them in loop,
- use libexecdir in paths, release 4

---- Files affected:
packages/proftpd:
   proftpd.spec (1.264 -> 1.265) 

---- Diffs:

================================================================
Index: packages/proftpd/proftpd.spec
diff -u packages/proftpd/proftpd.spec:1.264 packages/proftpd/proftpd.spec:1.265

--- packages/proftpd/proftpd.spec:1.264	Mon Jun  8 01:34:23 2009
+++ packages/proftpd/proftpd.spec	Mon Jun  8 02:53:58 2009
@@ -22,7 +22,7 @@
 Summary(zh_CN.UTF-8):	易于管理的,安全的 FTP 服务器
 Name:		proftpd
 Version:	1.3.2
-Release:	3
+Release:	4
 Epoch:		2
 License:	GPL v2+
 Group:		Daemons
@@ -45,8 +45,10 @@
 Patch4:		%{name}-nostrip.patch
 Patch5:		%{name}-logout.patch
 URL:		http://www.proftpd.org/
+BuildRequires:	acl-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libcap-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libwrap-devel
 %if %{with mysql} || %{with quotamysql}
@@ -453,10 +455,15 @@
 %{__autoconf}
 
 MODULES="
+mod_auth_file
+mod_ident
 mod_ratio
 mod_readme
 mod_rewrite
 mod_wrap
+mod_facl
+mod_ifsession
+mod_lang
 %{?with_ssl:mod_tls}
 %{?with_pam:mod_auth_pam}
 %{?with_ldap:mod_ldap}
@@ -464,7 +471,6 @@
 %{?with_quotaldap:mod_quotatab mod_quotatab_ldap}
 %{?with_quotamysql:mod_quotatab mod_quotatab_sql}
 %{?with_quotapgsql:mod_quotatab mod_quotatab_sql}
-%{?with_linuxprivs:mod_linuxprivs}
 %{?with_mysql:mod_sql mod_sql_mysql}
 %{?with_pgsql:mod_sql mod_sql_postgres}
 "
@@ -472,10 +478,10 @@
 MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
 %configure \
 	--with-includes=/usr/include/ncurses%{?with_mysql::%{_includedir}/mysql} \
+	--disable-auth-file \
 	--enable-autoshadow \
 	--enable-ctrls \
 	--enable-dso \
-	--enable-facl \
 	%{?with_ipv6:--enable-ipv6} \
 	--enable-sendfile \
 	%{!?with_ssl:--disable-tls} \
@@ -499,21 +505,25 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_auth_pam.conf
-%{?with_ldap:echo 'LoadModule        mod_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ldap.conf}
-echo 'LoadModule        mod_quotatab.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab.conf
-echo 'LoadModule        mod_quotatab_file.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_file.conf
-%{?with_quotaldap:echo 'LoadModule        mod_quotatab_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_ldap.conf}
-echo 'LoadModule        mod_ratio.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ratio.conf
-echo 'LoadModule        mod_readme.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_readme.conf
-echo 'LoadModule        mod_rewrite.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_rewrite.conf
-%if %{with mysql} || %{with pgsql}
-echo 'LoadModule        mod_quotatab_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_sql.conf
-echo 'LoadModule        mod_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql.conf
-%endif
-%{?with_mysql:echo 'LoadModule        mod_sql_mysql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_mysql.conf}
-%{?with_pgsql:echo 'LoadModule        mod_sql_postgres.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_postgres.conf}
+MODULES="
+mod_auth_file
+mod_ident
+mod_ratio
+mod_readme
+mod_rewrite
+mod_wrap
+%{?with_ldap:mod_ldap}
+%{?with_quotafile:mod_quotatab mod_quotatab_file}
+%{?with_quotaldap:mod_quotatab mod_quotatab_ldap}
+%{?with_quotamysql:mod_quotatab mod_quotatab_sql}
+%{?with_quotapgsql:mod_quotatab mod_quotatab_sql}
+%{?with_mysql:mod_sql mod_sql_mysql}
+%{?with_pgsql:mod_sql mod_sql_postgres}
+"
+for module in $MODULES; do
+	echo "LoadModule	$module.c" > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/$module.conf
+done
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_tls.conf
-echo 'LoadModule        mod_wrap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_wrap.conf
 install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/anonftp.conf
 
 %{?with_pam:install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/ftp}
@@ -532,8 +542,8 @@
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.ftp
 
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+rm $RPM_BUILD_ROOT%{_libexecdir}/*.a
+rm $RPM_BUILD_ROOT%{_libexecdir}/*.la
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
 cp -aL include/* config.h $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -628,10 +638,17 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/ftpusers
 %attr(640,root,root) %{_sysconfdir}/ftpusers.default
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_auth_file.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ident.conf
 #%attr(640,root,root) %ghost /var/log/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
-%dir %{_libdir}/%{name}
+%dir %{_libexecdir}
+%attr(755,root,root) %{_libexecdir}/mod_auth_file.so
+%attr(755,root,root) %{_libexecdir}/mod_facl.so
+%attr(755,root,root) %{_libexecdir}/mod_ident.so
+%attr(755,root,root) %{_libexecdir}/mod_ifsession.so
+%attr(755,root,root) %{_libexecdir}/mod_lang.so
 %dir %{_localstatedir}/proftpd
 %{_mandir}/man[18]/*
 %dir /var/lib/ftp
@@ -763,6 +780,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.265  2009/06/08 00:53:58  gotar
+- BR: acl-devel for mod_facl, moved from core to DSO,
+- moved auth_file and ident from core to DSO (enabled by default), other
+  modules are either unshareable or won't build this way (ctrls, log, site, delay, facts),
+- build ifsession and lang DSOs, no extra deps so included in common subpackage,
+- BR: libcap-devel for mod_cap,
+- rewritten conf.d/*.conf files generation, create them in loop,
+- use libexecdir in paths, release 4
+
 Revision 1.264  2009/06/07 23:34:23  gotar
 - package more docs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/proftpd/proftpd.spec?r1=1.264&r2=1.265&f=u

