Attachment #153520 for bug #196097




# $FreeBSD$

PORTNAME=	tlsdate
PORTVERSION=	0.0.11
PORTREVISION=	1
CATEGORIES=	sysutils
DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}

MAINTAINER=	fk@fabiankeil.de
COMMENT=	Secure parasitic rdate replacement

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_GITHUB=	yes
GH_ACCOUNT=	ioerror
GH_COMMIT=	5be06de
# commits are required to fix the build on FreeBSD.
GH_COMMIT=	44fa3b7
GH_TAGNAME=	${GH_COMMIT}

GNU_CONFIGURE=	yes
USES=		autoreconf libtool pkgconfig
USE_OPENSSL=	yes

PLIST_SUB+=	PKGNAME=${PKGNAME}

OPTIONS_DEFINE=	DOCS

LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2

post-patch:
	${REINPLACE_CMD} -e '/doc_DATA\+= LICENSE/d' ${WRKSRC}/Makefile.am

post-install:
	@${CHMOD} o+rx ${STAGEDIR}/${PREFIX}/etc/tlsdate ${STAGEDIR}/${PREFIX}/etc/tlsdate/ca-roots
	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/licenses/${PKGNAME}
	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${PREFIX}/share/licenses/${PKGNAME}

regression-test: build
	@cd ${WRKSRC} && make test

Lines 1-2 Link Here

(-)b/sysutils/tlsdate/distinfo (-2 / +2 lines)
1	SHA256 (ioerror-tlsdate-0.0.7-44fa3b7.tar.gz) = 7a1a7f7c64b830c71783df38af4ce10fe0732e83526b6459c3a6e5db4340e309	1	SHA256 (ioerror-tlsdate-0.0.11-5be06de.tar.gz) = 96f0053574ab0119edec0e46ccedf86bff72092e9461eae71f6b59fabd492e04
2	SIZE (ioerror-tlsdate-0.0.7-44fa3b7.tar.gz) = 239975	2	SIZE (ioerror-tlsdate-0.0.11-5be06de.tar.gz) = 263951




From 5eb482ca5657a91b7641b97ec503ade881889d49 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 11 Jan 2014 21:58:37 +0100
Subject: [PATCH] Use fmemopen reimplementation on FreeBSD systems that need it

Apparently FreeBSD 8.4 does.
---
 src/include.am | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git src/include.am src/include.am
index 259d618..6f230d7 100644
--- src/include.am
+++ src/include.am
@@ -231,6 +231,13 @@ endif
 check_PROGRAMS+= src/proxy-bio_unittest
 noinst_PROGRAMS+= src/proxy-bio_unittest
 endif
+# XXX This conditional should apply for any system where we're building
+# conf_unittest, but I don't know how to tell that to automake.
+if !HAVE_FMEMOPEN
+if HAVE_FUNOPEN
+src_conf_unittest_SOURCES+= src/common/fmemopen-funopen.c
+endif
+endif
 endif
 
 if TARGET_NETBSD
-- 
1.8.5.2

From ebfa24395c046e3e732d5be4475f412165bef679 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 12 Jan 2014 21:02:37 +0100
Subject: [PATCH] Only compile event_unittest when targetting GNU/Linux

It tests code that currently doesn't compile on FreeBSD and
it looks like it won't compile on the other non-GNU/Linux
targets either.
---
 src/include.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git src/include.am src/include.am
index 6f230d7..c164627 100644
--- src/include.am
+++ src/include.am
@@ -439,11 +439,13 @@ endif
 endif
 endif
 
+if TARGET_LINUX
 src_event_unittest_SOURCES = src/event.c
 src_event_unittest_SOURCES+= src/event-unittest.c
 src_event_unittest_SOURCES+= src/routeup.c
 src_event_unittest_SOURCES+= src/util.c
 check_PROGRAMS+= src/event_unittest
+endif
 
 if !TARGET_OSX
 check_PROGRAMS+= src/test/proxy-override src/test/return-argc \
-- 
1.8.5.2


Lines 7-12 man/man1/tlsdate.1.gz Link Here

(-)b/sysutils/tlsdate/pkg-plist (-4 / +1 lines)
7	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG	7	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
8	%%PORTDOCS%%%%DOCSDIR%%/README	8	%%PORTDOCS%%%%DOCSDIR%%/README
9	%%PORTDOCS%%%%DOCSDIR%%/TODO	9	%%PORTDOCS%%%%DOCSDIR%%/TODO
10	%%PORTDOCS%%@dirrm %%DOCSDIR%%	10	share/licenses/%%PKGNAME%%/LICENSE
11	@dirrmtry etc/tlsdate/ca-roots
12	@dirrmtry etc/tlsdate
13	-

Return to bug 196097

Lines 1-33 Link Here

(-)b/sysutils/tlsdate/Makefile (-10 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= tlsdate	3	PORTNAME= tlsdate
4	PORTVERSION= 0.0.7	4	PORTVERSION= 0.0.11
5	PORTREVISION= 1
6	CATEGORIES= sysutils	5	CATEGORIES= sysutils
7	DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}	6	DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
8		7
9	MAINTAINER= fk@fabiankeil.de	8	MAINTAINER= fk@fabiankeil.de
10	COMMENT= Secure parasitic rdate replacement	9	COMMENT= Secure parasitic rdate replacement
11		10
12	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENSE
14
15	USE_GITHUB= yes	11	USE_GITHUB= yes
16	GH_ACCOUNT= ioerror	12	GH_ACCOUNT= ioerror
17	# Technically tlsdate 0.0.7 is 004f6f6, but a couple of follow-up	13	GH_COMMIT= 5be06de
18	# commits are required to fix the build on FreeBSD.
19	GH_COMMIT= 44fa3b7
20	GH_TAGNAME= ${GH_COMMIT}	14	GH_TAGNAME= ${GH_COMMIT}
21		15
22	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
23	USES= autoreconf libtool pkgconfig	17	USES= autoreconf libtool pkgconfig
24	USE_OPENSSL= yes	18	USE_OPENSSL= yes
25		19
		20	PLIST_SUB+= PKGNAME=${PKGNAME}
		21
26	OPTIONS_DEFINE= DOCS	22	OPTIONS_DEFINE= DOCS
27		23
		24	LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2
		25
28	post-patch:	26	post-patch:
29	# Required for FreeBSD 8.4	27	${REINPLACE_CMD} -e '/doc_DATA\+= LICENSE/d' ${WRKSRC}/Makefile.am
30	@${REINPLACE_CMD} -e 's@AC_MSG_ERROR(\[M@AC_MSG_WARN([M@' ${WRKSRC}/configure.ac	28
		29	post-install:
		30	@${CHMOD} o+rx ${STAGEDIR}/${PREFIX}/etc/tlsdate ${STAGEDIR}/${PREFIX}/etc/tlsdate/ca-roots
		31	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/licenses/${PKGNAME}
		32	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${PREFIX}/share/licenses/${PKGNAME}
31		33
32	regression-test: build	34	regression-test: build
33	@cd ${WRKSRC} && make test	35	@cd ${WRKSRC} && make test

Removed Link Here

(-)a/sysutils/tlsdate/files/patch-src-include.am (-64 lines)
1	From 5eb482ca5657a91b7641b97ec503ade881889d49 Mon Sep 17 00:00:00 2001
2	From: Fabian Keil <fk@fabiankeil.de>
3	Date: Sat, 11 Jan 2014 21:58:37 +0100
4	Subject: [PATCH] Use fmemopen reimplementation on FreeBSD systems that need it
5
6	Apparently FreeBSD 8.4 does.
7	---
8	src/include.am \| 7 +++++++
9	1 file changed, 7 insertions(+)
10
11	diff --git src/include.am src/include.am
12	index 259d618..6f230d7 100644
13	--- src/include.am
14	+++ src/include.am
15	@@ -231,6 +231,13 @@ endif
16	check_PROGRAMS+= src/proxy-bio_unittest
17	noinst_PROGRAMS+= src/proxy-bio_unittest
18	endif
19	+# XXX This conditional should apply for any system where we're building
20	+# conf_unittest, but I don't know how to tell that to automake.
21	+if !HAVE_FMEMOPEN
22	+if HAVE_FUNOPEN
23	+src_conf_unittest_SOURCES+= src/common/fmemopen-funopen.c
24	+endif
25	+endif
26	endif
27
28	if TARGET_NETBSD
29	--
30	1.8.5.2
31
32	From ebfa24395c046e3e732d5be4475f412165bef679 Mon Sep 17 00:00:00 2001
33	From: Fabian Keil <fk@fabiankeil.de>
34	Date: Sun, 12 Jan 2014 21:02:37 +0100
35	Subject: [PATCH] Only compile event_unittest when targetting GNU/Linux
36
37	It tests code that currently doesn't compile on FreeBSD and
38	it looks like it won't compile on the other non-GNU/Linux
39	targets either.
40	---
41	src/include.am \| 2 ++
42	1 file changed, 2 insertions(+)
43
44	diff --git src/include.am src/include.am
45	index 6f230d7..c164627 100644
46	--- src/include.am
47	+++ src/include.am
48	@@ -439,11 +439,13 @@ endif
49	endif
50	endif
51
52	+if TARGET_LINUX
53	src_event_unittest_SOURCES = src/event.c
54	src_event_unittest_SOURCES+= src/event-unittest.c
55	src_event_unittest_SOURCES+= src/routeup.c
56	src_event_unittest_SOURCES+= src/util.c
57	check_PROGRAMS+= src/event_unittest
58	+endif
59
60	if !TARGET_OSX
61	check_PROGRAMS+= src/test/proxy-override src/test/return-argc \
62	--
63	1.8.5.2
64