Attachment 217377 Details for Bug 248780 – v1

[patch] v1

ports.dns.adns.1.6.0.diff (text/plain), 4.55 KB, created by Niclas Zeising on 2020-08-20 12:48:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2020-08-20 12:48:51 UTC

Size: 4.55 KB

patch

obsolete

>commit c0e6a4d768c23649d842a670467e99f5ca3db53a
>Author: Niclas Zeising <zeising@daemonic.se>
>Date:   Thu Aug 20 12:23:37 2020 +0200
>
>    Update adns to 1.6.0
>    
>    Update adns to 1.6.0
>    Add a build dep on gnu m4, since the base m4 doesn't work properly and
>    causes build errors.
>    This fixes several security issuse
>    This fixes the build with -fno-common
>
>diff --git dns/adns/Makefile dns/adns/Makefile
>index ca8ee3b73a8d..8ec1ab95ad6a 100644
>--- dns/adns/Makefile
>+++ dns/adns/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	adns
>-PORTVERSION=	1.5.1
>+PORTVERSION=	1.6.0
> CATEGORIES=	dns
> MASTER_SITES=	http://www.chiark.greenend.org.uk/~ian/adns/ftp/
> 
>@@ -11,11 +11,14 @@ COMMENT=	Easy to use asynchronous-capable DNS client library and utilities
> 
> LICENSE=	GPLv3
> 
>+BUILD_DEPENDS=	m4>=1.4.11:devel/m4
>+
> USES=		gmake
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> PORTSCOUT=	skipv:1.5.0~rc0,1.5.0~rc1
> 
>+BINARY_ALIAS=	m4=${LOCALBASE}/bin/gm4
> LIBVERSION=	1
> PLIST_SUB+=	LIBVERSION="${LIBVERSION}"
> 
>@@ -28,8 +31,7 @@ DOCS=		COPYING GPL-vs-LGPL INSTALL README \
> TOSTRIP=	bin/adnsheloex \
> 		bin/adnsresfilter \
> 		bin/adnslogres \
>-		bin/adnshost \
>-		lib/libadns.so.1
>+		bin/adnshost
> 
> OPTIONS_DEFINE=		DOCS
> 
>diff --git dns/adns/distinfo dns/adns/distinfo
>index bff7591aed94..f5430443dbe2 100644
>--- dns/adns/distinfo
>+++ dns/adns/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1471808918
>-SHA256 (adns-1.5.1.tar.gz) = 5b1026f18b8274be869245ed63427bf8ddac0739c67be12c4a769ac948824eeb
>-SIZE (adns-1.5.1.tar.gz) = 319774
>+TIMESTAMP = 1597925576
>+SHA256 (adns-1.6.0.tar.gz) = fb427265a981e033d1548f2b117cc021073dc8be2eaf2c45fd64ab7b00ed20de
>+SIZE (adns-1.6.0.tar.gz) = 323474
>diff --git dns/adns/files/patch-client-Makefile.in dns/adns/files/patch-client-Makefile.in
>deleted file mode 100644
>index ab9ed11bd8b5..000000000000
>--- dns/adns/files/patch-client-Makefile.in
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- client/Makefile.in.orig	2014-10-19 23:07:01 UTC
>-+++ client/Makefile.in
>-@@ -58,9 +58,9 @@ ALL_OBJS=	$(ADH_OBJS) $(TARG_OBJS)
>- all:		$(TARGETS)
>- 
>- install:	$(TARG_INSTALL)
>--		mkdir -p $(bindir)
>-+		mkdir -p $(DESTDIR)$(bindir)
>- 		set -xe; for f in $(TARG_INSTALL); \
>--			do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
>-+			do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
>- 
>- uninstall:
>- 		for f in $(TARGETS); do rm -f $(bindir)/$$f; done
>diff --git dns/adns/files/patch-dynamic-Makefile.in dns/adns/files/patch-dynamic-Makefile.in
>deleted file mode 100644
>index 178049c73711..000000000000
>--- dns/adns/files/patch-dynamic-Makefile.in
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- dynamic/Makefile.in.orig	2014-10-19 23:07:01 UTC
>-+++ dynamic/Makefile.in
>-@@ -30,10 +30,9 @@ include		$(srcdir)/../src/adns.make
>- ALLOBJS=	$(addsuffix _p.o, $(basename $(LIBOBJS)))
>- 
>- install:
>--		mkdir -p $(libdir)
>--		$(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
>--		ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
>--		ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
>-+		mkdir -p $(DESTDIR)$(libdir)
>-+		$(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
>-+		(cd $(DESTDIR)$(libdir) && ln -sf $(SHLIBSONAME) $(SHLIBFORLINK))
>- 
>- uninstall:
>- 		rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
>diff --git dns/adns/files/patch-regress-Makefile.in dns/adns/files/patch-regress-Makefile.in
>deleted file mode 100644
>index e882d762fe3f..000000000000
>--- dns/adns/files/patch-regress-Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- regress/Makefile.in.orig	2014-10-26 12:03:41 UTC
>-+++ regress/Makefile.in
>-@@ -25,7 +25,7 @@ VPATH=		@srcdir@
>- 
>- PROGS_SYSDEP=	@PROGS_HAVE_TSEARCH@
>- 
>--CLIENTS=	adnstest adnshost adnslogres $(PROGS_SYSDEP)
>-+CLIENTS=	adnstest adnslogres $(PROGS_SYSDEP)
>- AUTOCHDRS=	harness.h hsyscalls.h hredirect.h
>- AUTOCSRCS=	hrecord.c hplayback.c hcommon.c
>- include		../settings.make
>diff --git dns/adns/files/patch-src-Makefile.in dns/adns/files/patch-src-Makefile.in
>deleted file mode 100644
>index 876cabb1dc07..000000000000
>--- dns/adns/files/patch-src-Makefile.in
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- src/Makefile.in.orig	2014-10-19 23:07:03 UTC
>-+++ src/Makefile.in
>-@@ -30,10 +30,10 @@ include		$(srcdir)/adns.make
>- DIRCFLAGS=	-I. -I$(srcdir)
>- 
>- install:
>--		mkdir -p $(libdir) $(includedir)
>-+		mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
>- 		set -xe; for f in $(TARGETS); \
>--			do $(INSTALL_DATA) $$f $(libdir)/$$f; done
>--		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
>-+			do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done
>-+		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h
>- 
>- uninstall:
>- 		for f in $(TARGETS); do rm -f $(libdir)/$$f; done

Flags:

zeising: maintainer-approval? (pi)

Actions: View | Diff

Attachments on bug 248780: 217377