Attachment #40234 for bug #63242

View | Details | Raw Unified | Return to bug 63242
Collapse All | Expand All




#

PORTNAME=	File-RsyncP
PORTVERSION=	0.46
CATEGORIES=	net perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=	File

post-patch:
	@${FIND} ${WRKSRC} -name \*.orig -delete

.include <bsd.port.pre.mk>

.if ${PERL_LEVEL} <= 500503
# make PREFIX-clean under perl 5.005_03
post-configure:
	${PERL} -pi -e 's,/usr/local/,\$$(PREFIX)/,g' \
		${WRKSRC}/Makefile \
		${WRKSRC}/Digest/Makefile \
		${WRKSRC}/FileList/Makefile
.endif

.include <bsd.port.post.mk>

Line 1 Link Here

(-)distinfo (-1 / +2 lines)
1	MD5 (File-RsyncP-0.44.tar.gz) = 1c238af568362c8ed6da7d2691fda1bb	1	MD5 (File-RsyncP-0.46.tar.gz) = b26561cc6fb32c4e73595ee941207a8c
		2	SIZE (File-RsyncP-0.46.tar.gz) = 57356




--- Digest/Digest.xs.orig	Sat Jan 10 16:27:37 2004
+++ Digest/Digest.xs	Sat Jan 10 16:28:38 2004
@@ -169,8 +169,7 @@
 	}
 
 SV *
-blockDigestUpdate(context, dataV, blockSize=700, blockLastLen=0, \
-		    md4DigestLen=16, seed=0)
+blockDigestUpdate(context, dataV, blockSize=700, blockLastLen=0, md4DigestLen=16, seed=0)
     PREINIT:
 	STRLEN len;
     INPUT:




--- lib/File/RsyncP/FileIO.pm.orig	Thu Jul 24 04:33:37 2003
+++ lib/File/RsyncP/FileIO.pm	Mon Jan 12 10:57:29 2004
@@ -44,7 +44,7 @@
 use File::Find;
 use Data::Dumper;
 
-our $VERSION = '0.44';
+use vars qw($VERSION); $VERSION = '0.44';
 
 use constant S_IFMT       => 0170000;	# type of file
 use constant S_IFDIR      => 0040000; 	# directory
@@ -664,7 +664,7 @@
 
     foreach my $str ( @logStr ) {
         next if ( $str eq "" );
-        $fio->{logHandler}($str);
+        $fio->{logHandler}->($str);
     }
 }
 




--- FileList/FileList.pm.orig	Mon Jan 12 10:52:48 2004
+++ FileList/FileList.pm	Mon Jan 12 10:53:50 2004
@@ -39,14 +39,13 @@
 
 package File::RsyncP::FileList;
 
-use 5.006;
 use strict;
-use warnings;
 
 require Exporter;
 require DynaLoader;
 
-our @ISA = qw(Exporter AutoLoader DynaLoader);
+use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @EXPORT $VERSION);
+@ISA = qw(Exporter AutoLoader DynaLoader);
 
 # Items to export into callers namespace by default. Note: do not export
 # names by default without a very good reason. Use EXPORT_OK instead.
@@ -55,16 +54,16 @@
 # This allows declaration	use File::RsyncP::FileList ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
-our %EXPORT_TAGS = ( 'all' => [ qw(
+%EXPORT_TAGS = ( 'all' => [ qw(
 	
 ) ] );
 
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 
-our @EXPORT = qw(
+@EXPORT = qw(
 	
 );
-our $VERSION = '0.44';
+$VERSION = '0.44';
 
 bootstrap File::RsyncP::FileList $VERSION;
 




--- FileList/FileList.xs.orig	Thu Jul 24 04:33:37 2003
+++ FileList/FileList.xs	Mon Jan 12 10:27:51 2004
@@ -93,8 +93,9 @@
 PROTOTYPES: DISABLE
 
 File::RsyncP::FileList
-new(packname = "File::RsyncP::FileList", SV* opts = NULL)
+new(packname = "File::RsyncP::FileList", opts = NULL)
 	char *packname
+	SV* opts
     CODE:
     {
         RETVAL = flist_new();
@@ -187,14 +188,14 @@
         if ( file->sum )
             hv_store(rh, "sum",      3, newSVpv(file->sum, 0), 0);
         hv_store(rh, "name",    4, newSVpv(f_name(file), 0), 0);
-        hv_store(rh, "uid",     3, newSVuv(file->uid), 0);
-        hv_store(rh, "gid",     3, newSVuv(file->gid), 0);
-        hv_store(rh, "mode",    4, newSVuv(file->mode), 0);
-        hv_store(rh, "mtime",   5, newSVuv(file->modtime), 0);
+        hv_store(rh, "uid",     3, newSViv(file->uid), 0);
+        hv_store(rh, "gid",     3, newSViv(file->gid), 0);
+        hv_store(rh, "mode",    4, newSViv(file->mode), 0);
+        hv_store(rh, "mtime",   5, newSViv(file->modtime), 0);
         hv_store(rh, "size",    4, newSVnv(file->length), 0);
         hv_store(rh, "dev",     3, newSVnv(file->dev), 0);
         hv_store(rh, "inode",   5, newSVnv(file->inode), 0);
-        hv_store(rh, "rdev",    4, newSVuv(file->rdev), 0);
+        hv_store(rh, "rdev",    4, newSViv(file->rdev), 0);
         RETVAL = newRV((SV*)rh);
     }
     OUTPUT:
@@ -210,9 +211,10 @@
     }
 
 void
-encode(flist, SV* data)
+encode(flist, data)
     INPUT:
 	File::RsyncP::FileList	flist
+	SV* data
     CODE:
     {
         struct file_struct file, *fileCopy;




--- lib/File/RsyncP.pm.orig	Thu Jul 24 04:33:37 2003
+++ lib/File/RsyncP.pm	Mon Jan 12 10:31:36 2004
@@ -48,7 +48,7 @@
 use Getopt::Long;
 use Data::Dumper;
 
-our $VERSION = '0.44';
+use vars qw($VERSION); $VERSION = '0.44';
 
 use constant S_IFMT       => 0170000;	# type of file
 use constant S_IFDIR      => 0040000; 	# directory
@@ -267,7 +267,7 @@
     close(RSYNC);
     $rs->{fh} = *FH;
     $rs->{rsyncPID} = $pid;
-    $rs->{pidHandler}($rs->{rsyncPID}, $rs->{childPID})
+    $rs->{pidHandler}->($rs->{rsyncPID}, $rs->{childPID})
 			if ( defined($rs->{pidHandler}) );
     #
     # Write our version and get the remote version
@@ -391,7 +391,7 @@
 	$rs->{childFh}  = *RH;
 	$rs->{childPID} = $pid;
 	$rs->log("Child PID is $pid") if ( $rs->{logLevel} >= 2 );
-	$rs->{pidHandler}($rs->{rsyncPID}, $rs->{childPID})
+	$rs->{pidHandler}->($rs->{rsyncPID}, $rs->{childPID})
 			    if ( defined($rs->{pidHandler}) );
 	setsockopt($rs->{fh}, SOL_SOCKET, SO_SNDBUF, 8 * 65536);
 	setsockopt($rs->{childFh}, SOL_SOCKET, SO_RCVBUF, 8 * 65536);
@@ -1088,7 +1088,7 @@
 
     foreach my $str ( @logStr ) {
 	next if ( $str eq "" );
-	$rs->{logHandler}($str);
+	$rs->{logHandler}->($str);
     }
 }
 




--- Digest/md4.h.orig	Mon Jan 12 10:37:04 2004
+++ Digest/md4.h	Mon Jan 12 10:44:59 2004
@@ -38,6 +38,13 @@
   unsigned char rsyncBug;
 } MD4_CTX;
 
+#define MD4Init myMD4Init
+#define MD4Update myMD4Update
+#define MD4Final myMD4Final
+#define MD4Encode myMD4Encode
+#define MD4FinalRsync myMD4FinalRsync
+#define MD4Decode myMD4Decode
+
 void MD4Init PROTO_LIST ((MD4_CTX *));
 void MD4Update PROTO_LIST
   ((MD4_CTX *, unsigned char *, unsigned int));

Return to bug 63242

Lines 6-12 Link Here

(-)Makefile (-2 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= File-RsyncP	8	PORTNAME= File-RsyncP
9	PORTVERSION= 0.44	9	PORTVERSION= 0.46
10	CATEGORIES= net perl5	10	CATEGORIES= net perl5
11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
12	MASTER_SITE_SUBDIR= File	12	MASTER_SITE_SUBDIR= File
Lines 25-28 Link Here
25	post-patch:	25	post-patch:
26	@${FIND} ${WRKSRC} -name \*.orig -delete	26	@${FIND} ${WRKSRC} -name \*.orig -delete
27		27
28	.include <bsd.port.mk>	28	.include <bsd.port.pre.mk>
		29
		30	.if ${PERL_LEVEL} <= 500503
		31	# make PREFIX-clean under perl 5.005_03
		32	post-configure:
		33	${PERL} -pi -e 's,/usr/local/,\$$(PREFIX)/,g' \
		34	${WRKSRC}/Makefile \
		35	${WRKSRC}/Digest/Makefile \
		36	${WRKSRC}/FileList/Makefile
		37	.endif
		38
		39	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)files/patch-Digest.xs (-12 lines)
1	--- Digest/Digest.xs.orig Sat Jan 10 16:27:37 2004
2	+++ Digest/Digest.xs Sat Jan 10 16:28:38 2004
3	@@ -169,8 +169,7 @@
4	}
5
6	SV *
7	-blockDigestUpdate(context, dataV, blockSize=700, blockLastLen=0, \
8	- md4DigestLen=16, seed=0)
9	+blockDigestUpdate(context, dataV, blockSize=700, blockLastLen=0, md4DigestLen=16, seed=0)
10	PREINIT:
11	STRLEN len;
12	INPUT:

Lines 1-20 Link Here

(-)files/patch-FileIO.pm (-20 lines)
1	--- lib/File/RsyncP/FileIO.pm.orig Thu Jul 24 04:33:37 2003
2	+++ lib/File/RsyncP/FileIO.pm Mon Jan 12 10:57:29 2004
3	@@ -44,7 +44,7 @@
4	use File::Find;
5	use Data::Dumper;
6
7	-our $VERSION = '0.44';
8	+use vars qw($VERSION); $VERSION = '0.44';
9
10	use constant S_IFMT => 0170000; # type of file
11	use constant S_IFDIR => 0040000; # directory
12	@@ -664,7 +664,7 @@
13
14	foreach my $str ( @logStr ) {
15	next if ( $str eq "" );
16	- $fio->{logHandler}($str);
17	+ $fio->{logHandler}->($str);
18	}
19	}
20

Lines 1-40 Link Here

(-)files/patch-FileList.pm (-40 lines)
1	--- FileList/FileList.pm.orig Mon Jan 12 10:52:48 2004
2	+++ FileList/FileList.pm Mon Jan 12 10:53:50 2004
3	@@ -39,14 +39,13 @@
4
5	package File::RsyncP::FileList;
6
7	-use 5.006;
8	use strict;
9	-use warnings;
10
11	require Exporter;
12	require DynaLoader;
13
14	-our @ISA = qw(Exporter AutoLoader DynaLoader);
15	+use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @EXPORT $VERSION);
16	+@ISA = qw(Exporter AutoLoader DynaLoader);
17
18	# Items to export into callers namespace by default. Note: do not export
19	# names by default without a very good reason. Use EXPORT_OK instead.
20	@@ -55,16 +54,16 @@
21	# This allows declaration use File::RsyncP::FileList ':all';
22	# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
23	# will save memory.
24	-our %EXPORT_TAGS = ( 'all' => [ qw(
25	+%EXPORT_TAGS = ( 'all' => [ qw(
26
27	) ] );
28
29	-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
30	+@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
31
32	-our @EXPORT = qw(
33	+@EXPORT = qw(
34
35	);
36	-our $VERSION = '0.44';
37	+$VERSION = '0.44';
38
39	bootstrap File::RsyncP::FileList $VERSION;
40

Lines 1-45 Link Here

(-)files/patch-FileList.xs (-45 lines)
1	--- FileList/FileList.xs.orig Thu Jul 24 04:33:37 2003
2	+++ FileList/FileList.xs Mon Jan 12 10:27:51 2004
3	@@ -93,8 +93,9 @@
4	PROTOTYPES: DISABLE
5
6	File::RsyncP::FileList
7	-new(packname = "File::RsyncP::FileList", SV* opts = NULL)
8	+new(packname = "File::RsyncP::FileList", opts = NULL)
9	char *packname
10	+ SV* opts
11	CODE:
12	{
13	RETVAL = flist_new();
14	@@ -187,14 +188,14 @@
15	if ( file->sum )
16	hv_store(rh, "sum", 3, newSVpv(file->sum, 0), 0);
17	hv_store(rh, "name", 4, newSVpv(f_name(file), 0), 0);
18	- hv_store(rh, "uid", 3, newSVuv(file->uid), 0);
19	- hv_store(rh, "gid", 3, newSVuv(file->gid), 0);
20	- hv_store(rh, "mode", 4, newSVuv(file->mode), 0);
21	- hv_store(rh, "mtime", 5, newSVuv(file->modtime), 0);
22	+ hv_store(rh, "uid", 3, newSViv(file->uid), 0);
23	+ hv_store(rh, "gid", 3, newSViv(file->gid), 0);
24	+ hv_store(rh, "mode", 4, newSViv(file->mode), 0);
25	+ hv_store(rh, "mtime", 5, newSViv(file->modtime), 0);
26	hv_store(rh, "size", 4, newSVnv(file->length), 0);
27	hv_store(rh, "dev", 3, newSVnv(file->dev), 0);
28	hv_store(rh, "inode", 5, newSVnv(file->inode), 0);
29	- hv_store(rh, "rdev", 4, newSVuv(file->rdev), 0);
30	+ hv_store(rh, "rdev", 4, newSViv(file->rdev), 0);
31	RETVAL = newRV((SV*)rh);
32	}
33	OUTPUT:
34	@@ -210,9 +211,10 @@
35	}
36
37	void
38	-encode(flist, SV* data)
39	+encode(flist, data)
40	INPUT:
41	File::RsyncP::FileList flist
42	+ SV* data
43	CODE:
44	{
45	struct file_struct file, *fileCopy;

Lines 1-38 Link Here

(-)files/patch-RsyncP.pm (-38 lines)
1	--- lib/File/RsyncP.pm.orig Thu Jul 24 04:33:37 2003
2	+++ lib/File/RsyncP.pm Mon Jan 12 10:31:36 2004
3	@@ -48,7 +48,7 @@
4	use Getopt::Long;
5	use Data::Dumper;
6
7	-our $VERSION = '0.44';
8	+use vars qw($VERSION); $VERSION = '0.44';
9
10	use constant S_IFMT => 0170000; # type of file
11	use constant S_IFDIR => 0040000; # directory
12	@@ -267,7 +267,7 @@
13	close(RSYNC);
14	$rs->{fh} = *FH;
15	$rs->{rsyncPID} = $pid;
16	- $rs->{pidHandler}($rs->{rsyncPID}, $rs->{childPID})
17	+ $rs->{pidHandler}->($rs->{rsyncPID}, $rs->{childPID})
18	if ( defined($rs->{pidHandler}) );
19	#
20	# Write our version and get the remote version
21	@@ -391,7 +391,7 @@
22	$rs->{childFh} = *RH;
23	$rs->{childPID} = $pid;
24	$rs->log("Child PID is $pid") if ( $rs->{logLevel} >= 2 );
25	- $rs->{pidHandler}($rs->{rsyncPID}, $rs->{childPID})
26	+ $rs->{pidHandler}->($rs->{rsyncPID}, $rs->{childPID})
27	if ( defined($rs->{pidHandler}) );
28	setsockopt($rs->{fh}, SOL_SOCKET, SO_SNDBUF, 8 * 65536);
29	setsockopt($rs->{childFh}, SOL_SOCKET, SO_RCVBUF, 8 * 65536);
30	@@ -1088,7 +1088,7 @@
31
32	foreach my $str ( @logStr ) {
33	next if ( $str eq "" );
34	- $rs->{logHandler}($str);
35	+ $rs->{logHandler}->($str);
36	}
37	}
38

Lines 1-16 Link Here

(-)files/patch-md4.h (-16 lines)
1	--- Digest/md4.h.orig Mon Jan 12 10:37:04 2004
2	+++ Digest/md4.h Mon Jan 12 10:44:59 2004
3	@@ -38,6 +38,13 @@
4	unsigned char rsyncBug;
5	} MD4_CTX;
6
7	+#define MD4Init myMD4Init
8	+#define MD4Update myMD4Update
9	+#define MD4Final myMD4Final
10	+#define MD4Encode myMD4Encode
11	+#define MD4FinalRsync myMD4FinalRsync
12	+#define MD4Decode myMD4Decode
13	+
14	void MD4Init PROTO_LIST ((MD4_CTX *));
15	void MD4Update PROTO_LIST
16	((MD4_CTX , unsigned char , unsigned int));