SF.net SVN: gar:[26851] csw/mgar/pkg/libldns/trunk

idogan23 at users.sourceforge.net idogan23 at users.sourceforge.net
Tue Jan 4 13:05:13 CET 2022


Revision: 26851
          http://sourceforge.net/p/gar/code/26851
Author:   idogan23
Date:     2022-01-04 12:05:13 +0000 (Tue, 04 Jan 2022)
Log Message:
-----------
ldns: bump version to 1.8.1, add patch for 64-Bit build, some clean up

Modified Paths:
--------------
    csw/mgar/pkg/libldns/trunk/Makefile
    csw/mgar/pkg/libldns/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libldns/trunk/files/0001-fix-inet_ntop-redeclaration-error.patch

Removed Paths:
-------------
    csw/mgar/pkg/libldns/trunk/files/CSWldns.doxyparse.diff

Modified: csw/mgar/pkg/libldns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libldns/trunk/Makefile	2022-01-02 18:09:50 UTC (rev 26850)
+++ csw/mgar/pkg/libldns/trunk/Makefile	2022-01-04 12:05:13 UTC (rev 26851)
@@ -1,5 +1,5 @@
 NAME = ldns
-VERSION = 1.6.17
+VERSION = 1.8.1
 GARTYPE = v2
 
 DESCRIPTION = A library for programs conforming to DNS RFCs and drafts
@@ -6,7 +6,7 @@
 define BLURB
   Ldns is a library to simplify implementation of recent DNS RFCs. The goal
   is to allow depelopers to easily create software conforming to current RFCs
-  and experimental software for current Internet drafts.
+--enable-sha2  and experimental software for current Internet drafts.
   Because ldns is written in C it should be a lot faster than Perl or other
   scripting languages.
 endef
@@ -13,16 +13,18 @@
 
 MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += CSWldns.doxyparse.diff
 
+GARCOMPILER = SOS12U6
+
 PACKAGING_PLATFORMS =  solaris10-sparc solaris10-i386
 
-PACKAGES = CSWlibldns1 CSWlibldns-dev
+PACKAGES = CSWlibldns3 CSWlibldns-dev
 
-SPKG_DESC_CSWlibldns1 = $(DESCRIPTION)
+SPKG_DESC_CSWlibldns3 = $(DESCRIPTION)
 SPKG_DESC_CSWlibldns-dev = $(DESCRIPTION) development package
 
 OBSOLETED_BY_CSWlibldns-dev += CSWlibldns-devel
+OBSOLETED_BY_CSWlibldns3 = CSWlibldns1
 
 SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/
 
@@ -38,18 +40,21 @@
 BUILD64 = 1
 EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis
 
-RUNTIME_DEP_PKGS_CSWlibldns1 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibldns-dev += CSWlibldns1
+RUNTIME_DEP_PKGS_CSWlibldns3 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibldns-dev += CSWlibldns3
 
 INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns
 INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWldnsdevel
 
-#PATCHFILES = CSWldns.doxyparse.diff
+PATCHFILES += 0001-fix-inet_ntop-redeclaration-error.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=/opt/csw
 CONFIGURE_ARGS += --enable-sha2
 
+# Disable DANE verification. Requiers OpenSSL > 1.1.0
+CONFIGURE_ARGS += --disable-dane
+
 MERGE_DIRS_isa-sparcv9 = $(libdir)
 MERGE_DIRS_isa-amd64 = $(libdir)
 
@@ -58,3 +63,9 @@
 PKGFILES_CSWlibldns-dev = $(PKGFILES_DEVEL)
 
 include gar/category.mk
+
+# Run autoconf after patching configure.ac
+pre-configure-modulated:
+	echo " ==> Running autoconf"
+	cd $(WORKSRC) && /opt/csw/bin/autoconf
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libldns/trunk/checksums
===================================================================
--- csw/mgar/pkg/libldns/trunk/checksums	2022-01-02 18:09:50 UTC (rev 26850)
+++ csw/mgar/pkg/libldns/trunk/checksums	2022-01-04 12:05:13 UTC (rev 26851)
@@ -1 +1 @@
-a79423bcc4129e6d59b616b1cae11e5e  ldns-1.6.17.tar.gz
+563a799efbafb35e691da42921bad031  ldns-1.8.1.tar.gz

Added: csw/mgar/pkg/libldns/trunk/files/0001-fix-inet_ntop-redeclaration-error.patch
===================================================================
--- csw/mgar/pkg/libldns/trunk/files/0001-fix-inet_ntop-redeclaration-error.patch	                        (rev 0)
+++ csw/mgar/pkg/libldns/trunk/files/0001-fix-inet_ntop-redeclaration-error.patch	2022-01-04 12:05:13 UTC (rev 26851)
@@ -0,0 +1,34 @@
+From a3d6934f9ee2e45a45596570257fc3235ede38bd Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ihsan at opencsw.org>
+Date: Mon, 3 Jan 2022 21:54:14 +0100
+Subject: [PATCH] fix inet_ntop redeclaration error
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 840a1d6..d90eb9e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -136,7 +136,7 @@ AC_CHECK_FUNC([socket],
+ # older Solaris provides inet_ntop in -lresolv.
+ AC_CHECK_FUNC([inet_ntop],
+     [],
+-    [AC_SEARCH_LIBS([inet_ntop], [socket c nsl resolv])
++    [AC_SEARCH_LIBS([inet_ntop], [socket c nsl resolv], [ac_cv_func_inet_ntop=yes])
+ ])
+ 
+ # modern Linux provides inet_pton in -lsocket.
+@@ -145,7 +145,7 @@ AC_CHECK_FUNC([inet_ntop],
+ # older Solaris provides inet_pton in -lresolv.
+ AC_CHECK_FUNC([inet_pton],
+     [],
+-    [AC_SEARCH_LIBS([inet_pton], [socket c nsl resolv])
++    [AC_SEARCH_LIBS([inet_pton], [socket c nsl resolv], [ac_cv_func_inet_pton=yes])
+ ])
+ 
+ 
+-- 
+2.4.0
+

Deleted: csw/mgar/pkg/libldns/trunk/files/CSWldns.doxyparse.diff
===================================================================
--- csw/mgar/pkg/libldns/trunk/files/CSWldns.doxyparse.diff	2022-01-02 18:09:50 UTC (rev 26850)
+++ csw/mgar/pkg/libldns/trunk/files/CSWldns.doxyparse.diff	2022-01-04 12:05:13 UTC (rev 26851)
@@ -1,9 +0,0 @@
-diff --speed-large-files --minimal -Nru ldns-1.5.1.orig/doc/doxyparse.pl ldns-1.5.1/doc/doxyparse.pl
---- ldns-1.5.1.orig/doc/doxyparse.pl	2008-05-28 10:28:39.000000000 +0200
-+++ ldns-1.5.1/doc/doxyparse.pl	2009-05-12 13:41:55.220351895 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/opt/csw/bin/perl
- 
- # Doxygen is usefull for html documentation, but sucks 
- # in making manual pages. Still tool also parses the .h

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list