* [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd/files: proftpd.rc6 proftpd.conf proftpd-1.3.2-parallel-build.patch
@ 2009-02-17 22:05 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; only message in thread
From: Bernard Cafarelli (voyageur) @ 2009-02-17 22:05 UTC (permalink / raw
To: gentoo-commits
voyageur 09/02/17 22:05:07
Modified: proftpd.rc6 proftpd.conf
Added: proftpd-1.3.2-parallel-build.patch
Log:
r1 version that should fix a few currently open bugs
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Revision Changes Path
1.13 net-ftp/proftpd/files/proftpd.rc6
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6?r1=1.12&r2=1.13
Index: proftpd.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- proftpd.rc6 17 Apr 2008 07:57:57 -0000 1.12
+++ proftpd.rc6 17 Feb 2009 22:05:07 -0000 1.13
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.12 2008/04/17 07:57:57 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.13 2009/02/17 22:05:07 voyageur Exp $
opts="${opts} reload"
@@ -17,7 +17,7 @@
return 1
fi
ebegin "Checking proftpd configuration"
- /usr/sbin/proftpd -t -c /etc/proftpd/proftpd.conf &>/dev/null
+ /usr/sbin/proftpd -t -c /etc/proftpd/proftpd.conf
eend $? "Configuration error: please fix your configuration file (/etc/proftpd/proftpd.conf)."
}
1.7 net-ftp/proftpd/files/proftpd.conf
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.conf?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.conf?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.conf?r1=1.6&r2=1.7
Index: proftpd.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- proftpd.conf 23 Sep 2006 18:17:38 -0000 1.6
+++ proftpd.conf 17 Feb 2009 22:05:07 -0000 1.7
@@ -1,7 +1,7 @@
# This is a basic ProFTPD configuration file (rename it to
-# 'proftpd.conf' for actual use. It establishes a single server
-# and a single anonymous login. It assumes that you have a user/group
-# "nobody" and "ftp" for normal operation and anonymous access.
+# 'proftpd.conf' for actual use. It establishes a single server
+# and a single anonymous login. It assumes that you have a user/group
+# "proftpd" and "ftp" for normal operation and anon.
ServerName "ProFTPD Default Installation"
ServerType standalone
@@ -9,48 +9,60 @@
RequireValidShell off
AuthPAM off
AuthPAMConfig ftp
+
# Port 21 is the standard FTP port.
Port 21
+# Don't use IPv6 support by default.
+UseIPv6 off
+
# Umask 022 is a good standard umask to prevent new dirs and files
# from being group and world writable.
Umask 022
# To prevent DoS attacks, set the maximum number of child processes
-# to 30. If you need to allow more than 30 concurrent connections
-# at once, simply increase this value. Note that this ONLY works
+# to 30. If you need to allow more than 30 concurrent connections
+# at once, simply increase this value. Note that this ONLY works
# in standalone mode, in inetd mode you should use an inetd server
-# that allows you to limit the maximum number of processes per service
+# that allows you to limit maximum number of processes per service
# (such as xinetd).
-MaxInstances 30
+MaxInstances 30
# Set the user and group under which the server will run.
User proftpd
Group proftpd
+# To cause every FTP user to be "jailed" (chrooted) into their home
+# directory, uncomment this line.
+#DefaultRoot ~
+
# Normally, we want files to be overwriteable.
-<Directory />
- AllowOverwrite on
-</Directory>
+AllowOverwrite on
+
+# Bar use of SITE CHMOD by default
+<Limit SITE_CHMOD>
+ DenyAll
+</Limit>
-# A basic anonymous configuration, with no upload directories.
+# A basic anonymous configuration, no upload directories. If you do not
+# want anonymous users, simply delete this entire <Anonymous> section.
<Anonymous ~ftp>
- User ftp
- Group ftp
+ User ftp
+ Group ftp
- # We want clients to be able to login with "anonymous" as well as "ftp".
- UserAlias anonymous ftp
+ # We want clients to be able to login with "anonymous" as well as "ftp"
+ UserAlias anonymous ftp
- # Limit the maximum number of anonymous logins.
- MaxClients 10
+ # Limit the maximum number of anonymous logins
+ MaxClients 10
- # We want 'welcome.msg' displayed at login, and '.message' displayed
- # in each newly chdired directory.
- DisplayLogin welcome.msg
- DisplayFirstChdir .message
-
- # Limit WRITE everywhere in the anonymous chroot.
- <Limit WRITE>
- DenyAll
- </Limit>
+ # We want 'welcome.msg' displayed at login, and '.message' displayed
+ # in each newly chdired directory.
+ DisplayLogin welcome.msg
+ DisplayChdir .message
+
+ # Limit WRITE everywhere in the anonymous chroot
+ <Limit WRITE>
+ DenyAll
+ </Limit>
</Anonymous>
1.1 net-ftp/proftpd/files/proftpd-1.3.2-parallel-build.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd-1.3.2-parallel-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd-1.3.2-parallel-build.patch?rev=1.1&content-type=text/plain
Index: proftpd-1.3.2-parallel-build.patch
===================================================================
diff -ru proftpd-1.3.2-orig/Makefile.in proftpd-1.3.2/Makefile.in
--- proftpd-1.3.2-orig/Makefile.in 2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2/Makefile.in 2009-02-16 14:28:43.000000000 +0100
@@ -54,13 +54,13 @@
proftpd$(EXEEXT): lib src modules dirs locale
$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(MAIN_LDFLAGS) -o $@ $(BUILD_PROFTPD_OBJS) $(BUILD_PROFTPD_ARCHIVES) $(LIBS) $(MAIN_LIBS)
-ftpcount$(EXEEXT): utils
+ftpcount$(EXEEXT): lib utils
$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
-ftpdctl$(EXEEXT): src
+ftpdctl$(EXEEXT): lib src
$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
-ftpshut$(EXEEXT): utils
+ftpshut$(EXEEXT): lib utils
$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
ftptop$(EXEEXT): lib utils
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-17 22:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-17 22:05 [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd/files: proftpd.rc6 proftpd.conf proftpd-1.3.2-parallel-build.patch Bernard Cafarelli (voyageur)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox