Attachment 225818 Details for Bug 256597 – git diff

[patch] git diff

contrib-dma.diff (text/plain), 6.11 KB, created by Ronald Klop on 2021-06-15 07:40:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ronald Klop

Created: 2021-06-15 07:40:33 UTC

Size: 6.11 KB

patch

obsolete

>diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile
>index 90b26a3425f6..f56d4fb23ea2 100644
>--- a/databases/mongodb40/Makefile
>+++ b/databases/mongodb40/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	mongodb
> DISTVERSIONPREFIX=	r
>-DISTVERSION=	4.0.24
>+DISTVERSION=	4.0.25
> CATEGORIES=	databases net
> MASTER_SITES=	https://fastdl.mongodb.org/src/ \
> 		http://fastdl.mongodb.org/src/
>@@ -27,13 +27,11 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
> 		libcurl.so:ftp/curl \
> 		libsnappy.so:archivers/snappy
> 
>-USES=		compiler:c++14-lang cpe python:3.5+,build scons shebangfix
>+USES=		compiler:c++14-lang cpe python:3.5+,build scons
> USE_RC_SUBR=	mongod
> 
> CONFLICTS_INSTALL=	mongodb36 mongodb4[24]
> 
>-SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in
>-python_OLD_CMD=	@python_interpreter@
> MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
> 		--use-system-pcre --use-system-snappy \
> 		--use-system-boost --use-system-zlib \
>diff --git a/databases/mongodb40/distinfo b/databases/mongodb40/distinfo
>index 692e83587a14..766d8f0341c9 100644
>--- a/databases/mongodb40/distinfo
>+++ b/databases/mongodb40/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1618524049
>-SHA256 (mongodb-src-r4.0.24.tar.gz) = 4cb2b3d1f777c5ee7c922728e238be076ae376bc7e232fab7d878dacda747519
>-SIZE (mongodb-src-r4.0.24.tar.gz) = 50259909
>+TIMESTAMP = 1623237574
>+SHA256 (mongodb-src-r4.0.25.tar.gz) = c51f1f78bc121a260023e5419dd219456ed4fbb6da3f8954654263a0b260b0fd
>+SIZE (mongodb-src-r4.0.25.tar.gz) = 50516290
>diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
>index ec632d679b81..81773174a4a4 100644
>--- a/databases/mongodb50/Makefile
>+++ b/databases/mongodb50/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	mongodb
> DISTVERSIONPREFIX=	r
>-DISTVERSION=	5.0.0-rc0
>+DISTVERSION=	5.0.0-rc1
> CATEGORIES=	databases net
> MASTER_SITES=	https://fastdl.mongodb.org/src/ \
> 		http://fastdl.mongodb.org/src/
>@@ -28,7 +28,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
> 		libcurl.so:ftp/curl \
> 		libsnappy.so:archivers/snappy
> 
>-USES=		compiler:c++17-lang cpe python:3.5+,build scons shebangfix
>+USES=		compiler:c++17-lang cpe python:3.5+,build scons
> USE_RC_SUBR=	mongod
> 
> CONFLICTS_INSTALL=	mongodb36 mongodb4[024]
>@@ -36,7 +36,6 @@ CONFLICTS_INSTALL=	mongodb36 mongodb4[024]
> OPTIONS_DEFINE=	LTO SASL SSL
> OPTIONS_DEFAULT=LTO SASL SSL
> 
>-python_OLD_CMD=	@python_interpreter@
> MAKE_ARGS=	--use-system-zlib \
> 		--use-system-pcre \
> 		--use-system-snappy \
>diff --git a/databases/mongodb50/distinfo b/databases/mongodb50/distinfo
>index 8a71f16d49e9..9c502acdda63 100644
>--- a/databases/mongodb50/distinfo
>+++ b/databases/mongodb50/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1622204953
>-SHA256 (mongodb-src-r5.0.0-rc0.tar.gz) = 9ebf1de0a9e1d436928e69cd75a99f385e6cde83f2d60e72ac5c1d714646751c
>-SIZE (mongodb-src-r5.0.0-rc0.tar.gz) = 54327208
>+TIMESTAMP = 1623670264
>+SHA256 (mongodb-src-r5.0.0-rc1.tar.gz) = 17b4998385e82855bb6a17056ae75e1811c2784c14b6ba89706f0ad17f5279dc
>+SIZE (mongodb-src-r5.0.0-rc1.tar.gz) = 54409236
>diff --git a/devel/scons/Makefile b/devel/scons/Makefile
>index 62dc6939896a..64f19bd09c08 100644
>--- a/devel/scons/Makefile
>+++ b/devel/scons/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Peter Haight <peterh@sapros.com>
> 
> PORTNAME=	scons
>-PORTVERSION=	3.1.2
>-PORTREVISION=	1
>+PORTVERSION=	4.1.0.post1
> CATEGORIES=	devel python
> MASTER_SITES=	SF
> PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
>@@ -10,8 +9,10 @@ PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	Build tool alternative to make
> 
>+WRKSRC=		${WRKDIR}/SCons-${PORTVERSION}
>+
> LICENSE=	MIT
>-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USES=		python:3.6+ shebangfix
> USE_PYTHON=	autoplist concurrent distutils
>@@ -20,14 +21,8 @@ NO_ARCH=	yes
> 
> PLIST_SUB=	SCONS_VER=${PORTVERSION}
> 
>-SHEBANG_FILES=	script/scons*
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|distutils$\.command\.install$$$|setuptools\1|; s|distutils$\.command\.install\.$|setuptools\1|' ${WRKSRC}/setup.py
> 	@${FIND} ${WRKSRC} -name '*.orig' -delete
> 
>-.include <bsd.port.pre.mk>
>-
>-PYDISTUTILS_INSTALLARGS+=	--standard-lib
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/devel/scons/distinfo b/devel/scons/distinfo
>index 6c723b9732a9..beb5e5ab42b7 100644
>--- a/devel/scons/distinfo
>+++ b/devel/scons/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1585059178
>-SHA256 (scons-3.1.2.tar.gz) = 7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb
>-SIZE (scons-3.1.2.tar.gz) = 668298
>+TIMESTAMP = 1622539874
>+SHA256 (scons-4.1.0.post1.tar.gz) = 52be492ff5f0dfeb773826c4431d0baba03701574f19e574b55a1085ed57a2e7
>+SIZE (scons-4.1.0.post1.tar.gz) = 3008712
>diff --git a/mail/dma/Makefile b/mail/dma/Makefile
>index 92ae5b30d49d..3f16970b5927 100644
>--- a/mail/dma/Makefile
>+++ b/mail/dma/Makefile
>@@ -1,9 +1,8 @@
> # Created by: Daniel Roethlisberger <daniel@roe.ch>
> 
> PORTNAME=	dma
>-PORTVERSION=	0.13
>+DISTVERSION=	0.13.20210614
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	mail
> 
>@@ -16,6 +15,7 @@ USES=		uidfix ssl
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	corecode
>+GH_TAGNAME=	430f3b59074d6303ce3eb4d9fcf16dcf3538ba31
> 
> BUILD_WRKSRC=	${WRKSRC}/bsd
> INSTALL_WRKSRC=	${WRKSRC}/bsd
>diff --git a/mail/dma/distinfo b/mail/dma/distinfo
>index 6f2815ceb01d..563e7ceb9f66 100644
>--- a/mail/dma/distinfo
>+++ b/mail/dma/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1581003380
>-SHA256 (corecode-dma-v0.13_GH0.tar.gz) = 9d4b903f2b750d888f51d668d08d2ea18404dedb0a52cffeb3c81376023c1946
>-SIZE (corecode-dma-v0.13_GH0.tar.gz) = 36315
>+TIMESTAMP = 1623670467
>+SHA256 (corecode-dma-v0.13.20210614-430f3b59074d6303ce3eb4d9fcf16dcf3538ba31_GH0.tar.gz) = e42e8c77691f5aead632dd3d66ceca664c1ad7629d578c300c3cd9ed65f9f0a8
>+SIZE (corecode-dma-v0.13.20210614-430f3b59074d6303ce3eb4d9fcf16dcf3538ba31_GH0.tar.gz) = 36383
>diff --git a/mail/dma/files/patch-crypto.c b/mail/dma/files/patch-crypto.c
>deleted file mode 100644
>index 2cf5b29c17ad..000000000000
>--- a/mail/dma/files/patch-crypto.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- crypto.c.orig	2021-02-11 13:53:38 UTC
>-+++ crypto.c
>-@@ -78,7 +78,7 @@ init_cert_file(SSL_CTX *ctx, const char *path)
>- 	return (0);
>- }
>- 
>--int
>-+static int
>- verify_server_fingerprint(const X509 *cert)
>- {
>- 	unsigned char fingerprint[EVP_MAX_MD_SIZE] = {0};

Actions: View | Diff

Attachments on bug 256597: 225799 | 225818 | 226126