| Summary: | net-ftp/proftpd: version bumps (1.3.2a + 1.3.3rc1) | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Bernd Lommerzheim <bernd> |
| Component: | [OLD] Server | Assignee: | Luca Longinotti (RETIRED) <chtekk> |
| Status: | RESOLVED FIXED | ||
| Severity: | enhancement | CC: | greg.loscombe, net-ftp, oandarilho01 |
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| URL: | http://proftpd.org | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Attachments: |
proftpd-1.3.2a.ebuild patch against proftpd-1.3.2-r2.ebuild
ProFTPD 1.3.3rc1 ebuild proftpd.conf.sample for the proftpd-1.3.3_rc1.ebuild proftpd.rc7 init-script for the proftpd-1.3.3_rc1.ebuild ProFTPD 1.3.3rc1 ebuild proftpd.conf.sample patch against proftpd.conf.sample proftpd 1.3.3rc1 ebuild patch against proftpd-1.3.3_rc1.ebuild |
||
|
Description
Bernd Lommerzheim
2009-07-03 14:35:24 UTC
Created attachment 196513 [details, diff]
proftpd-1.3.2a.ebuild patch against proftpd-1.3.2-r2.ebuild
Created attachment 196515 [details]
ProFTPD 1.3.3rc1 ebuild
Created attachment 196517 [details]
proftpd.conf.sample for the proftpd-1.3.3_rc1.ebuild
Created attachment 196519 [details]
proftpd.rc7 init-script for the proftpd-1.3.3_rc1.ebuild
pkg_setup() shouldn't be use that way with EAPI=2. Please move its content to src_prepare() or better, use USE dependencies. In particular:
__check_dependency() {
if use $1 && ! use $2 ; then
eerror
eerror "ProFTPD with $1 support requires to compile ProFTPD with $2"
eerror "support. If you want ProFTPD with the \"$1\" USE-flag you have"
eerror "to build ProFTPD with USE=\"+$1 +$2\"."
die "Building ProFTPD with $1 support requires to enable $2 support!"
fi
}
__check_dependency shaper ctrls
__check_dependency sftp openssl
__check_dependency ssl openssl
seem a bit nonsense, what about merging those couples into a single one?
Fabio, thank you for your reply. As far as I know EAPI=2 allows to define that another package needs a required USE-flag. For example: Package A requires package B with USE-flag C enabled. But here I want to check "package internal" USE-dependencies. If you want to build ProFTPD with SSL support you have to enable the openssl USE-flag. Is there any construct in EAPI="2" to define such "package internal" USE-dependencies? Ok! Well, I've just changed that two lines, which was also changed in your proftpd-1.3.3_rc1.ebuild. I've tested your ebuild here, but had a problem. -> This was the error: (...) checking for libutil.h... no checking for setproctitle in -lutil... no checking sys/pstat.h usability... no checking sys/pstat.h presence... no checking for sys/pstat.h... no checking whether __progname and __progname_full are available... yes checking which argv replacement method to use... writeable checking whether printf supports %llu format... yes checking checking for duplicate module build requests... yes configure: error: duplicate build request for mod_ctrls -- aborting * * ERROR: net-ftp/proftpd-1.3.3_rc1 failed. * Call stack: * ebuild.sh, line 49: Called src_configure * environment, line 2775: Called econf '--sbindir=/usr/sbin' '--localstatedir=/var/run/proftpd' '--sysconfdir=/etc/proftpd' '--enable-shadow' '--enable-autoshadow' '--enable-facl' '--disable-auth-file' '--enable-cap' '--enable-ctrls' '--enable-ident' '--enable-ipv6' '--enable-ncurses' '--enable-nls' '--enable-openssl' '--disable-trace' '--enable-auth-pam' '--with-includes=/usr/include/mysql' '--with-includes=/usr/include/openssl' '--with-modules=mod_facl:mod_clamav:mod_ctrls:mod_ctrls_admin:mod_sql:mod_sql_mysql:mod_tls:mod_tls_shmcache:mod_wrap' * ebuild.sh, line 534: Called die * The specific snippet of code: * die "econf failed" * The die message: * econf failed * -> The emerge -av proftpd output: 12:03 viajante proftpd # emerge -av =net-ftp/proftpd-1.3.3_rc1 These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild U ] net-ftp/proftpd-1.3.3_rc1 [1.3.2-r2] USE="acl caps%* clamav ctrls%* ident%* ipv6 mysql ncurses nls openssl%* pam ssl tcpd -authfile -ban -case -deflate -doc% -exec% -hardened -ifsession -kerberos -ldap -postgres -radius -ratio% -readme% -rewrite (-selinux) -sftp% -shaper -sitemisc -softquota -trace% -vroot -xinetd (-noauthunix%) (-opensslcrypt%)" 0 kB -> My emerge --info: 13:21 viajante proftpd # emerge --info Portage 2.1.6.13 (default/linux/x86/2008.0, gcc-4.1.2, glibc-2.10.1-r0, 2.6.29-gentoo-r5 i686) ================================================================= System uname: Linux-2.6.29-gentoo-r5-i686-AMD_Turion-tm-_64_X2_Mobile_Technology_TL-60-with-glibc2.0 Timestamp of tree: Mon, 27 Jul 2009 13:00:01 +0000 ccache version 2.4 [enabled] app-shells/bash: 3.2_p39 dev-java/java-config: 1.3.7-r1, 2.1.8-r1 dev-lang/python: 2.5.4-r3 dev-python/pycrypto: 2.0.1-r8 dev-util/ccache: 2.4-r7 dev-util/cmake: 2.6.4 sys-apps/baselayout: 2.0.1 sys-apps/openrc: 0.4.3-r3 sys-apps/sandbox: 1.6-r2 sys-devel/autoconf: 2.13, 2.63-r1 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.2 sys-devel/binutils: 2.18-r3 sys-devel/gcc-config: 1.4.1 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.27-r2 ACCEPT_KEYWORDS="x86" CBUILD="i686-pc-linux-gnu" CFLAGS="-march=athlon-xp -msse3 -O2 -pipe -fomit-frame-pointer" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/config" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/udev/rules.d" CXXFLAGS="-march=athlon-xp -msse3 -O2 -pipe -fomit-frame-pointer" DISTDIR="/usr/portage/distfiles" FEATURES="ccache distlocks fixpackages metadata-transfer parallel-fetch protect-owned sandbox sfperms strict unmerge-orphans userfetch" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo" LC_ALL="pt_BR.UTF8" LDFLAGS="-Wl,-O1" LINGUAS="pt_BR" MAKEOPTS="-j4" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/portage-overlay/armagetron /usr/portage-overlay/enlightenment /usr/portage-overlay" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="X acl acpi aiglx alsa apache2 arts asf bash-completion berkdb bzip2 cairo cdr clamav cli cracklib crypt cups dbus dri dvd dvdr dvdread encode ffmpeg foomaticdb fortran ftp gd gdbm gif glitz gpm hal iconv imlib ipv6 isdnlog jack joystick jpeg kde laptop latin1 libnotify lm_sensors mad maildir mbox midi mikmod mime mmap mmx mozilla mp3 mpeg mplayer mpm-worker msn mudflap mysql ncurses nforce2 nis nls nocd nptl nptlonly nsplugin nvidia ogg openal opengl openmp oss pam pcre pdf perl php pmu png pppd python qt3 quicktime readline reflection samba sdl session smp snmap sox spl srt sse sse2 ssl svg svga sysfs syslog tcl tcltk tcpd theora threads tiff truetype unicode usb vcd videos visualization vorbis win32codecs x86 xine xml xmlrpc xorg xpm xv xvid zlib" ALSA_CARDS="hda-intel" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="evdev keyboard mouse joystick" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="pt_BR" USERLAND="GNU" VIDEO_CARDS="nvidia" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS Hey Bruno, thanks for your testing.
> Well, I've just changed that two lines, which was also changed in your
> proftpd-1.3.3_rc1.ebuild.
I do not really unterstand what you changed in which ebuild. But I could reproduce the error you have posted in my proftpd-1.3.1_rc1.ebuild. I will attach a new version which solves this problem and has two small little other changes (upgrade of mod_deflate to 0.3.3 and incorrect spaces instead of tabs). Please test that ebuild. Thanks a lot.
Created attachment 199569 [details]
ProFTPD 1.3.3rc1 ebuild
(In reply to comment #9) > I do not really unterstand what you changed in which ebuild. But I could > reproduce the error you have posted in my proftpd-1.3.1_rc1.ebuild. I will > attach a new version which solves this problem and has two small little other > changes (upgrade of mod_deflate to 0.3.3 and incorrect spaces instead of tabs). > Please test that ebuild. Thanks a lot. I've changed the CLAMAV_VER content and the "clamav?" line of the SRC_URI variable content of the original proftpd-1.3.2-r2 ebuild, to use the new mod_clamav-0.11rc instead of the old mod_clamav-0.10. BTW I tested this new 1.3.3 ebuild you uploaded, and this time the compilation goes well. BUT, there's no /etc/init.d/proftpd after the emerge!! =p Do you have put the "proftpd.conf.sample" and "proftpd.rc7" into the "files" subdirectory of the "$your-overlay$/net-ftp/proftpd" directory? (In reply to comment #12) > Do you have put the "proftpd.conf.sample" and "proftpd.rc7" into the "files" > subdirectory of the "$your-overlay$/net-ftp/proftpd" directory? Ow... sorry for that.. really a shame.. =p Now you're done. :) Compile .. OK Test .. OK Thanks again for the hard work, I'll commit it when I get back! any chance to get this into the tree: the latest ebuild works fine here on a hardened gentoo with the newly introduces feature sftp. Nice thing. Thx for the great ebuild, Bernd. Portage 2.1.6.13 (hardened/amd64, gcc-3.4.6, glibc-2.9_p20081201-r2, 2.6.28-hardened-r9 x86_64) ================================================================= System uname: Linux-2.6.28-hardened-r9-x86_64-QEMU_Virtual_CPU_version_0.10.50-with-gentoo-1.12.11.1 Timestamp of tree: Sun, 30 Aug 2009 04:15:01 +0000 app-shells/bash: 3.2_p39 dev-lang/python: 2.6.2-r1 dev-util/cmake: 2.6.4 sys-apps/baselayout: 1.12.11.1 sys-apps/sandbox: 1.6-r2 sys-devel/autoconf: 2.63-r1 sys-devel/automake: 1.10.2 sys-devel/binutils: 2.18-r3 sys-devel/gcc-config: 1.4.1 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.27-r2 ACCEPT_KEYWORDS="amd64" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe " CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/udev/rules.d" CXXFLAGS="-O2 -pipe " DISTDIR="/usr/portage/distfiles" FEATURES="distlocks fixpackages parallel-fetch protect-owned sandbox sfperms strict unmerge-orphans userfetch" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo" LDFLAGS="-Wl,-O1" LINGUAS="de" MAKEOPTS="-j3" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp/baltix" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/media/overlays/local" SYNC="rsync://tunafix/gentoo-portage" USE="amd64 berkdb cracklib crypt hardened justify mmx nls nptl nptlonly pam pic readline sse sse2 ssl sysfs tcpd urandom xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="de" USERLAND="GNU" VIDEO_CARDS="vesa cirrus" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, LC_ALL, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS [ebuild R ] net-ftp/proftpd-1.3.3_rc1 USE="caps ctrls hardened ident mysql nls openssl pam sftp ssl tcpd -acl -authfile -ban -case -clamav -deflate -doc -exec -ifsession -ipv6 -kerberos -ldap -ncurses -postgres -radius -ratio -readme -rewrite (-selinux) -shaper -sitemisc -softquota -trace -vroot -xinetd" 0 kB [?=>1] Just added 1.3.2a in portage, now looking in 1.3.3_rc1 Added 1.3.3_rc1 with almost no changes (openssl is now automatically enabled if either sftp or ssl is asked). Enjoy! Thanks all for the testing, and huge thanks Bernd for the new ebuild Thought I should add some "user experience" of moving from 1.3.2-r2 to 1.3.3rc1 Ironically, if you don't compile proftpd with IPv6, the use of directive UseIPv6 off causes a configuration error so I think it will give most a smoother journey if the proftpd.conf.sample has it included as #UseIPv6 off Also, although it's said in technical terms, far from all will probably not understand that it's not enough to do a % /etc/init.d/proftpd stop and % /etc/init.d/proftpd start you have to manually kill the old pid or the new server can never bind as standalone on start up. Nothing major really but could be improved for the next ebuild ;-) Thanks Bernard for adding the ebuild to the tree! And thanks Joakim for your experience with the new ebuild. I will attach two patches (proftpd-1.3.3_rc1.ebuild.patch and proftpd.conf.sample.patch) with the following changes: * Add a check if a 'old' ProFTPD server is running. The problem is that the new init-script does not 'find' the pid-file of the 'old' server and hence it can not stop the old ProFTPD server. Now you have to stop the server with the old init-script and then you can install the update. * Remove the "UseIPV6 off" line from the proftpd.conf.sample. You can control the IPv6 support with the ipv6 USE-flag and hence the option is not needed in the default configuration file. * Enable ctrls support only with USE="+ctrls" (default). * Change "+ident" to "ident". * Alphabetize some parts and improve code style. Additional note: With the removal of the openssl use-flag you can not build a ProFTPD server with OpenSSL support and without SSL and SFTP support. You can use OpenSSL if you want to store your passwords as for example sha1-hashs in a database on a pure ftp server without ssl and sftp. But in ProFTPD 1.3.3_rc2 the new module mod_sql_passwd will be included to use such hashs in databases without OpenSSL. So I think that such an additional use-flag is not needed anymore. While reviewing the ebuild I got a question: Why do you add "+" to the ssl use-flag? Created attachment 203802 [details, diff]
proftpd.conf.sample patch against proftpd.conf.sample
Created attachment 203803 [details, diff]
proftpd 1.3.3rc1 ebuild patch against proftpd-1.3.3_rc1.ebuild
The +ssl was a mistake (leftover from tweaking the ebuild openssl/ssl use flags), I've committed all your changes in -r1 (even if the default conf change is minimal, we'll be sure everyone picks it up)! Apart from bug #284853 (undefined symbol in mod_gss), 1.3.3_rc1 seems to be ok All done for this one |
