Deanna Phillips [Sun, Apr 09, 2006 at 12:03:24PM +0000] wrote: >Any reason to not add an ldap flavor? > >I know that the configure args disable ldap by default but it >seems to only takes a --enable-ldap tacked onto the end to >counter that. > >I did something like this diff in my current local ports >collection, adding PFRAG.ldap with one line: > >libexec/gnupg/gpgkeys_ldap > Try this:
Index: Makefile =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/Makefile,v retrieving revision 1.56 diff -u -p -u -r1.56 Makefile --- Makefile 10 Mar 2006 20:57:50 -0000 1.56 +++ Makefile 9 Apr 2006 18:27:04 -0000 @@ -2,7 +2,7 @@ COMMENT= "GNU privacy guard - a free PGP replacement" -DISTNAME= gnupg-1.4.2.2 +DISTNAME= gnupg-1.4.3 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \ @@ -25,16 +25,16 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c z readline.3 termcap +WANTLIB= c z readline termcap ssl crypto MODULES= devel/gettext -LIB_DEPENDS= bz2.10::archivers/bzip2 +LIB_DEPENDS= bz2.10::archivers/bzip2 \ + curl.3::net/curl CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.59 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/scripts -CONFIGURE_ARGS+= --disable-ldap \ - --disable-gnupg-iconv +CONFIGURE_ARGS+= --disable-gnupg-iconv .if ${MACHINE_ARCH} == "m68k" CONFIGURE_ARGS+= --disable-asm .endif @@ -43,7 +43,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ MAKE_FLAGS= LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \ LIBICONV="-L${LOCALBASE}/lib -liconv" -FLAVORS= idea card +FLAVORS= idea card ldap FLAVOR?= .if ${FLAVOR:L:Midea} @@ -61,6 +61,13 @@ SUPDISTFILES= idea.c.gz:0 LIB_DEPENDS+= usb::devel/libusb .else CONFIGURE_ARGS+= --disable-card-support --without-libusb +.endif + +.if ${FLAVOR:L:Mldap} +CONFIGURE_ARGS+= --enable-ldap +LIB_DEPENDS+= ldap.8::databases/openldap +.else +CONFIGURE_ARGS+= --disable-ldap .endif Index: distinfo =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/distinfo,v retrieving revision 1.11 diff -u -p -u -r1.11 distinfo --- distinfo 10 Mar 2006 20:57:50 -0000 1.11 +++ distinfo 7 Apr 2006 16:28:32 -0000 @@ -1,8 +1,8 @@ -MD5 (gnupg-1.4.2.2.tar.gz) = 50d8fd9c5715ff78b7db0e5f20d08550 +MD5 (gnupg-1.4.3.tar.gz) = fcdf572a33dd037653707b128dd150a7 MD5 (idea.c.gz) = 9dc3bc086824a8c7a331f35e09a3e57f -RMD160 (gnupg-1.4.2.2.tar.gz) = 301e45204b3b083e1014782d110dee5bad5ef320 +RMD160 (gnupg-1.4.3.tar.gz) = 305eb1bbce488c7d13911e828acd60a22bba898c RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d -SHA1 (gnupg-1.4.2.2.tar.gz) = 959540c1c6158e09d668ceee055bf366dc26d0bd +SHA1 (gnupg-1.4.3.tar.gz) = 7c0f5db594bed9a901d9be43c31f6c80c6080141 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84 -SIZE (gnupg-1.4.2.2.tar.gz) = 4222685 +SIZE (gnupg-1.4.3.tar.gz) = 4320394 SIZE (idea.c.gz) = 5216 Index: patches/patch-cipher_Makefile_in =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/patches/patch-cipher_Makefile_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-cipher_Makefile_in --- patches/patch-cipher_Makefile_in 6 Feb 2006 21:57:56 -0000 1.2 +++ patches/patch-cipher_Makefile_in 7 Apr 2006 16:29:55 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-cipher_Makefile_in,v 1.2 2006/02/06 21:57:56 bernd Exp $ ---- cipher/Makefile.in.orig Tue Mar 15 16:52:21 2005 -+++ cipher/Makefile.in Mon Feb 6 16:04:35 2006 -@@ -271,7 +271,7 @@ sbindir = @sbindir@ +--- cipher/Makefile.in.orig Mon Apr 3 11:45:05 2006 ++++ cipher/Makefile.in Fri Apr 7 18:28:39 2006 +@@ -311,7 +311,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl +INCLUDES = -I.. -I$(top_srcdir)/include noinst_LIBRARIES = libcipher.a - libcipher_a_SOURCES = cipher.c \ - pubkey.c \ + libcipher_a_SOURCES = cipher.c pubkey.c md.c dynload.c bithelp.h des.c \ + twofish.c blowfish.c cast5.c rijndael.c elgamal.c elgamal.h \ Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/patches/patch-doc_Makefile_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 6 Feb 2006 21:57:56 -0000 1.2 +++ patches/patch-doc_Makefile_in 7 Apr 2006 16:29:55 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 2006/02/06 21:57:56 bernd Exp $ ---- doc/Makefile.in.orig Tue Mar 15 16:52:21 2005 -+++ doc/Makefile.in Mon Feb 6 16:04:35 2006 -@@ -284,7 +284,7 @@ info_TEXINFOS = gpg.texi gpgv.texi +--- doc/Makefile.in.orig Mon Apr 3 11:45:06 2006 ++++ doc/Makefile.in Fri Apr 7 18:28:39 2006 +@@ -308,7 +308,7 @@ info_TEXINFOS = gpg.texi gpgv.texi # Need this to avoid building of dvis with automake 1.4 DVIS = Index: patches/patch-g10_Makefile_in =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/patches/patch-g10_Makefile_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-g10_Makefile_in --- patches/patch-g10_Makefile_in 6 Feb 2006 21:57:56 -0000 1.2 +++ patches/patch-g10_Makefile_in 7 Apr 2006 16:29:56 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-g10_Makefile_in,v 1.2 2006/02/06 21:57:56 bernd Exp $ ---- g10/Makefile.in.orig Tue Mar 15 16:52:21 2005 -+++ g10/Makefile.in Mon Feb 6 16:04:35 2006 -@@ -325,7 +325,7 @@ sbindir = @sbindir@ +--- g10/Makefile.in.orig Mon Apr 3 11:45:06 2006 ++++ g10/Makefile.in Fri Apr 7 18:29:50 2006 +@@ -347,7 +347,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ --INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -+INCLUDES = -I$(top_srcdir)/include +-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl \ ++AM_CPPFLAGS = -I$(top_srcdir)/include \ + @LIBUSB_CPPFLAGS@ $(am__append_1) EXTRA_DIST = options.skel - @[EMAIL PROTECTED] = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a Index: patches/patch-keyserver_Makefile_in =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/patches/patch-keyserver_Makefile_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-keyserver_Makefile_in --- patches/patch-keyserver_Makefile_in 6 Feb 2006 21:57:56 -0000 1.2 +++ patches/patch-keyserver_Makefile_in 7 Apr 2006 16:29:56 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-keyserver_Makefile_in,v 1.2 2006/02/06 21:57:56 bernd Exp $ ---- keyserver/Makefile.in.orig Tue Mar 15 16:52:21 2005 -+++ keyserver/Makefile.in Mon Feb 6 16:04:35 2006 -@@ -300,7 +300,7 @@ sbindir = @sbindir@ +--- keyserver/Makefile.in.orig Mon Apr 3 11:45:06 2006 ++++ keyserver/Makefile.in Fri Apr 7 18:28:39 2006 +@@ -338,7 +338,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl +INCLUDES = -I$(top_srcdir)/include EXTRA_SCRIPTS = gpgkeys_mailto - libexec_SCRIPTS = @GPGKEYS_MAILTO@ - noinst_SCRIPTS = gpgkeys_test + gpglibexecdir = $(libexecdir)/@PACKAGE@ + gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@ Index: patches/patch-tools_Makefile_in =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/patches/patch-tools_Makefile_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-tools_Makefile_in --- patches/patch-tools_Makefile_in 6 Feb 2006 21:57:56 -0000 1.2 +++ patches/patch-tools_Makefile_in 7 Apr 2006 16:29:55 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-tools_Makefile_in,v 1.2 2006/02/06 21:57:56 bernd Exp $ ---- tools/Makefile.in.orig Tue Mar 15 16:52:22 2005 -+++ tools/Makefile.in Mon Feb 6 16:04:35 2006 -@@ -292,7 +292,7 @@ sharedstatedir = @sharedstatedir@ +--- tools/Makefile.in.orig Mon Apr 3 11:45:07 2006 ++++ tools/Makefile.in Fri Apr 7 18:28:39 2006 +@@ -318,7 +318,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106 @@ -9,4 +9,4 @@ $OpenBSD: patch-tools_Makefile_in,v 1.2 +INCLUDES = -I$(top_srcdir)/include needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) - gpgsplit_LDADD = $(needed_libs) $(other_libs) @ZLIBS@ + @[EMAIL PROTECTED] = gpg-zip Index: patches/patch-util_Makefile_in =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/patches/patch-util_Makefile_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-util_Makefile_in --- patches/patch-util_Makefile_in 6 Feb 2006 21:57:56 -0000 1.2 +++ patches/patch-util_Makefile_in 7 Apr 2006 16:29:55 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-util_Makefile_in,v 1.2 2006/02/06 21:57:56 bernd Exp $ ---- util/Makefile.in.orig Tue Mar 15 16:52:22 2005 -+++ util/Makefile.in Mon Feb 6 16:04:35 2006 -@@ -270,7 +270,7 @@ sbindir = @sbindir@ +--- util/Makefile.in.orig Mon Apr 3 11:45:07 2006 ++++ util/Makefile.in Fri Apr 7 18:28:39 2006 +@@ -321,7 +321,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl +INCLUDES = -I.. -I$(top_srcdir)/include noinst_LIBRARIES = libutil.a - EXTRA_libutil_a_SOURCES = regcomp.c regex.c regexec.c regex_internal.c regex_internal.h - + libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c ttyio.c \ + argparse.c memory.c secmem.c errors.c iobuf.c dotlock.c http.c \ Index: patches/patch-util_secmem_c =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/patches/patch-util_secmem_c,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-util_secmem_c --- patches/patch-util_secmem_c 6 Feb 2006 21:57:56 -0000 1.1 +++ patches/patch-util_secmem_c 7 Apr 2006 16:29:56 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-util_secmem_c,v 1.1 2006/02/06 21:57:56 bernd Exp $ ---- util/secmem.c.orig Thu Mar 10 10:42:06 2005 -+++ util/secmem.c Mon Feb 6 20:35:32 2006 -@@ -36,6 +36,9 @@ +--- util/secmem.c.orig Thu Dec 8 07:58:36 2005 ++++ util/secmem.c Fri Apr 7 18:28:39 2006 +@@ -37,6 +37,9 @@ #include <sys/lock.h> #endif #endif @@ -11,7 +11,7 @@ $OpenBSD: patch-util_secmem_c,v 1.1 2006 #include "types.h" #include "memory.h" -@@ -85,11 +88,23 @@ static int suspend_warning; +@@ -92,11 +95,23 @@ static int suspend_warning; static void print_warn(void) { Index: pkg/DESCR =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/pkg/DESCR,v retrieving revision 1.7 diff -u -p -u -r1.7 DESCR --- pkg/DESCR 15 Dec 2003 21:55:21 -0000 1.7 +++ pkg/DESCR 10 Apr 2006 08:15:38 -0000 @@ -1,3 +1,8 @@ GnuPG is a complete and free replacement for PGP. Because it does not use IDEA or RSA it can be used without any restrictions. GnuPG is nearly in compliance with RFC2440 (OpenPGP). + +Flavors: + idea - build with IDEA support + card - build with OpenPGP card support + ldap - build with LDAP keyserver support Index: pkg/PFRAG.ldap =================================================================== RCS file: pkg/PFRAG.ldap diff -N pkg/PFRAG.ldap --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PFRAG.ldap 9 Apr 2006 18:17:09 -0000 @@ -0,0 +1,2 @@ [EMAIL PROTECTED] $OpenBSD$ +libexec/gnupg/gpgkeys_ldap Index: pkg/PLIST =================================================================== RCS file: /home/OpenBSD/cvs/ports/security/gnupg/pkg/PLIST,v retrieving revision 1.18 diff -u -p -u -r1.18 PLIST --- pkg/PLIST 22 Feb 2006 12:30:52 -0000 1.18 +++ pkg/PLIST 9 Apr 2006 18:26:28 -0000 @@ -1,13 +1,14 @@ @comment $OpenBSD: PLIST,v 1.18 2006/02/22 12:30:52 steven Exp $ bin/gpg +bin/gpg-zip bin/gpgsplit bin/gpgv @info info/gpg.info @info info/gpgv.info libexec/gnupg/ +libexec/gnupg/gpgkeys_curl libexec/gnupg/gpgkeys_finger libexec/gnupg/gpgkeys_hkp -libexec/gnupg/gpgkeys_http @man man/man1/gpg.1 @man man/man1/gpg.ru.1 @man man/man1/gpgv.1 @@ -54,3 +55,4 @@ share/locale/sv/LC_MESSAGES/gnupg.mo share/locale/tr/LC_MESSAGES/gnupg.mo share/locale/zh_CN/LC_MESSAGES/gnupg.mo share/locale/zh_TW/LC_MESSAGES/gnupg.mo +%%ldap%%
