On Sat, Jun 12, 2021 at 07:42:22PM +0200, Hiltjo Posthuma wrote:
> On Sat, Jun 05, 2021 at 05:18:11PM +0200, Solene Rapenne wrote:
> > On Sat, 5 Jun 2021 12:51:21 +0200
> > Hiltjo Posthuma <hil...@codemadness.org>:
> >
> > >
> > > >
> > > > diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
> > > > index 2ab58ea4519..5c8043270de 100644
> > > > --- a/converters/libiconv/Makefile
> > > > +++ b/converters/libiconv/Makefile
> > > > @@ -5,7 +5,7 @@ COMMENT= character set conversion library
> > > > DISTNAME= libiconv-1.16
> > > > CATEGORIES= converters devel
> > > > MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
> > > > -REVISION= 0
> > > > +REVISION= 1
> > > >
> > > > SHARED_LIBS= charset 1.1 \
> > > > iconv 7.0
> > > > @@ -17,6 +17,7 @@ MAINTAINER= Brad Smith <b...@comstyle.com>
> > > > # LGPLv2 and GPLv3
> > > > PERMIT_PACKAGE= Yes
> > > >
> > > > +# uses pledge()
> > > > WANTLIB= c
> > > >
> > > > SEPARATE_BUILD= Yes
> > > > diff --git a/converters/libiconv/patches/patch-src_iconv_c
> > > > b/converters/libiconv/patches/patch-src_iconv_c
> > > > new file mode 100644
> > > > index 00000000000..9b673fbe5db
> > > > --- /dev/null
> > > > +++ b/converters/libiconv/patches/patch-src_iconv_c
> > > > @@ -0,0 +1,29 @@
> > > > +--- src/iconv.c.orig Fri Apr 26 20:50:13 2019
> > > > ++++ src/iconv.c Tue Jan 26 20:07:34 2021
> > > > +@@ -19,6 +19,8 @@
> > > > + # define ICONV_CONST
> > > > + #endif
> > > > +
> > > > ++#include <unistd.h>
> > > > ++
> > > > + #include <limits.h>
> > > > + #include <stddef.h>
> > > > + #include <stdio.h>
> > > > +@@ -847,6 +849,8 @@
> > > > + int i;
> > > > + int status;
> > > > +
> > > > ++ if (pledge("stdio rpath", NULL) == -1)
> > > > ++ error(EXIT_FAILURE, errno, "pledge");
> > > > + set_program_name (argv[0]);
> > > > + #if HAVE_SETLOCALE
> > > > + /* Needed for the locale dependent encodings, "char" and "wchar_t",
> > > > +@@ -1002,6 +1006,8 @@
> > > > + }
> > > > + break;
> > > > + }
> > > > ++ if ((do_list || i == argc) && pledge("stdio", NULL) == -1)
> > > > ++ error(EXIT_FAILURE, errno, "pledge");
> > > > + if (do_list) {
> > > > + if (i != 2 || i != argc)
> > > > + usage(1);
> > > >
> > > > --
> > > > Kind regards,
> > > > Hiltjo
> > > >
> > >
> > > Bump... any OKs?
> > >
> >
> >
> > make test is fine and I didn't encounter issue at using iconv.
> > ok solene@
> >
>
> Bump, any more OKs?
>
Bump
--
Kind regards,
Hiltjo
