Date: 24 Jan 2003 17:19:02 -0000 From: Sergei Kolobov <sergei@kolobov.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/47439: [MAINTAINER] Fix security/opencdk on -CURRENT Message-ID: <20030124171902.65364.qmail@outpost.globcon.net>
next in thread | raw e-mail | index | archive | help
>Number: 47439 >Category: ports >Synopsis: [MAINTAINER] Fix security/opencdk on -CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 24 09:20:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Sergei Kolobov >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Oct 14 02:23:23 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386 >Description: - Fix build on 5.x (tested on -CURRENT): use <stdlib.h> instead of <malloc.h> - Removed bogus libgnugetopt dependency - Re-sort MASTER_SITES to give HTTP servers priority over FTP - Temporarily move the main site (ftp.gnutls.org) to the end of the list due to its unavailability - Use --with-libgcrypt-prefix argument to configure instead of manually overriding CPPFLAGS and LDFLAGS Files added: - patch-tests::Makefile.in - patch-malloc.h I will submit the patches to the OpenCDK developers shortly for inclusion in the next upstream release. >How-To-Repeat: >Fix: --- opencdk-0.4.1.patch begins here --- 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) --- opencdk-0.4.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030124171902.65364.qmail>