Index: head/ftp/vsftpd/files/patch-aa =================================================================== --- head/ftp/vsftpd/files/patch-aa (revision 45690) +++ head/ftp/vsftpd/files/patch-aa (nonexistent) @@ -1,57 +0,0 @@ -diff -ur sysutil.c work2/vsftpd-0.0.10/sysutil.c ---- sysutil.c Wed Jan 31 03:39:15 2001 -+++ sysutil.c Sat Feb 3 18:08:05 2001 -@@ -19,7 +19,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -30,7 +30,12 @@ - #include - #include - #include -+#ifndef BSD - #include -+#endif -+#ifdef BSD -+#include -+#endif - #include - #include - #include -@@ -38,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -378,7 +384,11 @@ - vsf_sysutil_set_nodelay(int fd) - { - int nodelay = 1; -+#ifndef BSD - int retval = setsockopt(fd, SOL_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); -+#else -+ int retval = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); -+#endif - if (retval != 0) - { - die("setsockopt"); -@@ -413,7 +423,11 @@ - int tos = IPTOS_THROUGHPUT; - - /* Ignore failure to set (maybe this IP stack demands privilege for this) */ -+#ifndef BSD - (void) setsockopt(fd, SOL_IP, IP_TOS, &tos, sizeof(tos)); -+#else -+ (void) setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)); -+#endif - } - - int Property changes on: head/ftp/vsftpd/files/patch-aa ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/vsftpd/Makefile =================================================================== --- head/ftp/vsftpd/Makefile (revision 45690) +++ head/ftp/vsftpd/Makefile (revision 45691) @@ -1,38 +1,38 @@ # New ports collection makefile for: vsftpd # Date created: 03 Feb 2001 # Whom: Neil Blakey-Milner # # $FreeBSD$ # PORTNAME= vsftpd -PORTVERSION= 0.0.10 +PORTVERSION= 0.0.15 CATEGORIES= ftp MASTER_SITES= ftp://ferret.lmh.ox.ac.uk/pub/linux/ MAINTAINER= nbm@FreeBSD.org ALL_TARGET= vsftpd post-patch: @${PERL} -i -p -e \ 's@^(#define VSFTP_DEFAULT_CONFIG )"[/]etc/vsftpd.conf"@\1"${PREFIX}/etc/vsftpd.conf"@' \ ${WRKSRC}/defs.h @${PERL} -i -p \ -e 's@ -ldl@@;' \ -e 's@^CFLAGS.*$$@@' \ ${WRKSRC}/Makefile @${ECHO} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> ${WRKSRC}/vsftpd.conf do-install: @${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/ @${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist @# @${INSTALL} -d ${PREFIX}/share/vsftpd/empty @if [ ! -e ${PREFIX}/etc/vsftpd.conf ]; then \ ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/ ; \ fi @# @${PERL5} ${PKGINSTALL} .include Property changes on: head/ftp/vsftpd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/ftp/vsftpd/distinfo =================================================================== --- head/ftp/vsftpd/distinfo (revision 45690) +++ head/ftp/vsftpd/distinfo (revision 45691) @@ -1 +1 @@ -MD5 (vsftpd-0.0.10.tar.gz) = f43b0fa54e47907502c5800ed877e387 +MD5 (vsftpd-0.0.15.tar.gz) = 74eadb6c203cc90359632c91e6bb2b9a Property changes on: head/ftp/vsftpd/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/ftp/vsftpd/pkg-install =================================================================== --- head/ftp/vsftpd/pkg-install (revision 45690) +++ head/ftp/vsftpd/pkg-install (revision 45691) @@ -1,77 +1,77 @@ #!/usr/bin/perl # @groups = ("operator"); %users = ('ftp', "operator"); # daemon, local, pop, queue, remote, deliver, respectively. # alias is a special case above... %gids = ('operator', 5); %uids = ('ftp', 14); if ($ENV{PACKAGE_BUILDING} || $ARGV[1] eq "PRE-INSTALL") { $doguid=1; # Make sure we get the assigned guids. } foreach $group (@groups) { if (! getgrnam ($group)) { do checkrpw; # May exit $x = "-g $gids{$group}"; $result = system ("/usr/sbin/pw groupadd $group $x"); if ($result) { die "Failed to add group $group as gid $gids{$group}\n"; } } } foreach $user (keys %users) { if (! getpwnam ($user)) { do checkrpw; # May exit $x = "-u $uids{$user}"; $result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"/var/ftp\" -s /nonexistent $x"); if ($result) { die "Failed to add user $user as uid $uids{$user}\n"; } } } # Check that all gids/uids are as they should be... # If we are being installed as a package... if ($doguid) { foreach $group (@groups) { if (getgrnam($group) != $gids{$group}) { die "Group $group should have gid $gids{$group}\n"; } } foreach $user (keys %users) { if (getpwnam($user) != $uids{$user}) { die "User $user should have uid $uids{$user}\n"; } } } exit 0; sub checkrpw { if (! -x "/usr/sbin/pw") { print <<'EOM'; This system looks like a pre-2.2 version of FreeBSD. We see that it is missing the "pw" utility. We need this utility. Please get and install it, and try again. You can get the source from: ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz EOM die "No /usr/sbin/pw"; } if ($> != 0) { - print "It is necessary to add missing vpopmail users/groups at"; + print "It is necessary to add missing vsftpd users/groups at"; print "this stage. Please either add them manually or retry"; print "as root."; # Let pw(1) signal the failure so the user can see which # group/user is actually missing. } } Property changes on: head/ftp/vsftpd/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property