From owner-freebsd-ports-bugs Sat Feb 8 12:10:30 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6572537B401 for ; Sat, 8 Feb 2003 12:10:20 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41C9B43F3F for ; Sat, 8 Feb 2003 12:10:18 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h18KA8NS021021 for ; Sat, 8 Feb 2003 12:10:08 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h18KA8Ag021020; Sat, 8 Feb 2003 12:10:08 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F274D37B401 for ; Sat, 8 Feb 2003 12:08:55 -0800 (PST) Received: from hotmail.com (f20.law10.hotmail.com [64.4.15.20]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33D8243FBD for ; Sat, 8 Feb 2003 12:08:53 -0800 (PST) (envelope-from delphij@hotmail.com) Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Sat, 8 Feb 2003 12:08:53 -0800 Received: from 61.50.43.3 by lw10fd.law10.hotmail.msn.com with HTTP; Sat, 08 Feb 2003 20:08:52 GMT Message-Id: Date: Sun, 09 Feb 2003 04:08:52 +0800 From: "öÎ Àî" To: freebsd-gnats-submit@FreeBSD.org Cc: delphij@frontfree.net Subject: ports/48096: [patch] update ports/proftpd to 1.2.8rc2 Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 48096 >Category: ports >Synopsis: [update] ProFTPD 1.2.8rc2 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Feb 08 12:10:08 PST 2003 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 5.0-CURRENT i386 >Organization: Frontfree Technology Network >Environment: System: FreeBSD cluster.frontfree.net 5.0-CURRENT FreeBSD 5.0-CURRENT #16: Sun Feb 7 19:03:55 CST 2003 delphij@:/usr/obj/usr/src/sys/CNPROXY i386 >Description: ProFTPD 1.2.8rc2 released recently. This updates ports/ftp/proftpd to the most recent release, solving update problem, adds a new manpage. This obsoletes ports/46189. In addition at least ports/46189 should be applied because there're some security improvements on 1.2.7-R >How-To-Repeat: http://www.proftpd.org >Fix: Apply the patch below, and delete the following files in ports/ftp/proftpd/files: patch-ah patch-ai as they are obsolete for the port. begin 644 proftpd.patch.bz2 M0EIH.3%!629363>SJEP`"CY?@&LP7O___W__W^2_[__[8`Y2&4]2>IC94V$GM%`#3U`T,@`````!*$$TR M!,$FJ;U,IY3]33&J8)H!D#0`#RC30#FC1H:80#3`FF@#(:&(`T8C0P1D`$FE M$@U)DQ3U&)B,F@>D]0&GJ`:`:&@T``$DD4>H'Z*>IIZ0;2`VH`#1Z@-/4``` M``2)!"9,FA$],HPGI!,F!HGJ-33!-J/29#)D>DTY0Y%=\W00$8PA^?D5X3Q? MH>-FF/(;M=;JS4I@QF?>4V&E$&;>N'ZB9`[/?+/]$HP"JB*4!089&%[<+?0O MY_MW._?]6A+$[NVJ,94G.%Z8*BD3Q/`,,&\7D,1`8!7M6IL_J='RSO\\G#K]693(YU:^VR5MJ0,>:WS+[DR(68[ML:LY45A[ M80<."1F$P@+#&Z+31`TMM:SF#)X%"X%VKE5%-Z$E9#%"!)GU%V\()0LK`R72 M367VT1T4N)Y!*?AI='=XDQ!;XS(.7+`RG3J]Z<^>4[]=>JVV22%,5\WYT%;C MD)A"52YM*H$9X+>[V^;MY`-ATAZ?(M"99W.PTNP+EMDE%)1#Z<5OE;Z(M.NP M\ZT#I%EZ*#3FR$$SBM(]$?H!C;:W83A7.;XH?AI.0W98LE:M7H*UJ6,!L'MC MG:"1J83V>31T(^7T*OF#F93ZI2*2B3APR;G.'NYNH)&Z^S8,A0Q+1QUF) MN$BIQ-$PYU.*K-=;>Z$@8'1(*$@:;&$ZQ2S69!KHHE+(1L%V%RE^IFGA#JAZ M]-3?QH1"<"-+'WD.)*R2UF$X0?@Y7E+J6QHTA\;<`6S7J MO:SSA&O,E&!CB=YZ_;!1MT`C&2IV\'*K"OL)5!^R86Z`H;+:17>K:KE5OG)^ M5.ZN'$DL//&+)"=B&CP?6=]-=:UC-15K3)='D\)81/T.WYOE(+=^B[E,!C)G MK5:1V'KD5_+[I[%^LQ2_+`3B9%J+C;T(X=O\C0"?(&GMU5:%#F9CY!B1R4M3 MIZ4V84,[//+$B&=QP@E7-%.^YTP@H%U]UILX\DN*\JT7J6_79GII%;;#HA>56AC56JKTLM-9O3JXE7RM/A2'EC\]Q]EAC-/H!$@Q@442"BHB*C@I4DP21+"D4AB0+9 M$O7UZ->TY"VZ\4]PZ`][I+@5+K2\MOL]-V7.,Z7&WJR<`UM$[#Q%-C#-9'QI"B,,_P6&.DC:9F84)<[)X MK7J;7,%R]#;&-O+,>KXD=.[Q;V]7`&F>,7TAD,66Q:>^=N'>/.C-FQ1X]9G7 M.BB(B(O?FY[.S#;1N!C'.?)*<1`QCHT4I(G/`G)H*(.[0&,Q*$`#I;`4+.CH MBHW90P`!<;S)^W"&`),"CJZH4 M%0T2).N.CK4'ORD7!"!`RR8AS;U\_=V9NU9`<(Y"ZTLLVF#8: MLZ,(M%[/<^&$.2I55N5CLDZ5DI4>MVN;LI+U_F3?$B3A\1;MC]OVD@ZN2E)T M&F-=ASG^S8;YY\FD5HU[-]U3G,L!:NKM$@T"1-(.T*.C@B(41#]4R MX]_:Q+WI3(95@A#H9!L#:'#"J5756^MP)(Z2U`$M@UB2\,P0:C6%C734>RS' M=NY?N*4R-@Y-&"XF6TQ0U!CXFH$$L/V4?FX5A<(.ZE>!S#Z'T4_4)+E3#3M_ M\)/4N8FB'^@@J`0"#8J?\5@E+@-"J3:LDID,2K-KR;"!)#A4B>'?L#> M"!9@*(&?L0WJ""!$2A%[NOF/@?&L1.^@04"5;'+(CNOPVX$919M$K;4.(9>N M*34L]"N&N#X=-ZWS0=Y:5\OB1-'("!HO-(@LD@QJ>";2(_?FD#*\/KH';@0O,S2->H9QQG8%EP'<"GW/U'YGL ML5^U^X2.-Q&"/BJ,&7I`P+=T)=28=B]J-2H!4RU2WJU0UL_!(R"0>5(91;)@ M%VA!SK4U[_ZPB31,7P6CU#O698.T#("1GH>8QK1T:!=J)2D%A3JKS,&-0*G1 M!TJK,6EID"("AI2,U2%#7'<2LN"@;5E.90`P%[!A>UASJ%@CKFR+-:E`8)D]12%H%<]6/+K/RM<7DGRHD9KNKG."J4'-T[@8%\RUEBAKZ$6X#DAE@; MP^&PO!?C9M)1V@?/ZG/0H)Y!D82X<.'DAC$DO:#SJ#(5%TJD.8^X-BEU(O7R M'KL6I;AEEY$,4AG=D=]0<)EQ52,+!G>D:3(2)2PX*H:-8ZG2BI,D96P97D0* M#A+H)=LD=F-5X>RSG5T"M`*K2/(`\Q,.NB@\4']/3$)Q%+&>E'^B2*!\/X4A M$AABBM8`168;T(H"CQ`=?L%XHTVS)@%`Z`Q(5*U"PI1"X0MZ7<3B`#6I+9(" METTU]1,D@^EX]3\,DR!Q,9`$J&@M*J:2O6K]XX]]30W0G!`8/>R!DYPU]6D] M$S(L(PFU)#TJ`6'I$.@\I,510(H@LTH2"!QOSP"1T?34UK%8%6)9G8P\T*#A MZ3:6ARH=,"LIXP+@KTDA:-G M=54:W;)\2P5@!]J\&E>`S7(:"RPR;189,G`']![8EP0%1`?RUQ M)4*DP'DBN5.E>RSIT])F33CDB-)D9;",\*`M&N\\R*B/!X!$` M#2L?B!@A7:.8W(A7-7>@A2?J'0*`$,!OR:1(DO.0!K2Z!AX4C5-DFFB1I4'/ M*4DLS5#!>2:2_$D%:%IHZ4C?`COF?(/<\>?XZ`LUB@2..48@TX>7P2U)M`C; MUD<7^"]!MO8,ZA<,$261`S2NLC>BWLHJDAJN9*<%C1(&%D5)JBE*@F490548 M[P"8D<6=2+0NN#>8L:FL*7R)[TCK4A-,L#K!E@^1)7)$!H?%:`J!IN"22L"0 M#4EJ"1I77<')ZH74-CPP#I86XKP1L?-DZ]R9-E)GC6O-@6-6%$>@M5Y!5RJ. M="&27BBNV@E:A785AJX5S#(:2FB0!-V;T:KJ)-9H3@A505MH`,)(AI9,!]!5 M(W)5FCI$EWAB`6G04#]B##.%@+`T%M3.::5@KSIV8IK^`KZ18&3Z#(DOO.U& MG@%PD]JM!SFPE=@X8')(>!3/,'?$.'_J206S: ?O:0=ULS`JKGM>,_XGP1((C))NG_B[DBG"A(&]G5+@``` ` end The following text patch is just for reference if you have problem decoding the patch above. diff -ruN proftpd.orig/Makefile proftpd/Makefile --- proftpd.orig/Makefile Sat Jan 4 23:53:38 2003 +++ proftpd/Makefile Sat Feb 8 03:11:42 2003 @@ -6,17 +6,17 @@ # PORTNAME= proftpd -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.8rc2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.net/distrib/source/ \ ftp://ftp.stikman.com/pub/proftpd/source/ \ ftp://ftp.dataguard.no/pub/proftpd/distrib/source/ \ ftp://ftp.club-internet.fr/pub/mirrors/ftp.proftpd.org/distrib/source/ -DISTNAME= ${PORTNAME}-1.2.6 +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= mharo@FreeBSD.org -MAN1= ftpcount.1 ftpwho.1 +MAN1= ftpcount.1 ftpwho.1 ftptop.1 MAN5= xferlog.5 MAN8= proftpd.8 ftpshut.8 @@ -90,24 +90,29 @@ -e 's:/usr/bin:${PREFIX}/bin:' \ < ${WRKSRC}/src/proftpd.8.pre_sed > ${WRKSRC}/src/proftpd.8 - @${MV} ${WRKSRC}/src/ftpshut.8 ${WRKSRC}/src/ftpshut.8.pre_sed + @${MV} ${WRKSRC}/utils/ftpshut.8 ${WRKSRC}/utils/ftpshut.8.pre_sed @${SED} -e 's:/usr/sbin:${PREFIX}/sbin:' \ -e 's:/etc:/var/run:' \ - < ${WRKSRC}/src/ftpshut.8.pre_sed > ${WRKSRC}/src/ftpshut.8 + < ${WRKSRC}/utils/ftpshut.8.pre_sed > ${WRKSRC}/utils/ftpshut.8 - @${MV} ${WRKSRC}/src/ftpcount.1 ${WRKSRC}/src/ftpcount.1.pre_sed + @${MV} ${WRKSRC}/utils/ftpcount.1 ${WRKSRC}/utils/ftpcount.1.pre_sed @${SED} -e 's:/usr/bin:${PREFIX}/bin:' \ - < ${WRKSRC}/src/ftpcount.1.pre_sed > ${WRKSRC}/src/ftpcount.1 + < ${WRKSRC}/utils/ftpcount.1.pre_sed > ${WRKSRC}/utils/ftpcount.1 + + @${MV} ${WRKSRC}/utils/ftptop.1 ${WRKSRC}/utils/ftptop.1.pre_sed + @${SED} -e 's:/usr/bin:${PREFIX}/bin:' \ + < ${WRKSRC}/utils/ftptop.1.pre_sed > ${WRKSRC}/utils/ftptop.1 do-install: @${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount @${INSTALL_PROGRAM} ${WRKSRC}/ftpwho ${PREFIX}/bin/ftpwho @${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd @${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut - @${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1 - @${INSTALL_MAN} ${WRKSRC}/src/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1 + @${INSTALL_MAN} ${WRKSRC}/utils/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1 + @${INSTALL_MAN} ${WRKSRC}/utils/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1 + @${INSTALL_MAN} ${WRKSRC}/utils/ftptop.1 ${PREFIX}/man/man1/ftptop.1 @${INSTALL_MAN} ${WRKSRC}/src/xferlog.5 ${PREFIX}/man/man5/xferlog.5 - @${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8 + @${INSTALL_MAN} ${WRKSRC}/utils/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8 @${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8 @${INSTALL_DATA} \ ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf.default diff -ruN proftpd.orig/distinfo proftpd/distinfo --- proftpd.orig/distinfo Sun Sep 15 02:50:14 2002 +++ proftpd/distinfo Sat Feb 8 02:09:07 2003 @@ -1 +1 @@ -MD5 (proftpd-1.2.6.tar.bz2) = 17551a5281a86fbc7857e31a723d5599 +MD5 (proftpd-1.2.8rc2.tar.bz2) = 1bc99a01cf66aa818219f4c43fb11b4a diff -ruN proftpd.orig/files/patch-aa proftpd/files/patch-aa --- proftpd.orig/files/patch-aa Wed Mar 7 08:32:00 2001 +++ proftpd/files/patch-aa Sat Feb 8 02:39:00 2003 @@ -1,14 +1,18 @@ ---- sample-configurations/basic.conf.old Sun Mar 4 15:08:09 2001 -+++ sample-configurations/basic.conf Sun Mar 4 15:13:29 2001 -@@ -1,3 +1,7 @@ -+# -+# To have more informations about Proftpd configuration -+# look at : http://www.proftpd.org/ -+# - # 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 -@@ -30,24 +34,36 @@ +--- sample-configurations/basic.conf.orig Sat Feb 8 02:18:54 2003 ++++ sample-configurations/basic.conf Sat Feb 8 02:36:26 2003 +@@ -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 anon. ++# ++# For more information about ProFTPD configuration, ++# please consult http://www.proftpd.org/ ++# + + ServerName "ProFTPD Default Installation" + ServerType standalone +@@ -31,25 +31,33 @@ AllowOverwrite on @@ -16,6 +20,7 @@ - - User ftp - Group ftp +- - # We want clients to be able to login with "anonymous" as well as "ftp" - UserAlias anonymous ftp - @@ -31,37 +36,34 @@ - - DenyAll - + +- +######################################################################### -+# # -+# Uncomment lines with only one # to allow basic anonymous access # -+# # ++# # ++# The original distribution assumes a basic anonymous access, which is # ++# disabled on this port. To activate it, remove the comment # below. # ++# # +######################################################################### -+### A basic anonymous configuration, no upload directories. -+# -+# User ftp -+# Group 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 -+ -+ ### It is wise when making an 'ftp' user that you either block its -+ ### ability to login either via /etc/login.access or my giving it -+ ### an invalid shell. -+ ### Uncomment this if the 'ftp' user you made has an invalid shell -+ -+ # RequireValidShell off + -+ ### 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 -+ # -+ # DenyAll -+ # - -- -+# ++## A basic anonymous configuration, no upload directories. ++# ++# User ftp ++# Group 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 ++# ++# # 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 ++# ++# DenyAll ++# ++# ++# diff -ruN proftpd.orig/files/patch-ah proftpd/files/patch-ah --- proftpd.orig/files/patch-ah Mon Dec 6 03:29:53 1999 +++ proftpd/files/patch-ah Thu Jan 1 08:00:00 1970 @@ -1,10 +0,0 @@ ---- modules/mod_unixpw.c.orig Thu Sep 30 20:33:47 1999 -+++ modules/mod_unixpw.c Sat Nov 13 13:15:26 1999 -@@ -42,6 +42,7 @@ - #include - #endif - #ifdef HAVE_PROT_H -+#include - #include - #endif - diff -ruN proftpd.orig/files/patch-ai proftpd/files/patch-ai --- proftpd.orig/files/patch-ai Mon Oct 21 04:51:22 2002 +++ proftpd/files/patch-ai Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- contrib/mod_ratio.c.orig Sun Oct 20 13:49:21 2002 -+++ contrib/mod_ratio.c Sun Oct 20 13:50:11 2002 -@@ -606,7 +606,7 @@ - add_response(R_214, - "Bytes: %s Down: %imb Up: %imb CR: %i Mbytes", - stats.btext, (stats.bretr / 1024), (stats.bstor / 1024), -- (stats.bytes / 1024), stats.bytes); -+ (stats.bytes / 1024)); - return HANDLED(cmd); - } - diff -ruN proftpd.orig/files/patch-pam proftpd/files/patch-pam --- proftpd.orig/files/patch-pam Fri Jun 14 05:00:23 2002 +++ proftpd/files/patch-pam Sat Feb 8 02:53:58 2003 @@ -1,41 +1,11 @@ ---- ./README.PAM.orig Mon Jan 21 16:25:42 2002 -+++ ./README.PAM Mon Jan 21 16:27:07 2002 -@@ -19,14 +19,8 @@ - - FreeBSD: - --To use PAM with ProFTPD, you must edit /etc/pam.conf and add the --following lines: -- --ftp auth required pam_unix.so try_first_pass --ftp account required pam_unix.so try_first_pass --ftp session required pam_permit.so -- --PAM authentication should now work properly. -+To use PAM with ProFTPD, you must set AuthPAMConfig to 'ftpd'. If you -+installed proftpd from the ports collection, this is already the default. - - Linux: - To use PAM with ProFTPD, you must edit /etc/pam.d/ftp and add the ---- doc/Configuration.html.orig Wed May 22 10:08:15 2002 -+++ doc/Configuration.html Sat Jun 1 10:30:54 2002 -@@ -3806,7 +3806,7 @@ - >

ftp

ftpd

Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message