svn commit: r407155 - in branches/2016Q1/security/slurpie: . files
Mark Felder
feld at FreeBSD.org
Sun Jan 24 15:26:36 UTC 2016
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 <stdio.h>
+-#include <stdarg.h>
+-#include <netinet/in.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <stdio.h>
++#include <stdarg.h>
+
+
+ /////////////////////////////////
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 )
More information about the svn-ports-all
mailing list