From 64bf37dd0e58baf1215d39abe612393ed3711bef Mon Sep 17 00:00:00 2001
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Sun, 24 Jan 2016 14:27:14 +0000
Subject: security/slurpie: change use of _offset to ftell

- canonize patches, while there

PR:		205230
Submitted by:	jhb
---
 security/slurpie/Makefile                 |  1 +
 security/slurpie/files/patch-Makefile     |  4 ++--
 security/slurpie/files/patch-mn.h         | 18 ------------------
 security/slurpie/files/patch-src_master.c | 11 +++++++++++
 security/slurpie/files/patch-src_mater.c  | 13 -------------
 security/slurpie/files/patch-src_mn.h     | 18 ++++++++++++++++++
 security/slurpie/files/patch-src_node.c   |  4 +---
 security/slurpie/files/patch-src_slurp.c  | 11 +++++++++++
 8 files changed, 44 insertions(+), 36 deletions(-)
 delete mode 100644 security/slurpie/files/patch-mn.h
 create mode 100644 security/slurpie/files/patch-src_master.c
 delete mode 100644 security/slurpie/files/patch-src_mater.c
 create mode 100644 security/slurpie/files/patch-src_mn.h
 create mode 100644 security/slurpie/files/patch-src_slurp.c

(limited to 'security/slurpie')

diff --git a/security/slurpie/Makefile b/security/slurpie/Makefile
index d84ca49f2e4d..3f5ef5099ad3 100644
--- a/security/slurpie/Makefile
+++ b/security/slurpie/Makefile
@@ -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/
diff --git a/security/slurpie/files/patch-Makefile b/security/slurpie/files/patch-Makefile
index 450926dfc99c..4097dbb336e3 100644
--- a/security/slurpie/files/patch-Makefile
+++ b/security/slurpie/files/patch-Makefile
@@ -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
diff --git a/security/slurpie/files/patch-mn.h b/security/slurpie/files/patch-mn.h
deleted file mode 100644
index 41c8a0b7f4a0..000000000000
--- a/security/slurpie/files/patch-mn.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/mn.h.orig	Sat Jan 30 13:09:01 1999
-+++ src/mn.h	Sun Feb 13 19:13:32 2000
-@@ -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>
- 
- 
- /////////////////////////////////
diff --git a/security/slurpie/files/patch-src_master.c b/security/slurpie/files/patch-src_master.c
new file mode 100644
index 000000000000..6a2d134dd6b1
--- /dev/null
+++ b/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;
+ 
diff --git a/security/slurpie/files/patch-src_mater.c b/security/slurpie/files/patch-src_mater.c
deleted file mode 100644
index 393a3dbf45d9..000000000000
--- a/security/slurpie/files/patch-src_mater.c
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git src/master.c src/master.c
-index 4b24f9b..683d9a6 100644
---- src/master.c
-+++ 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;
- 
diff --git a/security/slurpie/files/patch-src_mn.h b/security/slurpie/files/patch-src_mn.h
new file mode 100644
index 000000000000..a57635abcc96
--- /dev/null
+++ b/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>
+ 
+ 
+ /////////////////////////////////
diff --git a/security/slurpie/files/patch-src_node.c b/security/slurpie/files/patch-src_node.c
index 10862a84ffb5..4ebb28504413 100644
--- a/security/slurpie/files/patch-src_node.c
+++ b/security/slurpie/files/patch-src_node.c
@@ -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 )
  
diff --git a/security/slurpie/files/patch-src_slurp.c b/security/slurpie/files/patch-src_slurp.c
new file mode 100644
index 000000000000..d573827d79c0
--- /dev/null
+++ b/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 )
-- 
cgit v1.2.3