pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/radmind
Module Name: pkgsrc
Committed By: hauke
Date: Thu May 9 09:37:36 UTC 2019
Modified Files:
pkgsrc/sysutils/radmind: Makefile distinfo
pkgsrc/sysutils/radmind/patches: patch-retr.c
Log Message:
Re-add a patch that had gone missing, removing a stale external
declaration.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/radmind/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/radmind/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/radmind/patches/patch-retr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/radmind/Makefile
diff -u pkgsrc/sysutils/radmind/Makefile:1.40 pkgsrc/sysutils/radmind/Makefile:1.41
--- pkgsrc/sysutils/radmind/Makefile:1.40 Wed May 8 08:34:48 2019
+++ pkgsrc/sysutils/radmind/Makefile Thu May 9 09:37:36 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2019/05/08 08:34:48 hauke Exp $
+# $NetBSD: Makefile,v 1.41 2019/05/09 09:37:36 hauke Exp $
#
DISTNAME= radmind-1.14.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=radmind/}
Index: pkgsrc/sysutils/radmind/distinfo
diff -u pkgsrc/sysutils/radmind/distinfo:1.24 pkgsrc/sysutils/radmind/distinfo:1.25
--- pkgsrc/sysutils/radmind/distinfo:1.24 Wed May 8 08:34:48 2019
+++ pkgsrc/sysutils/radmind/distinfo Thu May 9 09:37:36 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2019/05/08 08:34:48 hauke Exp $
+$NetBSD: distinfo,v 1.25 2019/05/09 09:37:36 hauke Exp $
SHA1 (radmind-1.14.1.tar.gz) = 26f37f1c002384a9c609e688d6cee2fa15b6d0d2
RMD160 (radmind-1.14.1.tar.gz) = 6b925083ef9dce2de21ebb0ffef287b1ffe9173d
@@ -18,7 +18,7 @@ SHA1 (patch-libsnet_snet.c) = 29484ae677
SHA1 (patch-openssl__compat.c) = 0076abec076f29764d86ec1fc3b0bf7092c7dd18
SHA1 (patch-openssl__compat.h) = d73ce65dde6e48e378feded637b7b6a4d8e36047
SHA1 (patch-ra.sh) = 05ba697814bf4833a9c38f881e43639067afba29
-SHA1 (patch-retr.c) = 7c76538c3159fa0e10e5a44c358f3091ad16d594
+SHA1 (patch-retr.c) = aa667fd76300c8526b1c75137880da83220a2699
SHA1 (patch-stor.c) = f0a5a94222513a02d6cae3f2141e592866765fcb
SHA1 (patch-t2pkg.c) = 8c8379ad8e33fc07c83d04c944fb1e425775739c
SHA1 (patch-transcript.c) = 2fab20d210317b0e0ba52102359588670ba5f941
Index: pkgsrc/sysutils/radmind/patches/patch-retr.c
diff -u pkgsrc/sysutils/radmind/patches/patch-retr.c:1.3 pkgsrc/sysutils/radmind/patches/patch-retr.c:1.4
--- pkgsrc/sysutils/radmind/patches/patch-retr.c:1.3 Fri May 3 11:04:34 2019
+++ pkgsrc/sysutils/radmind/patches/patch-retr.c Thu May 9 09:37:36 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-retr.c,v 1.3 2019/05/03 11:04:34 hauke Exp $
+$NetBSD: patch-retr.c,v 1.4 2019/05/09 09:37:36 hauke Exp $
Remove stale extern declaration
Move to openssl 1.1 api
---- retr.c.orig 2019-05-02 14:26:24.815072747 +0000
+--- retr.c.orig 2010-12-13 03:42:49.000000000 +0000
+++ retr.c
@@ -31,6 +31,7 @@
@@ -14,7 +14,15 @@ Move to openssl 1.1 api
#include "applefile.h"
#include "connect.h"
#include "cksum.h"
-@@ -73,7 +74,7 @@ retr( SNET *sn, char *pathdesc, char *pa
+@@ -47,7 +48,6 @@ extern int verbose;
+ extern int showprogress;
+ extern int dodots;
+ extern int cksum;
+-extern int errno;
+ extern int create_prefix;
+ extern SSL_CTX *ctx;
+
+@@ -74,7 +74,7 @@ retr( SNET *sn, char *pathdesc, char *pa
char buf[ 8192 ];
ssize_t rr;
extern EVP_MD *md;
@@ -23,7 +31,7 @@ Move to openssl 1.1 api
unsigned char md_value[ EVP_MAX_MD_SIZE ];
char cksum_b64[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ];
-@@ -83,7 +84,7 @@ retr( SNET *sn, char *pathdesc, char *pa
+@@ -84,7 +84,7 @@ retr( SNET *sn, char *pathdesc, char *pa
fprintf( stderr, "%s\n", pathdesc );
return( 1 );
}
@@ -32,7 +40,7 @@ Move to openssl 1.1 api
}
if ( verbose ) printf( ">>> RETR %s\n", pathdesc );
-@@ -164,7 +165,7 @@ retr( SNET *sn, char *pathdesc, char *pa
+@@ -165,7 +165,7 @@ retr( SNET *sn, char *pathdesc, char *pa
goto error2;
}
if ( cksum ) {
@@ -41,7 +49,7 @@ Move to openssl 1.1 api
}
if ( dodots ) { putc( '.', stdout ); fflush( stdout ); }
size -= rr;
-@@ -196,8 +197,9 @@ retr( SNET *sn, char *pathdesc, char *pa
+@@ -197,8 +197,9 @@ retr( SNET *sn, char *pathdesc, char *pa
/* cksum file */
if ( cksum ) {
@@ -52,7 +60,7 @@ Move to openssl 1.1 api
if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
fprintf( stderr, "line %d: checksum in transcript does not match "
"checksum from server\n", linenum );
-@@ -245,7 +247,7 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -246,7 +247,7 @@ retr_applefile( SNET *sn, char *pathdesc
struct as_entry ae_ents[ 3 ];
struct timeval tv;
extern EVP_MD *md;
@@ -61,7 +69,7 @@ Move to openssl 1.1 api
unsigned char md_value[ EVP_MAX_MD_SIZE ];
char cksum_b64[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ];
-@@ -255,7 +257,7 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -256,7 +257,7 @@ retr_applefile( SNET *sn, char *pathdesc
fprintf( stderr, "%s\n", pathdesc );
return( 1 );
}
@@ -70,7 +78,7 @@ Move to openssl 1.1 api
}
if ( verbose ) printf( ">>> RETR %s\n", pathdesc );
-@@ -315,7 +317,7 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -316,7 +317,7 @@ retr_applefile( SNET *sn, char *pathdesc
return( -1 );
}
if ( cksum ) {
@@ -79,7 +87,7 @@ Move to openssl 1.1 api
}
/* name temp file */
-@@ -372,7 +374,7 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -373,7 +374,7 @@ retr_applefile( SNET *sn, char *pathdesc
/* Should we check for valid ae_ents here? YES! */
if ( cksum ) {
@@ -88,7 +96,7 @@ Move to openssl 1.1 api
}
if ( dodots ) { putc( '.', stdout ); fflush( stdout ); }
-@@ -397,7 +399,7 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -398,7 +399,7 @@ retr_applefile( SNET *sn, char *pathdesc
goto error2;
}
if ( cksum ) {
@@ -97,7 +105,7 @@ Move to openssl 1.1 api
}
if ( dodots ) { putc( '.', stdout ); fflush( stdout ); }
size -= rc;
-@@ -447,7 +449,7 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -448,7 +449,7 @@ retr_applefile( SNET *sn, char *pathdesc
goto error3;
}
if ( cksum ) {
@@ -106,7 +114,7 @@ Move to openssl 1.1 api
}
if ( dodots ) { putc( '.', stdout ); fflush( stdout ); }
if ( showprogress ) {
-@@ -481,7 +483,7 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -482,7 +483,7 @@ retr_applefile( SNET *sn, char *pathdesc
}
if ( cksum ) {
@@ -115,7 +123,7 @@ Move to openssl 1.1 api
}
if ( dodots ) { putc( '.', stdout ); fflush( stdout); }
if ( showprogress ) {
-@@ -522,8 +524,9 @@ retr_applefile( SNET *sn, char *pathdesc
+@@ -523,8 +524,9 @@ retr_applefile( SNET *sn, char *pathdesc
if ( verbose ) printf( "<<< .\n" );
if ( cksum ) {
Home |
Main Index |
Thread Index |
Old Index