Attachment #799185 for bug #713514

Lines 1-4 Link Here

(-)a/net-mail/fdm/fdm-2.0-r1.ebuild (-1 / +8 lines)
1	# Copyright 1999-2021 Gentoo Authors	1	# Copyright 1999-2022 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=7	4	EAPI=7
Lines 15-20 IUSE="examples pcre" Link Here
15	DEPEND="	15	DEPEND="
16	dev-libs/openssl:0=	16	dev-libs/openssl:0=
17	sys-libs/tdb	17	sys-libs/tdb
		18	elibc_musl? ( sys-libs/queue-standalone )
18	pcre? ( dev-libs/libpcre )	19	pcre? ( dev-libs/libpcre )
19	"	20	"
20	RDEPEND="	21	RDEPEND="
Lines 23-32 RDEPEND=" Link Here
23	acct-user/fdm	24	acct-user/fdm
24	"	25	"
25		26
		27	PATCHES=(
		28	"${FILESDIR}/${P}-base64.patch"
		29	"${FILESDIR}/${P}-base64-twice.patch"
		30	)
		31
26	DOCS=( CHANGES README TODO MANUAL )	32	DOCS=( CHANGES README TODO MANUAL )
27		33
28	src_prepare() {	34	src_prepare() {
29	default	35	default
		36	autoreconf
30		37
31	# Change user '_fdm' to 'fdm'	38	# Change user '_fdm' to 'fdm'
32	sed -e 's/_fdm/fdm/g' -i fdm.h \|\| die	39	sed -e 's/_fdm/fdm/g' -i fdm.h \|\| die

From 519e41833c1f7d353c09d8d51bfd6d13d0cfc16c Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 18 Feb 2019 22:26:29 +0000
Subject: [PATCH] Do not add base64.c twice, from Rosen Penev.

---
 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 611ae87..e9f2f64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,6 +123,3 @@ endif
 if NO_STRTONUM
 nodist_fdm_SOURCES += compat/strtonum.c
 endif
-if NO_B64_NTOP
-nodist_fdm_SOURCES += compat/base64.c
-endif




From 3232e537ccaba4417b25d9d70264e4a5533042da Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 18 Mar 2019 13:04:00 +0000
Subject: [PATCH] Fix bas64 declarations, from makepost at firemail dot cc.

---
 fdm.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fdm.h b/fdm.h
index 41eaa37..511a7b1 100644
--- a/fdm.h
+++ b/fdm.h
@@ -20,7 +20,6 @@
 #define FDM_H
 
 #include <sys/param.h>
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 
 #ifdef HAVE_QUEUE_H
@@ -725,8 +724,8 @@ size_t		 strlcat(char *, const char *, size_t);
 
 #ifndef HAVE_B64_NTOP
 /* base64.c */
-int b64_ntop(src, srclength, target, targsize);
-int b64_pton(src, target, targsize);
+int b64_ntop(u_char const *, size_t, char *, size_t);
+int b64_pton(char const *, u_char *, size_t);
 #endif
 
 /* shm.c */

Return to bug 713514

Line 0 Link Here

(-)a/net-mail/fdm/files/fdm-2.0-base64-twice.patch (+20 lines)
	1	From 519e41833c1f7d353c09d8d51bfd6d13d0cfc16c Mon Sep 17 00:00:00 2001
	2	From: Nicholas Marriott <nicholas.marriott@gmail.com>
	3	Date: Mon, 18 Feb 2019 22:26:29 +0000
	4	Subject: [PATCH] Do not add base64.c twice, from Rosen Penev.
	5
	6	---
	7	Makefile.am \| 3 ---
	8	1 file changed, 3 deletions(-)
	9
	10	diff --git a/Makefile.am b/Makefile.am
	11	index 611ae87..e9f2f64 100644
	12	--- a/Makefile.am
	13	+++ b/Makefile.am
	14	@@ -123,6 +123,3 @@ endif
	15	if NO_STRTONUM
	16	nodist_fdm_SOURCES += compat/strtonum.c
	17	endif
	18	-if NO_B64_NTOP
	19	-nodist_fdm_SOURCES += compat/base64.c
	20	-endif

Line 0 Link Here

(-)a/net-mail/fdm/files/fdm-2.0-base64.patch (-1 / +32 lines)
0	-	1	From 3232e537ccaba4417b25d9d70264e4a5533042da Mon Sep 17 00:00:00 2001
		2	From: Nicholas Marriott <nicholas.marriott@gmail.com>
		3	Date: Mon, 18 Mar 2019 13:04:00 +0000
		4	Subject: [PATCH] Fix bas64 declarations, from makepost at firemail dot cc.
		5
		6	---
		7	fdm.h \| 5 ++---
		8	1 file changed, 2 insertions(+), 3 deletions(-)
		9
		10	diff --git a/fdm.h b/fdm.h
		11	index 41eaa37..511a7b1 100644
		12	--- a/fdm.h
		13	+++ b/fdm.h
		14	@@ -20,7 +20,6 @@
		15	#define FDM_H
		16
		17	#include <sys/param.h>
		18	-#include <sys/cdefs.h>
		19	#include <sys/stat.h>
		20
		21	#ifdef HAVE_QUEUE_H
		22	@@ -725,8 +724,8 @@ size_t strlcat(char , const char , size_t);
		23
		24	#ifndef HAVE_B64_NTOP
		25	/* base64.c */
		26	-int b64_ntop(src, srclength, target, targsize);
		27	-int b64_pton(src, target, targsize);
		28	+int b64_ntop(u_char const , size_t, char , size_t);
		29	+int b64_pton(char const , u_char , size_t);
		30	#endif
		31
		32	/* shm.c */