Attachment 28129 Details for Bug 47439 – opencdk-0.4.1.patch

[patch] opencdk-0.4.1.patch

opencdk-0.4.1.patch (text/plain), 2.80 KB, created by Sergei Kolobov on 2003-01-24 17:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Kolobov

Created: 2003-01-24 17:20:01 UTC

Size: 2.80 KB

patch

obsolete

>diff -ruN --exclude=CVS opencdk/Makefile opencdk.new/Makefile
>--- opencdk/Makefile	Sun Jan 19 00:30:53 2003
>+++ opencdk.new/Makefile	Fri Jan 24 19:37:25 2003
>@@ -8,22 +8,21 @@
> PORTNAME=	opencdk
> PORTVERSION=	0.4.1
> CATEGORIES=	security
>-MASTER_SITES=	http://gd.tuwien.ac.at/privacy/gnupg/alpha/gnutls/opencdk/ \
>-		ftp://ftp.gnutls.org/pub/gnutls/opencdk/ \
>-		ftp://ftp.gnupg.org/pub/gcrypt/alpha/gnutls/opencdk/ \
>+MASTER_SITES=	\
> 		http://www.mirrors.wiretapped.net/security/network-security/gnutls/opencdk/ \
>-		ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/opencdk/
>+		http://gd.tuwien.ac.at/privacy/gnupg/alpha/gnutls/opencdk/ \
>+		ftp://ftp.gnupg.org/pub/gcrypt/alpha/gnutls/opencdk/ \
>+		ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/opencdk/ \
>+		ftp://ftp.gnutls.org/pub/gnutls/opencdk/ 
> 
> MAINTAINER=	sergei@kolobov.com
> 
>-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
>-		gcrypt.6:${PORTSDIR}/security/libgcrypt
>+LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt
> 
> USE_LIBTOOL=	yes
> INSTALLS_SHLIB=	yes
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
>-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt"
>+CONFIGURE_ARGS=	--with-libgcrypt-prefix=${LOCALBASE}
> 
> DOCS=		AUTHORS NEWS README THANKS
> 
>diff -ruN --exclude=CVS opencdk/files/patch-malloc.h opencdk.new/files/patch-malloc.h
>--- opencdk/files/patch-malloc.h	Thu Jan  1 03:00:00 1970
>+++ opencdk.new/files/patch-malloc.h	Fri Jan 24 19:49:43 2003
>@@ -0,0 +1,32 @@
>+diff -ruN src.orig/encrypt.c src/encrypt.c
>+--- src.orig/encrypt.c	Fri Jan 24 19:47:04 2003
>++++ src/encrypt.c	Fri Jan 24 19:45:50 2003
>+@@ -24,7 +24,11 @@
>+ #endif
>+ #include <stdio.h>
>+ #include <stdarg.h>
>+-#include <malloc.h>
>++#ifdef __FreeBSD__
>++# include <stdlib.h>
>++#else
>++# include <malloc.h>
>++#endif
>+ #include <assert.h>
>+ 
>+ #include "opencdk.h"
>+diff -ruN src.orig/main.c src/main.c
>+--- src.orig/main.c	Fri Jan 24 19:47:04 2003
>++++ src/main.c	Fri Jan 24 19:46:21 2003
>+@@ -24,7 +24,11 @@
>+ #endif
>+ #include <stdio.h>
>+ #include <errno.h>
>+-#include <malloc.h>
>++#ifdef __FreeBSD__
>++# include <stdlib.h>
>++#else
>++# include <malloc.h>
>++#endif
>+ #ifdef HAVE_PWD_H
>+ # include <pwd.h>
>+ #endif
>diff -ruN --exclude=CVS opencdk/files/patch-tests::Makefile.in opencdk.new/files/patch-tests::Makefile.in
>--- opencdk/files/patch-tests::Makefile.in	Thu Jan  1 03:00:00 1970
>+++ opencdk.new/files/patch-tests::Makefile.in	Fri Jan 24 19:07:29 2003
>@@ -0,0 +1,11 @@
>+--- tests/Makefile.in.orig	Fri Jan 24 19:06:07 2003
>++++ tests/Makefile.in	Fri Jan 24 19:06:36 2003
>+@@ -97,6 +97,8 @@
>+ 
>+ EXTRA_DIST = pub.gpg sec.gpg sec-with-pwd.gpg ts.gpg wkold.gpg
>+ 
>++AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
>++
>+ INCLUDES = -I$(top_srcdir)/src
>+ 
>+ LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS)

Actions: View | Diff

Attachments on bug 47439: 28129