Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Jan 2016 14:27:14 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407127 - in head/security/slurpie: . files
Message-ID:  <201601241427.u0OEREKY083476@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Sun Jan 24 14:27:14 2016
New Revision: 407127
URL: https://svnweb.freebsd.org/changeset/ports/407127

Log:
  security/slurpie: change use of _offset to ftell
  
  - canonize patches, while there
  
  PR:		205230
  Submitted by:	jhb

Added:
  head/security/slurpie/files/patch-src_master.c
     - copied, changed from r407126, head/security/slurpie/files/patch-src_mater.c
  head/security/slurpie/files/patch-src_mn.h
     - copied, changed from r407126, head/security/slurpie/files/patch-mn.h
  head/security/slurpie/files/patch-src_slurp.c   (contents, props changed)
Deleted:
  head/security/slurpie/files/patch-mn.h
  head/security/slurpie/files/patch-src_mater.c
Modified:
  head/security/slurpie/Makefile
  head/security/slurpie/files/patch-Makefile
  head/security/slurpie/files/patch-src_node.c

Modified: head/security/slurpie/Makefile
==============================================================================
--- head/security/slurpie/Makefile	Sun Jan 24 14:05:33 2016	(r407126)
+++ head/security/slurpie/Makefile	Sun Jan 24 14:27:14 2016	(r407127)
@@ -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: head/security/slurpie/files/patch-Makefile
==============================================================================
--- head/security/slurpie/files/patch-Makefile	Sun Jan 24 14:05:33 2016	(r407126)
+++ head/security/slurpie/files/patch-Makefile	Sun Jan 24 14:27:14 2016	(r407127)
@@ -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 and modified: head/security/slurpie/files/patch-src_master.c (from r407126, head/security/slurpie/files/patch-src_mater.c)
==============================================================================
--- head/security/slurpie/files/patch-src_mater.c	Sun Jan 24 14:05:33 2016	(r407126, copy source)
+++ head/security/slurpie/files/patch-src_master.c	Sun Jan 24 14:27:14 2016	(r407127)
@@ -1,6 +1,4 @@
-diff --git src/master.c src/master.c
-index 4b24f9b..683d9a6 100644
---- src/master.c
+--- 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;

Copied and modified: head/security/slurpie/files/patch-src_mn.h (from r407126, head/security/slurpie/files/patch-mn.h)
==============================================================================
--- head/security/slurpie/files/patch-mn.h	Sun Jan 24 14:05:33 2016	(r407126, copy source)
+++ head/security/slurpie/files/patch-src_mn.h	Sun Jan 24 14:27:14 2016	(r407127)
@@ -1,5 +1,5 @@
---- src/mn.h.orig	Sat Jan 30 13:09:01 1999
-+++ src/mn.h	Sun Feb 13 19:13:32 2000
+--- src/mn.h.orig	1999-01-30 21:09:01 UTC
++++ src/mn.h
 @@ -2,11 +2,12 @@
  #define _MN_H_
  

Modified: head/security/slurpie/files/patch-src_node.c
==============================================================================
--- head/security/slurpie/files/patch-src_node.c	Sun Jan 24 14:05:33 2016	(r407126)
+++ head/security/slurpie/files/patch-src_node.c	Sun Jan 24 14:27:14 2016	(r407127)
@@ -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 )
  

Added: head/security/slurpie/files/patch-src_slurp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/slurpie/files/patch-src_slurp.c	Sun Jan 24 14:27:14 2016	(r407127)
@@ -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 )



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601241427.u0OEREKY083476>