Re: GCC 8.4.0 fails to build on loongson
Friendly ping. On 5/27/21 1:27 AM, manp...@gmail.com wrote: >Synopsis: lang/gcc/8 fails to build on loongson >Category: ports >Environment: System : OpenBSD 6.9 Details : OpenBSD 6.9 (GENERIC) #78: Thu Apr 22 20:28:58 MDT 2021 dera...@loongson.openbsd.org:/usr/src/sys/arch/loongson/compile/GENERIC Architecture: OpenBSD.loongson Machine : loongson >Description: lang/gcc/8 fails to build on loongson >How-To-Repeat: Reproducible on loongson when building using dpb. Build log is attached. >Fix: No idea. dmesg: OpenBSD 6.9 (GENERIC) #78: Thu Apr 22 20:28:58 MDT 2021 dera...@loongson.openbsd.org:/usr/src/sys/arch/loongson/compile/GENERIC real mem = 1073741824 (1024MB) avail mem = 1052065792 (1003MB) random: boothowto does not indicate good seed mainbus0 at root: Lemote Yeeloong cpu0 at mainbus0: STC Loongson2F CPU 797 MHz, STC Loongson2F FPU cpu0: cache L1-I 64KB D 64KB 4 way, L2 512KB 4 way bonito0 at mainbus0: memory and PCI-X controller, rev 1 pci0 at bonito0 bus 0 rl0 at pci0 dev 7 function 0 "Realtek 8139" rev 0x10: irq 5, address 00:23:8b:33:d4:7f rlphy0 at rl0 phy 0: RTL internal PHY smfb0 at pci0 dev 8 function 0 "Silicon Motion LynxEM+" rev 0xb0: 1024x600, 16bpp wsdisplay0 at smfb0 mux 1: console (std, vt100 emulation) ohci0 at pci0 dev 9 function 0 "NEC USB" rev 0x44: irq 7, version 1.0 ehci0 at pci0 dev 9 function 1 "NEC USB" rev 0x05: irq 7 usb0 at ehci0: USB revision 2.0 uhub0 at usb0 configuration 1 interface 0 "NEC EHCI root hub" rev 2.00/1.00 addr 1 glxpcib0 at pci0 dev 14 function 0 "AMD CS5536 ISA" rev 0x03: rev 3, 32-bit 3579545Hz timer, watchdog, gpio, i2c isa0 at glxpcib0 pckbc0 at isa0 port 0x60/5 irq 1 irq 12 pckbd0 at pckbc0 (kbd slot) wskbd0 at pckbd0: console keyboard, using wsdisplay0 pms0 at pckbc0 (aux slot) wsmouse0 at pms0 mux 0 mcclock0 at isa0 port 0x70/2: mc146818 or compatible ykbec0 at isa0 port 0x381/3 gpio1 at glxpcib0: 32 pins iic at glxpcib0 not configured glxclk0 at glxpcib0: clock, prof pciide0 at pci0 dev 14 function 2 "AMD CS5536 IDE" rev 0x01: DMA, channel 0 wired to compatibility, channel 1 wired to compatibility wd0 at pciide0 channel 0 drive 0: wd0: 16-sector PIO, LBA48, 152627MB, 312581808 sectors wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 2 pciide0: channel 1 ignored (disabled) auglx0 at pci0 dev 14 function 3 "AMD CS5536 Audio" rev 0x01: isa irq 9, CS5536 AC97 ac97: codec id 0x414c4760 (Avance Logic ALC655 rev 0) audio0 at auglx0 ohci1 at pci0 dev 14 function 4 "AMD CS5536 USB" rev 0x02: isa irq 11, version 1.0, legacy support ehci1 at pci0 dev 14 function 5 "AMD CS5536 USB" rev 0x02: isa irq 11 usb1 at ehci1: USB revision 2.0 uhub1 at usb1 configuration 1 interface 0 "AMD EHCI root hub" rev 2.00/1.00 addr 1 usb2 at ohci0: USB revision 1.0 uhub2 at usb2 configuration 1 interface 0 "NEC OHCI root hub" rev 1.00/1.00 addr 1 usb3 at ohci1: USB revision 1.0 uhub3 at usb3 configuration 1 interface 0 "AMD OHCI root hub" rev 1.00/1.00 addr 1 apm0 at mainbus0 umass0 at uhub1 port 1 configuration 1 interface 0 "Generic USB2.0-CRW" rev 2.00/58.87 addr 2 umass0: using SCSI over Bulk-Only scsibus0 at umass0: 2 targets, initiator 0 sd0 at scsibus0 targ 1 lun 0: removable serial.0bda015811417340 urtw0 at uhub1 port 4 configuration 1 interface 0 "Realtek RTL8187B_WLAN_Adapter" rev 2.00/2.00 addr 3 urtw0: RTL8187B rev E, address 00:17:c4:4d:ea:21 vscsi0 at root scsibus1 at vscsi0: 256 targets softraid0 at root scsibus2 at softraid0: 256 targets pmon bootpath: bootduid=b0c7a9c3d196767f root on wd0a (b0c7a9c3d196767f.a) swap on wd0b dump on wd0b usbdevs: Controller /dev/usb0: addr 01: 1033: NEC, EHCI root hub high speed, self powered, config 1, rev 1.00 driver: uhub0 Controller /dev/usb1: addr 01: 1022: AMD, EHCI root hub high speed, self powered, config 1, rev 1.00 driver: uhub1 addr 02: 0bda:0158 Generic, USB2.0-CRW high speed, power 500 mA, config 1, rev 58.87, iSerial 2007111417340 driver: umass0 addr 03: 0bda:8189 Realtek, RTL8187B_WLAN_Adapter high speed, power 500 mA, config 1, rev 2.00, iSerial 00e04c01 driver: urtw0 Controller /dev/usb2: addr 01: 1033: NEC, OHCI root hub full speed, self powered, config 1, rev 1.00 driver: uhub2 Controller /dev/usb3: addr 01: 1022: AMD, OHCI root hub full speed, self powered, config 1, rev 1.00 driver: uhub3 OpenPGP_signature Description: OpenPGP digital signature
Re: remove RTLD_NODELETE removal patches from chromium/iridium/fcitx
On Sat, Jun 05, 2021 at 11:13:56AM +0200, Sebastien Marie wrote:
>
> Hi,
>
> The following patches removes RTLD_NODELETE removal patches from few
> ports (rsadowski@ raced me for few others ports, thanks !).
>
> I built tested them on amd64.
>
> For inputmethods/fcitx, REVISION bump might not be required, but "in doubt
> bump".
>
> Comments or OK ?
Brad sent me a similar diff and I haven't had time to commit it.
ok kevlo@
> --
> Sebastien Marie
>
> Index: inputmethods/fcitx/Makefile
> ===
> RCS file: /cvs/ports/inputmethods/fcitx/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- inputmethods/fcitx/Makefile 27 Aug 2020 00:59:48 - 1.15
> +++ inputmethods/fcitx/Makefile 5 Jun 2021 09:09:48 -
> @@ -7,6 +7,7 @@ V = 4.2.9.8
> DISTNAME = fcitx-$V
> PKGNAME-main = ${PKGNAME}
> PKGNAME-gtk3 = fcitx-gtk3-$V
> +REVISION = 0
>
> SHARED_LIBS += fcitx-config0.0 # 4.1
> SHARED_LIBS += fcitx-core 0.1 # 0.3
> Index: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
> ===
> RCS file: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
> diff -N inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
> --- inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h 28 Nov
> 2017 02:56:56 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-src_lib_fcitx-utils_utils_h,v 1.1.1.1 2017/11/28 02:56:56
> kevlo Exp $
> -
> -Index: src/lib/fcitx-utils/utils.h
> src/lib/fcitx-utils/utils.h.orig
> -+++ src/lib/fcitx-utils/utils.h
> -@@ -82,6 +82,10 @@ typedef int32_t boolean;
> - #define false (0)
> - #endif
> -
> -+#ifndef RTLD_NODELETE
> -+#define RTLD_NODELETE 0
> -+#endif
> -+
> - #define FCITX_INT_LEN ((int)(sizeof(int) * 2.5) + 2)
> - #define FCITX_LONG_LEN ((int)(sizeof(long) * 2.5) + 2)
> - #define FCITX_INT32_LEN (22)
> Index: www/chromium/Makefile
> ===
> RCS file: /cvs/ports/www/chromium/Makefile,v
> retrieving revision 1.570
> diff -u -p -r1.570 Makefile
> --- www/chromium/Makefile 27 May 2021 18:05:13 - 1.570
> +++ www/chromium/Makefile 5 Jun 2021 09:09:48 -
> @@ -15,7 +15,7 @@ DPB_PROPERTIES= parallel parallel2
> COMMENT= Chromium browser
>
> V= 91.0.4472.77
> -REVISION=0
> +REVISION=1
>
> DISTNAME=chromium-${V}
>
> Index: www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
> ===
> RCS file:
> /cvs/ports/www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
> retrieving revision 1.20
> diff -u -p -r1.20 patch-content_gpu_gpu_sandbox_hook_linux_cc
> --- www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 27 May
> 2021 04:21:01 - 1.20
> +++ www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 5 Jun
> 2021 09:09:48 -
> @@ -3,12 +3,9 @@ $OpenBSD: patch-content_gpu_gpu_sandbox_
> Index: content/gpu/gpu_sandbox_hook_linux.cc
> --- content/gpu/gpu_sandbox_hook_linux.cc.orig
> +++ content/gpu/gpu_sandbox_hook_linux.cc
> -@@ -99,8 +99,9 @@ static const char kLibV4lEncPluginPath[] =
> - "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
> - #endif
> +@@ -101,6 +101,7 @@ static const char kLibV4lEncPluginPath[] =
>
> --constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
> -+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
> + constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
>
> +#if !defined(OS_BSD)
> void AddV4L2GpuPermissions(
> Index: www/iridium/Makefile
> ===
> RCS file: /cvs/ports/www/iridium/Makefile,v
> retrieving revision 1.110
> diff -u -p -r1.110 Makefile
> --- www/iridium/Makefile 21 May 2021 19:50:37 - 1.110
> +++ www/iridium/Makefile 5 Jun 2021 09:09:50 -
> @@ -19,7 +19,7 @@ V= 2021.03.88
> DISTNAME=iridium-browser-${V}
> PKGNAME= iridium-${V}
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
> -REVISION=0
> +REVISION=1
>
> CATEGORIES= www
>
> Index: www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
> ===
> RCS file:
> /cvs/ports/www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-content_gpu_gpu_sandbox_hook_linux_cc
> --- www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 1 Apr
> 2021 10:24:45 - 1.10
> +++ www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 5 Jun
> 2021 09:09:50 -
> @@ -3,12 +3,9
Re: [patch] UPDATE: converters/libiconv: pledge iconv binary
On Sat, 5 Jun 2021 12:51:21 +0200
Hiltjo Posthuma :
>
> >
> > 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
> > # 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 000..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.cTue Jan 26 20:07:34 2021
> > +@@ -19,6 +19,8 @@
> > + # define ICONV_CONST
> > + #endif
> > +
> > ++#include
> > ++
> > + #include
> > + #include
> > + #include
> > +@@ -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@
Update to go-1.16.5
Hi,
> go1.16.5 (released 2021-06-03) includes security fixes to the
> archive/zip, math/big, net, and net/http/httputil packages, as well
> as bug fixes to the linker, the go command, and the net/http
> packagckage.
https://golang.org/doc/devel/release#go1.16.minor
More details can be found on the announce:
https://groups.google.com/g/golang-announce/c/RgCMkAEQjSI/m/r_EP-NlKBgAJ
> The SetString and UnmarshalText methods of math/big.Rat may cause a
> panic or an unrecoverable fatal error if passed inputs with very large
> exponents. This is issue #45910 and CVE-2021-33198.
>
> ReverseProxy in net/http/httputil could be made to forward certain
> hop-by-hop headers, including Connection. In case the target of the
> ReverseProxy was itself a reverse proxy, this would let an attacker
> drop arbitrary headers, including those set by the
> ReverseProxy.Director. This is issue #46313 and CVE-2021-33197.
>
> The LookupCNAME, LookupSRV, LookupMX, LookupNS, and LookupAddr
> functions in net, and their respective methods on the Resolver type
> may return arbitrary values retrieved from DNS which do not follow the
> established RFC 1035 rules for domain names. If these names are used
> without further sanitization, for instance unsafely included in HTML,
> they may allow for injection of unexpected content. Note that
> LookupTXT may still return arbitrary values that could require
> sanitization before further use. This is issue #46241 and
> CVE-2021-33195.
>
> The NewReader and OpenReader functions in archive/zip can cause a
> panic or an unrecoverable fatal error when reading an archive that
> claims to contain a large number of files, regardless of its actual
> size. This is issue #46242 and CVE-2021-33196.
Patches didn't need to be regenerated and all tests pass on my amd64
machine.
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.100
diff -u -p -r1.100 Makefile
--- Makefile16 May 2021 07:40:45 - 1.100
+++ Makefile5 Jun 2021 12:52:23 -
@@ -7,7 +7,7 @@ BIN_BOOTSTRAP_VERSION = 1.16
COMMENT = Go programming language
-VERSION = 1.16.4
+VERSION = 1.16.5
DISTNAME = go${VERSION}.src
PKGNAME = go-${VERSION}
PKGSPEC = ${FULLPKGNAME:S/go-/go-=/}
Index: distinfo
===
RCS file: /cvs/ports/lang/go/distinfo,v
retrieving revision 1.62
diff -u -p -r1.62 distinfo
--- distinfo16 May 2021 07:40:45 - 1.62
+++ distinfo5 Jun 2021 12:52:23 -
@@ -2,9 +2,9 @@ SHA256 (go-openbsd-386-bootstrap-1.16.ta
SHA256 (go-openbsd-arm-bootstrap-1.16.tar.gz) =
DjjCEzU/FnndIrKC8gh5PKAZkKp9Lt49aT3XPqhEWNM=
SHA256 (go-openbsd-arm64-bootstrap-1.16.tar.gz) =
qqc/TtaBfoq5oJcOHoqNZ6+bO+OOIRZoW1zlj19uBVw=
SHA256 (go-openbsd-mips64-bootstrap-1.16.tar.gz) =
dwojdjHgxrLlKC8QbseRYnOf8s/wN/Wx+UkPhH2aeJY=
-SHA256 (go1.16.4.src.tar.gz) = rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM=
+SHA256 (go1.16.5.src.tar.gz) = e/p+WQjHzJ512l3fMGbXy88/2fpRlFhRMl7rwX9QuoA=
SIZE (go-openbsd-386-bootstrap-1.16.tar.gz) = 131493298
SIZE (go-openbsd-arm-bootstrap-1.16.tar.gz) = 128073881
SIZE (go-openbsd-arm64-bootstrap-1.16.tar.gz) = 126892240
SIZE (go-openbsd-mips64-bootstrap-1.16.tar.gz) = 129935270
-SIZE (go1.16.4.src.tar.gz) = 20917203
+SIZE (go1.16.5.src.tar.gz) = 20921372
Re: [patch] UPDATE: converters/libiconv: pledge iconv binary
On Fri, May 28, 2021 at 04:48:04PM +0200, Hiltjo Posthuma wrote:
> On Fri, May 28, 2021 at 11:25:43AM +0100, Stuart Henderson wrote:
> > On 2021/05/28 12:14, Hiltjo Posthuma wrote:
> > > On Thu, Feb 04, 2021 at 01:26:44PM +0100, Hiltjo Posthuma wrote:
> > > > On Tue, Jan 26, 2021 at 08:27:24PM +0100, Hiltjo Posthuma wrote:
> > > > > On Tue, Jan 26, 2021 at 03:56:11PM +, Stuart Henderson wrote:
> > > > > > On 2021/01/26 15:31, Clemens Gößnitzer wrote:
> > > > > > > January 26, 2021 3:44 PM, "Hiltjo Posthuma"
> > > > > > > wrote:
> > > > > > > > On Sat, Jan 16, 2021 at 04:29:27PM +0100, Hiltjo Posthuma wrote:
> > > > > > > >> On Mon, Jan 11, 2021 at 07:50:55PM +0100, Hiltjo Posthuma
> > > > > > > >> wrote:
> > > > > > > >>
> > > > > > > >> The below patch pledges the iconv binary in the libiconv
> > > > > > > >> package. The tool is
> > > > > > > >> useful for converting text-encoding of text data to UTF-8 for
> > > > > > > >> example.
> > > > > > > >>
> > > > > > > >> It now uses pledge("stdio", NULL) if only using stdin/stdout.
> > > > > > > >> It uses
> > > > > > > >> pledge("stdio rpath", NULL) when specifying files.
> > > > > > > >>
> > > > > > > >> I've tested many command-line option combinations and haven't
> > > > > > > >> found missing
> > > > > > > >> promises which cause an abort().
> > > > > > > >>
> > > > > > > >> Patch:
> > > > > > ..
> > > > > > > >> +@@ -846,6 +849,9 @@
> > > > > > > >> + struct iconv_hooks hooks;
> > > > > > > >> + int i;
> > > > > > > >> + int status;
> > > > > > > >> ++
> > > > > > > >> ++ if (pledge(i == argc ? "stdio" : "stdio rpath", NULL) == -1)
> > > > > > >
> > > > > > > Wouldn't you use i uninitialised here?
> > > > > > >
> > > > > > > >> ++ err(1, "pledge");
> > > > > > > >> +
> > > > > > > >> + set_program_name (argv[0]);
> > > > > > > >> + #if HAVE_SETLOCALE
> > > > > > > >> --
> > > > > >
> > > > > > Yes, it needs to be done after parsing the arguments in the loop
> > > > > > after
> > > > > > calling textdomain().
> > > > > >
> > > > > > Looks like it was previously done like that but moved before
> > > > > > sending out
> > > > > > the diff? I assume it was moved so that more of the code was moved
> > > > > > under
> > > > > > pledge. Better approach might be to unconditionally pledge stdio
> > > > > > rpath,
> > > > > > then, after the loop, conditionally pledge again to drop rpath if
> > > > > > possible.
> > > > > >
> > > > > > It would be nicer to use the error function used in the rest of
> > > > > > the file rather than pulling in another header for err().
> > > > > >
> > > > >
> > > > > Hi,
> > > > >
> > > > > Thanks both for the review! I updated the changes in the patch below.
> > > > > It was indeed a mistake in creating the patch, I'm sorry for the
> > > > > sloppiness.
> > > > >
> > > > >
> > > > > From dbb04c280d8ca368da43c0fdf185c3e9a4a59050 Mon Sep 17 00:00:00 2001
> > > > > From: Hiltjo Posthuma
> > > > > Date: Tue, 26 Jan 2021 20:21:32 +0100
> > > > > Subject: [PATCH] libiconv: pledge iconv(1) binary
> > > > >
> > > > > ---
> > > > > converters/libiconv/Makefile | 3 +-
> > > > > converters/libiconv/patches/patch-src_iconv_c | 29
> > > > > +++
> > > > > 2 files changed, 31 insertions(+), 1 deletion(-)
> > > > > create mode 100644 converters/libiconv/patches/patch-src_iconv_c
> > > > >
> > > > > 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
> > > > > # 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 000..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
> > > > > ++
> > > > > + #include
> > > > > + #include
> > > > > + #include
> > > > > +@@ -847,6 +849,8 @@
> > > > > + int i;
> > > > > + int status;
> > > > > +
> > > > > ++ if (pledge("stdio rpath", NULL) == -1)
> > > > > ++error(
remove RTLD_NODELETE removal patches from chromium/iridium/fcitx
Hi,
The following patches removes RTLD_NODELETE removal patches from few
ports (rsadowski@ raced me for few others ports, thanks !).
I built tested them on amd64.
For inputmethods/fcitx, REVISION bump might not be required, but "in doubt
bump".
Comments or OK ?
--
Sebastien Marie
Index: inputmethods/fcitx/Makefile
===
RCS file: /cvs/ports/inputmethods/fcitx/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- inputmethods/fcitx/Makefile 27 Aug 2020 00:59:48 - 1.15
+++ inputmethods/fcitx/Makefile 5 Jun 2021 09:09:48 -
@@ -7,6 +7,7 @@ V = 4.2.9.8
DISTNAME = fcitx-$V
PKGNAME-main = ${PKGNAME}
PKGNAME-gtk3 = fcitx-gtk3-$V
+REVISION = 0
SHARED_LIBS += fcitx-config0.0 # 4.1
SHARED_LIBS += fcitx-core 0.1 # 0.3
Index: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
===
RCS file: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
diff -N inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
--- inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h28 Nov
2017 02:56:56 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_lib_fcitx-utils_utils_h,v 1.1.1.1 2017/11/28 02:56:56
kevlo Exp $
-
-Index: src/lib/fcitx-utils/utils.h
src/lib/fcitx-utils/utils.h.orig
-+++ src/lib/fcitx-utils/utils.h
-@@ -82,6 +82,10 @@ typedef int32_t boolean;
- #define false (0)
- #endif
-
-+#ifndef RTLD_NODELETE
-+#define RTLD_NODELETE 0
-+#endif
-+
- #define FCITX_INT_LEN ((int)(sizeof(int) * 2.5) + 2)
- #define FCITX_LONG_LEN ((int)(sizeof(long) * 2.5) + 2)
- #define FCITX_INT32_LEN (22)
Index: www/chromium/Makefile
===
RCS file: /cvs/ports/www/chromium/Makefile,v
retrieving revision 1.570
diff -u -p -r1.570 Makefile
--- www/chromium/Makefile 27 May 2021 18:05:13 - 1.570
+++ www/chromium/Makefile 5 Jun 2021 09:09:48 -
@@ -15,7 +15,7 @@ DPB_PROPERTIES= parallel parallel2
COMMENT= Chromium browser
V= 91.0.4472.77
-REVISION= 0
+REVISION= 1
DISTNAME= chromium-${V}
Index: www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
===
RCS file:
/cvs/ports/www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
retrieving revision 1.20
diff -u -p -r1.20 patch-content_gpu_gpu_sandbox_hook_linux_cc
--- www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc27 May
2021 04:21:01 - 1.20
+++ www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc5 Jun
2021 09:09:48 -
@@ -3,12 +3,9 @@ $OpenBSD: patch-content_gpu_gpu_sandbox_
Index: content/gpu/gpu_sandbox_hook_linux.cc
--- content/gpu/gpu_sandbox_hook_linux.cc.orig
+++ content/gpu/gpu_sandbox_hook_linux.cc
-@@ -99,8 +99,9 @@ static const char kLibV4lEncPluginPath[] =
- "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
- #endif
+@@ -101,6 +101,7 @@ static const char kLibV4lEncPluginPath[] =
--constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
-+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
+ constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
+#if !defined(OS_BSD)
void AddV4L2GpuPermissions(
Index: www/iridium/Makefile
===
RCS file: /cvs/ports/www/iridium/Makefile,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile
--- www/iridium/Makefile21 May 2021 19:50:37 - 1.110
+++ www/iridium/Makefile5 Jun 2021 09:09:50 -
@@ -19,7 +19,7 @@ V=2021.03.88
DISTNAME= iridium-browser-${V}
PKGNAME= iridium-${V}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-REVISION= 0
+REVISION= 1
CATEGORIES=www
Index: www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
===
RCS file:
/cvs/ports/www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
retrieving revision 1.10
diff -u -p -r1.10 patch-content_gpu_gpu_sandbox_hook_linux_cc
--- www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 1 Apr
2021 10:24:45 - 1.10
+++ www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 5 Jun
2021 09:09:50 -
@@ -3,12 +3,9 @@ $OpenBSD: patch-content_gpu_gpu_sandbox_
Index: content/gpu/gpu_sandbox_hook_linux.cc
--- content/gpu/gpu_sandbox_hook_linux.cc.orig
+++ content/gpu/gpu_sandbox_hook_linux.cc
-@@ -98,8 +98,9 @@ static const char kLibV4lEncPluginPath[] =
- "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
- #endif
+@@ -100,6 +100,7 @@ static const char kLibV4lEncPluginPath[] =
