Re: [UPDATE] claws-mail 3.17.4 with litehtml_viewer plugin
Am Sun, 8 Dec 2019 11:18:14 -0500
schrieb Daniel Jakots :
> On Sun, 8 Dec 2019 17:12:29 +0100, Henry Jensen
> wrote:
>
> > I attached the complete port, since "cvs diff -uRN" didn't create
> > diffs for the newly added files. despite it says so in the command
> > description.
>
> Did you cvs add them beforehand? If so, they should appear.
Ah, you got me. My bad! Anyway, I attached the diff now.
Index: Makefile
===
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.123
diff -u -p -u -r1.123 Makefile
--- Makefile 18 Nov 2019 19:57:44 - 1.123
+++ Makefile 8 Dec 2019 16:31:58 -
@@ -14,7 +14,7 @@ PKGNAME-spamassassin= claws-mail-spamass
PKGNAME-pdfviewer= claws-mail-pdfviewer-${V}
PKGNAME-gdata= claws-mail-gdata-${V}
-REVISION-main= 0
+REVISION-main= 1
REVISION-gdata= 0
CATEGORIES= mail news
@@ -53,7 +53,7 @@ WANTLIB += sasl2 ssl xcb xcb-render xcb-
WANTLIB-main = ${WANTLIB}
WANTLIB-main += ICE SM X11-xcb archive assuan b2 bz2 c canberra canberra-gtk
WANTLIB-main += charset cairo-gobject db dbus-1 dbus-glib-1 enchant gmp gnutls gpg-error
-WANTLIB-main += gpgme hogweed ical icalss icalvcal icudata icui18n icuuc idn2
+WANTLIB-main += gpgme gumbo hogweed ical icalss icalvcal icudata icui18n icuuc idn2
WANTLIB-main += ltdl lz4 lzma nettle notify ogg p11-kit perl rsvg-2
WANTLIB-main += startup-notification-1 ${COMPILER_LIBCXX} tasn1 unistring vorbis
WANTLIB-main += vorbisfile xcb-util xml2 zstd
@@ -89,6 +89,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
security/libnettle \
textproc/enchant \
textproc/libical \
+ www/gumbo \
x11/dbus-glib
LIB_DEPENDS-pdfviewer= ${LIB_DEPENDS} \
Index: patches/patch-src_plugins_litehtml_viewer_Makefile_in
===
RCS file: patches/patch-src_plugins_litehtml_viewer_Makefile_in
diff -N patches/patch-src_plugins_litehtml_viewer_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_litehtml_viewer_Makefile_in 8 Dec 2019 16:31:58 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/plugins/litehtml_viewer/Makefile.in
+--- src/plugins/litehtml_viewer/Makefile.in.orig
src/plugins/litehtml_viewer/Makefile.in
+@@ -171,7 +171,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -iquote.@am__isrc@ -iquote$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = \
Index: patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in
===
RCS file: patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in
diff -N patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in 8 Dec 2019 16:31:58 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/plugins/litehtml_viewer/litehtml/Makefile.in
+--- src/plugins/litehtml_viewer/litehtml/Makefile.in.orig
src/plugins/litehtml_viewer/litehtml/Makefile.in
+@@ -154,7 +154,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -iquote.@am__isrc@ -iquote$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = ./$(DEPDIR)/liblitehtml_la-background.Plo \
Index: patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp
===
RCS file: patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp
diff -N patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp 8 Dec 2019 16:31:58 -
@@ -0,0 +1,10 @@
+$OpenBSD$
+
+Index: src/plugins/litehtml_viewer/litehtml/background.cpp
+--- src/plugins/litehtml_viewer/litehtml/background.cpp.orig
src/plugins/litehtml_viewer/litehtml/background.cpp
+@@ -1,3 +1,4 @@
++#include "stddef.h"
+ #include "html.h"
+ #include "background.h"
+
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-main,v
retrieving revision 1.41
diff -u -p -u -r1.41 PLIST-main
--- pkg/PLIST-main 1 Jan 2019 18:01:20 - 1.41
+++ pkg/PLIST-main 8 Dec 2019 16:31:58 -
@@ -268,6 +268,8 @@ lib/claws-mail/plugins/fetchinfo.la
lib/claws-mail/plugins/fetchinfo.so
lib/claws-mail/plugins/libravatar.la
lib/claws-mail/plugins/libravatar.so
+lib/claws-mail/plugins/litehtml_viewer.la
+lib/claws-mail/plugins/litehtml_viewer.so
lib/claw
[UPDATE] claws-mail 3.17.4 with litehtml_viewer plugin
Greetings, attached is an updated port for mail/claws-mail The difference is, that this port build also the litehtml_viewer plugin. This plugin is based on www/gumbo and can render HTML e-mails. It exists since claws-mai 3.17.4. Before that, usage of the dillo plugin was the common method to view HTML mails. But since the dillo plugin embeds the entire dillo web browser, the dillo plugin makes HTTP(S) requests at will and loads resources over the net, if referenced from the HTML code in the e-mail. This raises privacy concerns. Gumbo is a pure "offline" HTML5 rendering library. This makes the litehtml_viewer plugin not only preferable regarding to privacy, it also does a better job on rendering modern HTML code. The port didn't build at first because of compatibility issues of c++ versions. I added three patches in order to build it without errors. I also modified Makefile, adding www/gumbo as a dependency. I attached the complete port, since "cvs diff -uRN" didn't create diffs for the newly added files. despite it says so in the command description. Regards, Henry claws-mail.tar.gz Description: application/gzip
claws-mail with litehtml plugin - build fails
Greetings, I am trying to build claws-mail with litehtml plugin. This is a new plugin for rendering HTML e-mails which exists since claws-mail 3.17.4. The plugin depends on the gumbo parsing library, which already exist in ports as www/gumbo. So, what I did was simply pkg_add gumbo cd /usr/ports/mail/claws-mail make build This fails with the following error: gmake[6]: Entering directory '/usr/ports/pobj/claws-mail-3.17.4/claws-mail-3.17.4/src/plugins/litehtml_viewer/litehtml' /usr/bin/libtool --tag=disable-static --tag=CXX --mode=compile c++ -DHAVE_CONFIG_H -I. -I../../../.. -I/usr/local/include -I/usr/X11R6/include -I/usr/local/include -I/usr/local/include -std=c++11 -O2 -pipe -MT liblitehtml_la-background.lo -MD -MP -MF .deps/liblitehtml_la-background.Tpo -c -o liblitehtml_la-background.lo `test -f 'background.cpp' || echo './'`background.cpp c++ -DHAVE_CONFIG_H -I. -I../../../.. -I/usr/local/include -I/usr/X11R6/include -I/usr/local/include -I/usr/local/include -std=c++11 -O2 -pipe -MT liblitehtml_la-background.lo -MD -MP -MF .deps/liblitehtml_la-background.Tpo -c background.cpp -fPIC -DPIC -o .libs/liblitehtml_la-background.o In file included from background.cpp:1: In file included from ./html.h:5: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:640: In file included from /usr/include/c++/v1/initializer_list:47: In file included from /usr/include/c++/v1/cstddef:38: ../../../../version:1:1: error: unknown type name 'echo' echo 3.17.4 ^ ../../../../version:1:6: error: expected unqualified-id echo 3.17.4 ^ In file included from background.cpp:1: In file included from ./html.h:5: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:640: In file included from /usr/include/c++/v1/initializer_list:47: /usr/include/c++/v1/cstddef:50:9: error: no member named 'ptrdiff_t' in the global namespace; did you mean '__ptrdiff_t'? using ::ptrdiff_t; ~~^ /usr/include/machine/_types.h:122:16: note: '__ptrdiff_t' declared here typedef long__ptrdiff_t; ^ In file included from background.cpp:1: In file included from ./html.h:5: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:641: In file included from /usr/include/c++/v1/type_traits:407: ../../../../version:1:1: error: unknown type name 'echo' echo 3.17.4 ^ ../../../../version:1:6: error: expected unqualified-id echo 3.17.4 ^ In file included from background.cpp:1: In file included from ./html.h:5: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:643: In file included from /usr/include/c++/v1/utility:206: ../../../../version:1:1: error: unknown type name 'echo' echo 3.17.4 ^ ../../../../version:1:6: error: expected unqualified-id echo 3.17.4 ^ In file included from background.cpp:1: In file included from ./html.h:5: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:644: In file included from /usr/include/c++/v1/memory:654: In file included from /usr/include/c++/v1/typeinfo:61: In file included from /usr/include/c++/v1/exception:84: ../../../../version:1:1: error: unknown type name 'echo' echo 3.17.4 ^ ../../../../version:1:6: error: expected unqualified-id echo 3.17.4 similar errors follows. Anyone knows what to do? Regards, Henry
Re: rspamd stop rc script doesn't work in OpenBSD 6.6
On Mon, 28 Oct 2019 15:51:58 + Chris Narkiewicz wrote: > On 28/10/2019 07:25, Stuart Henderson wrote: > > It was fixed in rspamd somewhere between 1.9.4 and 17 Sept > > Ok, thank you for the confirmation. I'll just wait until > it's backported. > > Cheers, > Chris > Any news/plans on backporting to stable? I have an opensmtpd/rspamd setup on stable in testing stage here, but I am hesitating to make this productiv as long as rcctl can't stop/restart rspamd. Regards, Henry
Re: [UPDATE] mail/imapsync-1.945
ping On Mon, 21 Oct 2019 13:53:42 +0200 Henry Jensen wrote: > Gretings, > > attached diff updates imapsync from 1.727 to 1.945. > Three new dependencies (RUN_DEPENDS) were added: > > sysutils/p5-Sys-MemInfo > textproc/p5-Regexp-Common > devel/p5-File-Tail > > tested on -current amd64 > > If OK, someone is needed to push it to CVS. > > Kind regards, > > Henry
[UPDATE] mail/imapsync-1.945
Gretings,
attached diff updates imapsync from 1.727 to 1.945.
Three new dependencies (RUN_DEPENDS) were added:
sysutils/p5-Sys-MemInfo
textproc/p5-Regexp-Common
devel/p5-File-Tail
tested on -current amd64
If OK, someone is needed to push it to CVS.
Kind regards,
Henry
Index: Makefile
===
RCS file: /cvs/ports/mail/imapsync/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 17 Oct 2019 20:15:55 - 1.19
+++ Makefile 21 Oct 2019 10:54:47 -
@@ -2,7 +2,7 @@
GH_ACCOUNT= imapsync
GH_PROJECT= imapsync
-GH_TAGNAME= imapsync-1.727
+GH_TAGNAME= imapsync-1.945
DISTNAME= ${GH_TAGNAME}
COMMENT= IMAP synchronization tool
@@ -28,6 +28,9 @@ RUN_DEPENDS= converters/p5-DateManip \
devel/p5-Parse-RecDescent \
devel/p5-Test-Pod \
devel/p5-Data-Uniqid \
+ sysutils/p5-Sys-MemInfo \
+ textproc/p5-Regexp-Common \
+ devel/p5-File-Tail \
devel/p5-Readonly
NO_BUILD= Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/imapsync/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 10 May 2017 12:47:56 - 1.13
+++ distinfo 21 Oct 2019 10:54:47 -
@@ -1,2 +1,2 @@
-SHA256 (imapsync-1.727.tar.gz) = UChyfUdqWBM1EF/yTqZ3MRr6XOb4EvCSbLI3djV5FGg=
-SIZE (imapsync-1.727.tar.gz) = 1056838
+SHA256 (imapsync-1.945.tar.gz) = U2OGojF4knVbJ1M02LH0zsowJG3XnAc7ySJ8EX36cak=
+SIZE (imapsync-1.945.tar.gz) = 1708572
Re: [NEW] devel/p5-Sys-MemInfo
On Wed, 16 Oct 2019 16:07:34 +0100 Stuart Henderson wrote: > On 2019/10/16 09:04, Henry Jensen wrote: > > Ping > > > > On Wed, 9 Oct 2019 15:08:00 +0200 > > Henry Jensen wrote: > > > > > Greetings, > > > > > > attached is a new port for the perl module Sys::MemInfo. Sys::MemInfo > > > returns the total amount of free and used physical memory in bytes in > > > totalmem and freemem variables. Tested on -current amd64. > > Please format Makefile and DESCR a bit nicer. Look at other ports in the > tree for examples. Actually, I used one of the p5-* ports as template. I made minor modifications now (honoring the 72 character per line limit) and compared the formatting to other ports. > > > > This will be needed for an updated version of mail/imapsync. > > > > > > Comments? > > I fail to see why an imap syncer would need to pull in an otherwise > unnecessary dependency just to print how much memory is free, but that's > not the only thing puzzling about imapsync ;) > If there is a tool with fewer dependencies in ports, which does the same job, I would be happy to learn about it :) p5-Sys-MemInfo.tar.gz Description: application/gzip
Re: [NEW] devel/p5-Sys-MemInfo
Ping On Wed, 9 Oct 2019 15:08:00 +0200 Henry Jensen wrote: > Greetings, > > attached is a new port for the perl module Sys::MemInfo. Sys::MemInfo > returns the total amount of free and used physical memory in bytes in > totalmem and freemem variables. Tested on -current amd64. > > This will be needed for an updated version of mail/imapsync. > > Comments? > > If OK, someone is needed to push it to CVS. > > Kind regards, > > Henry > >
[NEW] devel/p5-Sys-MemInfo
Greetings, attached is a new port for the perl module Sys::MemInfo. Sys::MemInfo returns the total amount of free and used physical memory in bytes in totalmem and freemem variables. Tested on -current amd64. This will be needed for an updated version of mail/imapsync. Comments? If OK, someone is needed to push it to CVS. Kind regards, Henry p5-Sys-MemInfo.tar.gz Description: application/gzip
[Update] security/gopass 1.8.6
Greetings, below is a trivial patch to update security/gopass from 1.8.4 to 1.8.6. Tested on -current amd64. OK? Index: Makefile === RCS file: /cvs/ports/security/gopass/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile12 Jul 2019 20:49:02 - 1.14 +++ Makefile19 Sep 2019 12:32:46 - @@ -2,7 +2,7 @@ COMMENT = pass compatible password manager written in go -V =1.8.4 +V =1.8.6 DISTNAME = gopass-$V CATEGORIES = security Index: distinfo === RCS file: /cvs/ports/security/gopass/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo23 Jan 2019 00:56:46 - 1.11 +++ distinfo19 Sep 2019 12:32:46 - @@ -1,2 +1,2 @@ -SHA256 (gopass-1.8.4.tar.gz) = KgAmPdFptWDHVXIjm6NB7e7IrLZlGP3KM9VdgfuU/J8= -SIZE (gopass-1.8.4.tar.gz) = 6616712 +SHA256 (gopass-1.8.6.tar.gz) = +//g9y5R2eMKEBA/AN0S8EvKZXL1WXbG3HBJxzxltxU= +SIZE (gopass-1.8.6.tar.gz) = 7302241
Re: [NEW] www/e2guardian
On Tue, 17 Sep 2019 17:52:09 +0200
Robert Nagy wrote:
> On 17/09/19 17:05 +0200, Henry Jensen wrote:
> > Greetings,
> >
> > I incorporated Stuart's changes and removed the remark about the clamav
> > flavor in DESCR. I tested it on -current amd64 and confirmed that it
> > builds and works as intended.
> >
> > Robert's approach of replacing sigtimedwait() didn't work here:
> >
> > FatController.cpp:1700:22: error: use of undeclared identifier
> > 'SYS___thrsigdivert'
> > rc = syscall(SYS___thrsigdivert, signal_set, NULL, );
> >
> > so I didn't change this (although I think his way is more elegant,
> > maybe there is something missing).
> >
> >
>
>
> $OpenBSD$
>
> Index: src/FatController.cpp
> --- src/FatController.cpp.orig
> +++ src/FatController.cpp
> @@ -46,6 +46,10 @@
> #include
> #endif //__SSLMITM
>
> +#if defined(__OpenBSD__)
> +#include
> +#endif
> +
> #include "FatController.hpp"
> #include "ConnectionHandler.hpp"
> #include "DynamicURLList.hpp"
> @@ -194,7 +198,7 @@ void stat_rec::reset()
> fprintf(fs, "%s %d %d %d %d %ld %ld %ld
>%ld%d %d\n", buffer, o.http_workers,
> bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs,
> mfd, LC);
> } else {
> -fprintf(fs, "%ld %d %d %d %d %ld %ld
> %ld %ld %d %d\n", now, o.http_workers,
> +fprintf(fs, "%lld %d %d %d %d %ld %ld
> %ld %ld %d %d\n", now, o.http_workers,
> bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs,
> mfd, LC);
> }
>
> @@ -1696,7 +1700,11 @@ int fc_controlit() //
> }
> timeout.tv_sec = 5;
> timeout.tv_nsec = (long) 0;
> +#if defined(__OpenBSD__)
> +rc = syscall(SYS___thrsigdivert, signal_set, NULL, );
> +#else
> rc = sigtimedwait(_set, NULL, );
> +#endif
> if (rc < 0) {
> if (errno != EAGAIN) {
> syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d
> %s", thread_id.c_str(), errno, strerror(errno));
>
>
> --
> Regards,
> Robert Nagy
Thanks. Confirmed that it builds and runs on -current amd64. Attached the
updated port.
OK?
e2guardian.tar.gz
Description: application/gzip
Re: [NEW] www/e2guardian
Greetings, I incorporated Stuart's changes and removed the remark about the clamav flavor in DESCR. I tested it on -current amd64 and confirmed that it builds and works as intended. Robert's approach of replacing sigtimedwait() didn't work here: FatController.cpp:1700:22: error: use of undeclared identifier 'SYS___thrsigdivert' rc = syscall(SYS___thrsigdivert, signal_set, NULL, ); so I didn't change this (although I think his way is more elegant, maybe there is something missing). e2guardian.tar.gz Description: application/gzip
Re: [NEW] www/e2guardian
Am Tue, 27 Aug 2019 17:56:58 +0100
schrieb Stuart Henderson :
> Here is your port cleaned up a little. I'll quote a diff and comment
> inline so you can see what I changed.
Thanks.
> what is your intention with the clamav flavour? it's mentioned in
> DESCR but not used in Makefile.
I think this is a leftover from the dansguardian port, which I used as a
"template".
> :: -MAKE_ENV= MKDIR_P='mkdir -p'
>
> i think this is unnecessary?
Not sure, it was used in a similar port which also used ./autogen.sh.
But if this all is handled by autoreconf it should be unnecessary, yes.
> :: -@pkgpath www/e2guardian,clamav
>
> this line is bogus.
Then so it is posśibly in www/dansguardian
> :: -@newgroup _e2guardian:833
> :: -@newuser
> _e2guardian:833:833:daemon:E2Guardian:/nonexistent:/sbin/nologin ::
> +@newgroup _e2guardian:842 :: +@newuser
> _e2guardian:842:842:daemon:e2guardian user:/nonexistent:/sbin/nologin
>
> 833 is taken, the next free is 842
It was the newest on -STABLE, I didn't check -CURRENT, sorry
> :: -@mode 0755
> :: @rcscript ${RCDIR}/e2guardian
> :: -@mode
>
> @mode not needed here
Again, same as in www/dansguardian. One can only be so good as one
learns from existing examples :) But again, thank you for your work.
Henry
[NEW] www/e2guardian
Greetings, the port www/dansguardian is deprecated for a long time. It's designated successor is a fork called e2guardian[0]. Unfortunately there was no port for it until now. This port builds the current version of e2guardian, an Open Source web content filter. It filters the actual content of pages based on many methods including phrase matching, request header and URL filtering, etc. I applied several patches to this port, some of them based on the old dansguardian patches. The most delicate patch is possibly patch-src_FatController_cpp, where I replaced a sigtimedwait() system call (which doesn't exist on OpenBSD) with a sigwait() call. I am not really a C programmer, so maybe this should be double checked. However, the port builds and runs as intended on amd64. Note, that this ports adds a user and group _e2guardian with the id 833, so /usr/ports/infrastructure/db/user.list should be updated. This is my first new port, so there maybe other things I got wrong Regards, Henry [0] http://e2guardian.org/ e2guardian.tar.gz Description: application/gzip
Replacement for sigtimedwait() in OpenBSD?
Not sure if ports@ is correct for this. I am trying to build e2guardian[0]
5.3.3 on OpenBSD in order to replace dansguardian[1], which does exists
in ports but is derelict.
There is one obstacle. In FatController.cpp the program uses
sigtimedwait(), which doesn't exist on OpenBSD. The code snippet reads:
timeout.tv_sec = 5;
timeout.tv_nsec = (long) 0;
rc = sigtimedwait(_set, NULL, );
if (rc < 0) {
if (errno != EAGAIN) {
syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d
%s", thread_id.c_str(), errno, strerror(errno));
}
} else {
if (rc == SIGUSR1)
gentlereload = true;
if (rc == SIGTERM)
ttg = true;
if (rc == SIGHUP)
gentlereload = true;
#ifdef DGDEBUG
std::cerr << "signal:" << rc << std::endl;
#endif
if (o.logconerror) {
syslog(LOG_INFO, "%ssigtimedwait() signal %d recd:",
thread_id.c_str(), rc);
}
}
I am able to read code, but I am not a programmer. What would be the
appropriate way to replace sigtimedwait() here?
Henry
[0] http://e2guardian.org/cms/index.php
[1] https://openports.pl/path/www/dansguardian
[Update] [Stable] archivers/bzip2
Greetings,
attached diff fixes CVE-2019-12900 (BZ2_decompress in decompress.c in
bzip2 through 1.0.6 has an out-of-bounds write when there are many
selectors.) The vulnerability has a CVSS v3.0 score of 9.8 "CRITICAL".
It is essentially the patch from
https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc
Comments?
Kind Regards,
Henry
diff -urN archivers/bzip2/Makefile mystuff/archivers/bzip2/Makefile
--- archivers/bzip2/Makefile Fri Aug 24 21:06:12 2018
+++ mystuff/archivers/bzip2/Makefile Mon Jun 24 15:37:39 2019
@@ -3,7 +3,7 @@
COMMENT= block-sorting file compressor, unencumbered
DISTNAME= bzip2-1.0.6
-REVISION= 9
+REVISION= 10
CATEGORIES= archivers
diff -urN archivers/bzip2/patches/patch-decompress_c mystuff/archivers/bzip2/patches/patch-decompress_c
--- archivers/bzip2/patches/patch-decompress_c Thu Jan 1 01:00:00 1970
+++ mystuff/archivers/bzip2/patches/patch-decompress_c Mon Jun 24 15:50:00 2019
@@ -0,0 +1,12 @@
+Index: decompress.c
+--- decompress.c.orig
decompress.c
+@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s )
+ GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
+ if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
+ GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
+- if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
++ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
+ for (i = 0; i < nSelectors; i++) {
+ j = 0;
+ while (True) {
Re: samba ad -dc not possible
On Mon, 24 Jun 2019 10:38:56 +0300 Родин Максим wrote: > Is Samba AD-DC mode possible on OpenBSD? >From https://www.openbsd.org/faq/upgrade65.html: net/samba. The AD DC server functionality implemented by the samba(8) daemon is broken at runtime on amd64, arm64, armv7 and i386. The SMB file server (smbd(8)) is not affected.
Re: [UPDATE] www/firefox-esr 60.7.1esr -> 60.7.2esr
Am 21. Juni 2019 18:44:34 MESZ schrieb Landry Breuil : >On Fri, Jun 21, 2019 at 05:57:07PM +0200, Henry Jensen wrote: >> Greetings, >> >> I'm somwhat new in the OpenBSD world, so please forgive me for any >> errors/not followed procedures I make. >> >> It has been suggested to me, that I should send patches to this list >if >> I wanted a port to be updated, so I am doing this now. > >The procedure is good, the diff itself is trivial, and generally i'm >aware of mozilla releases ahead of time, but thanks anyway :) > >Note that the corresponding -i18n port also needs an update, otherwise >it will fail to build as there's a strict requirement on a matching >version. > >Both diffs commited of course, pending builds for/backport to 6.5.. Thank you. Indeed, I did not think of the -i18n port. Kind regards, Henry
[UPDATE] www/mozilla-firefox 67.0.3 -> 67.0.4
Greetings, as the patch at https://marc.info/?l=openbsd-ports=156113265704127=2 this is about https://www.mozilla.org/en-US/security/advisories/mfsa2019-19/. The impact of this vulnerability is classified as "high". The diff updates mozilla-firefox to version 67.0.4 Kind Regards, Henry Index: www/mozilla-firefox//Makefile === RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v retrieving revision 1.383 diff -u -p -r1.383 Makefile --- www/mozilla-firefox//Makefile 20 Jun 2019 14:59:56 - 1.383 +++ www/mozilla-firefox//Makefile 21 Jun 2019 15:58:44 - @@ -5,7 +5,7 @@ ONLY_FOR_ARCHS = amd64 i386 aarch64 # Don't forget to bump www/firefox-i18n after updates. -MOZILLA_VERSION = 67.0.3 +MOZILLA_VERSION = 67.0.4 MOZILLA_BRANCH = release MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser Index: www/mozilla-firefox//distinfo === RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v retrieving revision 1.192 diff -u -p -r1.192 distinfo --- www/mozilla-firefox//distinfo 20 Jun 2019 14:59:56 - 1.192 +++ www/mozilla-firefox//distinfo 21 Jun 2019 15:58:44 - @@ -1,2 +1,2 @@ -SHA256 (mozilla/firefox-67.0.3.source.tar.xz) = tfjIKRAzXCb5qC1uzUmgGABZYCZCLG+2vZQf2pAOXy8= -SIZE (mozilla/firefox-67.0.3.source.tar.xz) = 285477708 +SHA256 (mozilla/firefox-67.0.4.source.tar.xz) = svstPmSmlH70+CErcmSazyqizUyPcFSKu2Nt1YH9bcU= +SIZE (mozilla/firefox-67.0.4.source.tar.xz) = 286036836
[UPDATE] www/firefox-esr 60.7.1esr -> 60.7.2esr
Greetings, I'm somwhat new in the OpenBSD world, so please forgive me for any errors/not followed procedures I make. It has been suggested to me, that I should send patches to this list if I wanted a port to be updated, so I am doing this now. Shortly after zero day CVE-2019-11707 another vulnerability came up in Mozillas Firefox browser, as described here: https://www.mozilla.org/en-US/security/advisories/mfsa2019-19/ The impact of this vulnerability is classified as "high". The diff updates firefox-esr to version 60.7.2esr Kind Regards, Henry Index: www/firefox-esr/Makefile === RCS file: /cvs/ports/www/firefox-esr/Makefile,v retrieving revision 1.97 diff -u -p -r1.97 Makefile --- www/firefox-esr/Makefile 20 Jun 2019 15:01:26 - 1.97 +++ www/firefox-esr/Makefile 21 Jun 2019 15:27:23 - @@ -3,7 +3,7 @@ COMMENT = Firefox web browser, Extended Support Release ONLY_FOR_ARCHS = amd64 i386 -MOZILLA_VERSION = 60.7.1esr +MOZILLA_VERSION = 60.7.2esr MOZILLA_BRANCH = release MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser Index: www/firefox-esr/distinfo === RCS file: /cvs/ports/www/firefox-esr/distinfo,v retrieving revision 1.71 diff -u -p -r1.71 distinfo --- www/firefox-esr/distinfo 20 Jun 2019 15:01:26 - 1.71 +++ www/firefox-esr/distinfo 21 Jun 2019 15:27:23 - @@ -1,2 +1,2 @@ -SHA256 (mozilla/firefox-60.7.1esr.source.tar.xz) = PRGL4VWXIOQBcsw80mBcnDW1BKx3f2kKGdn1J5zgXIM= -SIZE (mozilla/firefox-60.7.1esr.source.tar.xz) = 267808428 +SHA256 (mozilla/firefox-60.7.2esr.source.tar.xz) = ipGOpwyAZSTykzNvb0V0u25pyh6Y5uXg5cLWrSrCasI= +SIZE (mozilla/firefox-60.7.2esr.source.tar.xz) = 268579256
