From owner-svn-ports-all@freebsd.org Sun Jan 24 15:26:36 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DC45757C; Sun, 24 Jan 2016 15:26:36 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E2D7A91A; Sun, 24 Jan 2016 15:26:35 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OFQYiZ005438; Sun, 24 Jan 2016 15:26:34 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OFQYjj005431; Sun, 24 Jan 2016 15:26:34 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201601241526.u0OFQYjj005431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 24 Jan 2016 15:26:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407155 - in branches/2016Q1/security/slurpie: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2016 15:26:36 -0000 Author: feld Date: Sun Jan 24 15:26:34 2016 New Revision: 407155 URL: https://svnweb.freebsd.org/changeset/ports/407155 Log: MFH: r407127 security/slurpie: change use of _offset to ftell - canonize patches, while there PR: 205230 Submitted by: jhb Approved by: ports-secteam (with hat) Added: branches/2016Q1/security/slurpie/files/patch-src_master.c - copied unchanged from r407127, head/security/slurpie/files/patch-src_master.c branches/2016Q1/security/slurpie/files/patch-src_mn.h - copied unchanged from r407127, head/security/slurpie/files/patch-src_mn.h branches/2016Q1/security/slurpie/files/patch-src_slurp.c - copied unchanged from r407127, head/security/slurpie/files/patch-src_slurp.c Deleted: branches/2016Q1/security/slurpie/files/patch-mn.h branches/2016Q1/security/slurpie/files/patch-src_mater.c Modified: branches/2016Q1/security/slurpie/Makefile branches/2016Q1/security/slurpie/files/patch-Makefile branches/2016Q1/security/slurpie/files/patch-src_node.c Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/security/slurpie/Makefile ============================================================================== --- branches/2016Q1/security/slurpie/Makefile Sun Jan 24 15:25:54 2016 (r407154) +++ branches/2016Q1/security/slurpie/Makefile Sun Jan 24 15:26:34 2016 (r407155) @@ -3,6 +3,7 @@ PORTNAME= slurpie PORTVERSION= 2.0b +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/ \ http://people.FreeBSD.org/~foxfair/distfiles/ Modified: branches/2016Q1/security/slurpie/files/patch-Makefile ============================================================================== --- branches/2016Q1/security/slurpie/files/patch-Makefile Sun Jan 24 15:25:54 2016 (r407154) +++ branches/2016Q1/security/slurpie/files/patch-Makefile Sun Jan 24 15:26:34 2016 (r407155) @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Jan 30 13:14:03 1999 -+++ Makefile Sun Feb 13 19:11:27 2000 +--- Makefile.orig 1999-01-30 21:14:03 UTC ++++ Makefile @@ -1,7 +1,6 @@ -CC = gcc all: slurpie slurp Copied: branches/2016Q1/security/slurpie/files/patch-src_master.c (from r407127, head/security/slurpie/files/patch-src_master.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/security/slurpie/files/patch-src_master.c Sun Jan 24 15:26:34 2016 (r407155, copy of r407127, head/security/slurpie/files/patch-src_master.c) @@ -0,0 +1,11 @@ +--- src/master.c.orig 1999-01-30 21:08:08 UTC ++++ src/master.c +@@ -132,7 +132,7 @@ char *get_time_str( u_int seconds ) + return timestr; + } + +-int main( int argc, u_char **argv ) ++int main( int argc, char **argv ) + { + static unsigned id, init_time; + Copied: branches/2016Q1/security/slurpie/files/patch-src_mn.h (from r407127, head/security/slurpie/files/patch-src_mn.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/security/slurpie/files/patch-src_mn.h Sun Jan 24 15:26:34 2016 (r407155, copy of r407127, head/security/slurpie/files/patch-src_mn.h) @@ -0,0 +1,18 @@ +--- src/mn.h.orig 1999-01-30 21:09:01 UTC ++++ src/mn.h +@@ -2,11 +2,12 @@ + #define _MN_H_ + + ///////////////////////////////// +-#include +-#include +-#include + #include + #include ++#include ++#include ++#include ++#include + + + ///////////////////////////////// Modified: branches/2016Q1/security/slurpie/files/patch-src_node.c ============================================================================== --- branches/2016Q1/security/slurpie/files/patch-src_node.c Sun Jan 24 15:25:54 2016 (r407154) +++ branches/2016Q1/security/slurpie/files/patch-src_node.c Sun Jan 24 15:26:34 2016 (r407155) @@ -1,6 +1,4 @@ -diff --git src/node.c src/node.c -index 28d5d8a..3135ea0 100644 ---- src/node.c +--- src/node.c.orig 1999-01-30 21:10:17 UTC +++ src/node.c @@ -102,7 +102,7 @@ void clean_up( int exit_status ) Copied: branches/2016Q1/security/slurpie/files/patch-src_slurp.c (from r407127, head/security/slurpie/files/patch-src_slurp.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/security/slurpie/files/patch-src_slurp.c Sun Jan 24 15:26:34 2016 (r407155, copy of r407127, head/security/slurpie/files/patch-src_slurp.c) @@ -0,0 +1,11 @@ +--- src/slurp.c.orig 2016-01-24 14:16:26 UTC ++++ src/slurp.c +@@ -194,7 +194,7 @@ int recv_init( u_char *initmsg ) + return 0; + // get file size and divide to determine portion of dictionary to process per task + fseek(wl.dictfile, 0, SEEK_END ); +- wl.ptask_size = wl.dictfile->_offset / cfg.ptask_level; ++ wl.ptask_size = ftell(wl.dictfile) / cfg.ptask_level; + pstr += strlen(pstr)+1; + } + if( cfg.mcl & CL_GDICT )