/[smage]/trunk/extras/proftpd/proftpd-1.3.3-r1.smage2

Diff of /trunk/extras/proftpd/proftpd-1.3.3-r1.smage2

Parent Directory | Revision Log | View Patch Patch

-revision 5065 by niro,
Tue Mar  2 22:13:55 2010 UTC
+revision 5066 by niro,
Wed Mar  3 19:11:32 2010 UTC
 Line 12 
 HOMEPAGE="http://proftpd.org/"
  DEPEND=">= sys-libs/ncurses-5.7
  	>= sys-libs/pam-1.1
+ 	>= sys-libs/libcap-2.17
  	>= dev-libs/openssl-0.9.8k
- 	>= sys-apps/tcp-wrappers-7.6"
+ 	>= sys-apps/tcp-wrappers-7.6
+ 	>= sys-apps/acl-2.2
+ 	>= sys-apps/attr-2.4
+ 	>= net-nds/openldap-2.4.19
+ 	>= dev-db/mysql5-5.1.40"
  SDEPEND=">= sys-dev/gettext-0.17"
  SRCFILE="${PNAME}-${PVER}.tar.bz2"
  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
- MODULES_CVS_REV=1.3
+ MODULES_CVS_REV=1.4
+ RC_CVS_REV=1.2
  sminclude mbuild mtools
  SRC_URI=(
  	ftp://ftp.proftpd.org/distrib/source/${SRCFILE}
  	mirror://${PNAME}/${SRCFILE}
- 	mirror://${PNAME}/${PNAME}-1.3.1-config.patch
+ 	mirror://${PNAME}/${PNAME}-${PVER}-config.patch
+ 	mirror://${PNAME}/${PNAME}-${PVER}-config-pam.patch
+ 	mirror://${PNAME}/${PNAME}-${PVER}-config-tls.patch
+ 	mirror://${PNAME}/${PNAME}-${PVER}-config-tls-cosmetic.patch
+ 	mirror://${PNAME}/${PNAME}-${PVER}-config-ban.patch
+ 	mirror://${PNAME}/${PNAME}-${PVER}-config-ldap.patch
+ 	mirror://${PNAME}/${PNAME}-${PVER}-config-anonymous.patch
  	mirror://${PNAME}/${PNAME}-1.3.0a-cracklib.patch
- 	mirror://${PNAME}/${PNAME}-1.3.1-find-umode_t.patch
  	mirror://${PNAME}/ftpusers
  	mirror://${PNAME}/modules.conf-${MODULES_CVS_REV}
- 	mirror://${PNAME}/proftpd.rc
+ 	mirror://${PNAME}/proftpd.rc-${RC_CVS_REV}
+ 	mirror://${PNAME}/proftpd.confd
  	mirror://${PNAME}/proftpd.pam
  	mirror://${PNAME}/proftpd.logrotate
  )
-Line 45 
 src_prepare()
+Line 57 
 src_prepare()
  	cd ${SRCDIR}
  	# adjust configs to match magellan
- 	mpatch ${PNAME}-1.3.1-config.patch || die
+ 	mpatch ${PNAME}-${PVER}-config.patch || die
+ 	# enable pam support
+ 	mpatch ${PNAME}-${PVER}-config-pam.patch || die
+ 	# enable tls support
+ 	mpatch ${PNAME}-${PVER}-config-tls.patch || die
+ 	# fix tls description
+ 	mpatch ${PNAME}-${PVER}-config-tls-cosmetic.patch || die
+ 	# enable ban-list support
+ 	mpatch ${PNAME}-${PVER}-config-ban.patch || die
+ 	# enable ldap support
+ 	mpatch ${PNAME}-${PVER}-config-ldap.patch || die
+ 	# enable anonymous support
+ 	mpatch ${PNAME}-${PVER}-config-anonymous.patch || die
  	# fix cracklib location in ftpasswd
  	mpatch ${PNAME}-1.3.0a-cracklib.patch || die
- 	# fix compile issues with umode_t
- 	mpatch ${PNAME}-1.3.1-find-umode_t.patch || die
  }
  src_compile()
  {
  	cd ${SRCDIR}
- 	# ToDO: sql, mysql, postgres, ldap
+ 	# ToDO: postgres
  	# the modules.conf must be fixed to
- 	#   LoadModule mod_sql.c
- 	#   LoadModule mod_ldap.c
- 	#   LoadModule mod_sql_mysql.c
  	#   LoadModule mod_sql_postgres.c
- 	#   LoadModule mod_quotatab_ldap.c
- 	#   LoadModule mod_quotatab_sql.c
  	# new: mod_ban, mod_lang, mod_quotatab_radius, mod_wrap2, mod_wrap2_file, mod_wrap2_sql
+ 	# mod_facl, mod_ldap, mod_sql, mod_sql_passwd, mod_sql_mysql, mod_sftp, mod_sftp_pam,
+ 	# mod_sftp_sql, mod_quotatab_ldap, mod_quotatab_radius, mod_quotatab_sql, mod_tls_shmchache
  	local dso_modules="mod_ratio:mod_radius:mod_rewrite:mod_tls:mod_wrap:mod_quotatab"
- 	dso_modules="${dso_modules}:mod_quotatab_file:mod_site_misc:mod_ctrls_admin"
+ 	dso_modules+=":mod_quotatab_file:mod_site_misc:mod_ctrls_admin"
  	# the new ones
- 	dso_modules="${dso_modules}:mod_ban:mod_wrap2:mod_wrap2_file"
+ 	dso_modules+=":mod_ban:mod_wrap2:mod_wrap2_file"
+ 	dso_modules+=":mod_sftp:mod_sftp_pam:mod_shaper"
+ 	dso_modules+=":mod_quotatab_radius:mod_tls_shmcache"
+ 	# mysql
+ 	dso_modules+=":mod_sql:mod_sql_passwd:mod_sql_mysql:mod_sftp_sql:mod_quotatab_sql"
+ 	# ldap
+ 	dso_modules+="mod_ldap:mod_quotatab_ldap"
+ 	# acl
+ 	dso_modules+=":mod_facl"
  	# must be the last one, see: http://www16.de.proftpd.org/docs/contrib/mod_ifsession.html#Installation
- 	dso_modules="${dso_modules}:mod_ifsession"
+ 	dso_modules+=":mod_ifsession"
+ 	# non shared modules
  	local modules="mod_auth_pam:mod_readme"
  	mconfigure \
  		--sysconfdir=/etc/proftpd \
- 		--localstatedir=/var/run \
+ 		--localstatedir=/var/run/proftpd \
  		--libexecdir=/usr/$(mlibdir)/proftpd \
- 		--enable-auth-unix \
+ 		--enable-shadow \
+ 		--enable-autoshadow \
+ 		--enable-auth-pam \
  		--enable-nls \
  		--enable-ncurses \
  		--enable-shadow \
-Line 93 
 src_compile()
+Line 131 
 src_compile()
  		--enable-ctrls \
  		--enable-dso \
  		--enable-ipv6 \
+ 		--enable-openssl \
+ 		--with-includes=/usr/include/openssl \
+ 		--with-includes=/usr/include/mysql \
+ 		--enable-cap \
+ 		--enable-facl \
+ 		--enable-auth-file \
  		--with-modules=${modules} \
  		--with-shared=${dso_modules} \
  		|| die
-Line 117 
 src_install()
+Line 161 
 src_install()
  	minstallpam proftpd.pam proftpd || die
  	# install initscript
- 	minstallrc proftpd.rc proftpd || die
+ 	minstallrc proftpd.rc-${RC_CVS_REV} proftpd || die
+ 	# install rc config
+ 	minstallconf proftpd.conf proftpd || die
  	# install logrotate config
  	minstalllog proftpd.logrotate proftpd || die

 Legend:



Removed from v.5065
 


changed lines


 
Added in v.5066
 Legend:



Removed from v.5065
 


changed lines


 
Added in v.5066
-Removed from v.5065
+Added in v.5066