Fix build on SunOS. May unlock code on some platforms, PKGREVISION+

This commit is contained in:
fhajny 2015-09-30 12:56:47 +00:00
parent fec7297272
commit 0d9f1dcb92
5 changed files with 51 additions and 3 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.6 2015/07/15 20:45:58 szptvlfn Exp $
# $NetBSD: Makefile,v 1.7 2015/09/30 12:56:47 fhajny Exp $
DISTNAME= gnupg-2.1.6
PKGNAME= ${DISTNAME:S/gnupg-/gnupg2-/}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/
EXTRACT_SUFX= .tar.bz2

View file

@ -1,6 +1,9 @@
$NetBSD: distinfo,v 1.1 2015/07/04 05:26:21 ryoon Exp $
$NetBSD: distinfo,v 1.2 2015/09/30 12:56:47 fhajny Exp $
SHA1 (gnupg-2.1.6.tar.bz2) = 9e8157b3386da04760657ce3117fc4dc570c57c5
RMD160 (gnupg-2.1.6.tar.bz2) = 42db712fe0669caf246dbf46aca429b392614e2b
Size (gnupg-2.1.6.tar.bz2) = 4917722 bytes
SHA1 (patch-dirmngr_Makefile.in) = 4287bfd66eab7918e98cf9b4e50a2f7f9e18ab09
SHA1 (patch-dirmngr_ks-engine-ldap.c) = 3a7d96d877cd52bed66c481af83da99c517d3380
SHA1 (patch-doc_Makefile.in) = 1f5dc55c6751322e2a5436b0a66a530d231b4a75
SHA1 (patch-kbx_Makefile.in) = f4b06a913fe86dca1170eb78ed767b8889a43dd9

View file

@ -0,0 +1,15 @@
$NetBSD: patch-dirmngr_Makefile.in,v 1.1 2015/09/30 12:56:47 fhajny Exp $
Bring in libsocket, needed on SunOS.
--- dirmngr/Makefile.in.orig 2015-09-30 11:26:38.032707039 +0000
+++ dirmngr/Makefile.in
@@ -723,7 +723,7 @@ dirmngr-client$(EXEEXT): $(dirmngr_clien
dirmngr_ldap$(EXEEXT): $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_DEPENDENCIES) $(EXTRA_dirmngr_ldap_DEPENDENCIES)
@rm -f dirmngr_ldap$(EXEEXT)
- $(AM_V_CCLD)$(dirmngr_ldap_LINK) $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(dirmngr_ldap_LINK) $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_LDADD) $(LIBS) $(NETLIBS)
t-dns-cert$(EXEEXT): $(t_dns_cert_OBJECTS) $(t_dns_cert_DEPENDENCIES) $(EXTRA_t_dns_cert_DEPENDENCIES)
@rm -f t-dns-cert$(EXEEXT)

View file

@ -0,0 +1,15 @@
$NetBSD: patch-dirmngr_ks-engine-ldap.c,v 1.1 2015/09/30 12:56:47 fhajny Exp $
This must have been an ugly typo. Fix build on SunOS.
--- dirmngr/ks-engine-ldap.c.orig 2015-06-17 06:39:24.000000000 +0000
+++ dirmngr/ks-engine-ldap.c
@@ -513,7 +513,7 @@ my_ldap_connect (parsed_uri_t uri, LDAP
#endif /* LDAP_OPT_X_TLS_CACERTFILE && HAVE_LDAP_SET_OPTION */
#endif
-#ifndef HAVE_LDAP_START_TLS_S
+#ifdef HAVE_LDAP_START_TLS_S
if (uri->use_tls)
{
/* XXX: We need an option to determine whether to abort if the

View file

@ -0,0 +1,15 @@
$NetBSD: patch-kbx_Makefile.in,v 1.1 2015/09/30 12:56:47 fhajny Exp $
Bring in libsocket, needed on SunOS.
--- kbx/Makefile.in.orig 2015-09-30 11:23:15.890769261 +0000
+++ kbx/Makefile.in
@@ -551,7 +551,7 @@ clean-binPROGRAMS:
kbxutil$(EXEEXT): $(kbxutil_OBJECTS) $(kbxutil_DEPENDENCIES) $(EXTRA_kbxutil_DEPENDENCIES)
@rm -f kbxutil$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(kbxutil_OBJECTS) $(kbxutil_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(kbxutil_OBJECTS) $(kbxutil_LDADD) $(LIBS) $(NETLIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)