FreeBSD Bugzilla – Attachment 210967 Details for
Bug 242665
dns/knot2: [patch] upgrade to 2.9.2 + fix i386
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Knot DNS 2.9.2 - i386 still not fixed
knot2.diff.txt (text/plain), 3.75 KB, created by
Leo Vandewoestijne
on 2020-01-22 15:19:58 UTC
(
hide
)
Description:
Knot DNS 2.9.2 - i386 still not fixed
Filename:
MIME Type:
Creator:
Leo Vandewoestijne
Created:
2020-01-22 15:19:58 UTC
Size:
3.75 KB
patch
obsolete
>diff -ruN dns/knot2.orig/Makefile dns/knot2/Makefile >--- dns/knot2.orig/Makefile 2019-12-03 17:54:49.000000000 +0000 >+++ dns/knot2/Makefile 2020-01-22 14:57:48.448919000 +0000 >@@ -2,7 +2,7 @@ > # $FreeBSD: head/dns/knot2/Makefile 518954 2019-12-03 17:54:49Z pi $ > > PORTNAME= knot >-DISTVERSION= 2.9.1 >+DISTVERSION= 2.9.2 > CATEGORIES= dns > MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ > https://dns.company/downloads/knot-dns/ >@@ -16,13 +16,15 @@ > NOT_FOR_ARCHS= i386 > NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386 > >+CONFLICTS= knot-1.* knot1-[0-6].* >+ > LIB_DEPENDS= libgnutls.so:security/gnutls \ >- liblmdb.so:databases/lmdb \ >- liburcu.so:sysutils/liburcu >+ liblmdb.so:databases/lmdb > >-CONFLICTS= knot-1.* knot1-[0-6].* >+BUILD_DEPENDS= autoconf>=2.65:devel/autoconf > >-USES= alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz >+USES= alias libtool localbase pkgconfig tar:xz >+ > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --enable-recvmmsg=no \ > --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig >@@ -32,6 +34,8 @@ > --with-storage=/var/db/knot > USE_RC_SUBR= ${PORTNAME} > SUB_FILES= pkg-message >+USES+= libedit >+LIB_DEPENDS+= liburcu.so:sysutils/liburcu > .endif > > .if defined(UTILS_ONLY) || defined(LIB_ONLY) >@@ -44,7 +48,6 @@ > .endif > > USE_LDCONFIG= yes >-LLD_UNSAFE= yes > INSTALL_TARGET= install-strip > > USERS= knot >@@ -79,12 +82,29 @@ > FASTPARSER_CONFIGURE_ENABLE= fastparser > > IDN_CONFIGURE_WITH= libidn >+IDN_CONFIGURE_OFF= --without-libidn > IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 > > MAXMINDDB_DESC= Enable MaxMind for geodb module > MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb > MAXMINDDB_CONFIGURE_ENABLE= maxminddb > >+.include <bsd.port.pre.mk> >+ >+.if ${PORT_OPTIONS:MDOCS} >+USES+= python >+.else >+CONFIGURE_ARGS+= --disable-documentation >+.endif >+ >+# this part will be unused as long NOT_FOR_ARCHS (above) is present or uncommented. >+#.if ${ARCH} == i386 >+# needed? >+#EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_libdnssec_Makefile.inc >+# needed? >+#BUILD_DEPENDS+= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops >+#.endif >+ > post-patch: > .if !defined(UTILS_ONLY) && !defined(LIB_ONLY) > @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \ >@@ -103,4 +123,4 @@ > @${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >diff -ruN dns/knot2.orig/distinfo dns/knot2/distinfo >--- dns/knot2.orig/distinfo 2019-12-03 17:54:49.000000000 +0000 >+++ dns/knot2/distinfo 2019-12-19 23:56:45.097154000 +0000 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1574091844 >-SHA256 (knot-2.9.1.tar.xz) = f19121956caa360c387923654f13e4c97b3fb9093d242e110d7e0916b8d8a04d >-SIZE (knot-2.9.1.tar.xz) = 1212460 >+TIMESTAMP = 1576799805 >+SHA256 (knot-2.9.2.tar.xz) = 298cdf33aa7589b50df7e5833694b24cd2de8b6d17cee7e1673873fe576db6ee >+SIZE (knot-2.9.2.tar.xz) = 1181860 >diff -ruN dns/knot2.orig/files/extrapatch-src_libdnssec_Makefile.inc dns/knot2/files/extrapatch-src_libdnssec_Makefile.inc >--- dns/knot2.orig/files/extrapatch-src_libdnssec_Makefile.inc 1970-01-01 00:00:00.000000000 +0000 >+++ dns/knot2/files/extrapatch-src_libdnssec_Makefile.inc 2020-01-22 14:27:46.807931000 +0000 >@@ -0,0 +1,11 @@ >+--- src/libdnssec/Makefile.inc.orig 2020-01-22 14:27:02 UTC >++++ src/libdnssec/Makefile.inc >+@@ -2,7 +2,7 @@ lib_LTLIBRARIES += libdnssec.la >+ pkgconfig_DATA += libdnssec.pc >+ >+ libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS) >+-libdnssec_la_LDFLAGS = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS) >++libdnssec_la_LDFLAGS = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) >+ libdnssec_la_LIBADD = libcontrib.la $(gnutls_LIBS) >+ if ENABLE_PKCS11 >+ libdnssec_la_LIBADD += $(pthread_LIBS)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
freebsd
:
maintainer-approval-
Actions:
View
|
Diff
Attachments on
bug 242665
:
209996
|
210055
|
210967
|
211311
|
211889