Re: x11/openbox broken with 7.4 upgrade
On Wed, 18 Oct 2023, Stuart Henderson wrote:
> CC'ing maintainer.
>
> Not tested yet but I think this should do the trick.
> If it works it would make sense to commit to 7.4-stable too.
Hi Stuart, hi all
I'm an Openbox user myself.
The fix for this specific problem is ok, but here's a patch incorporating
all the relevant bugfixes from the Debian package:
Index: x11/openbox/Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.91
diff -u -p -u -p -r1.91 Makefile
--- x11/openbox/Makefile27 Sep 2023 20:37:19 - 1.91
+++ x11/openbox/Makefile18 Oct 2023 08:54:58 -
@@ -1,7 +1,7 @@
COMMENT = small, fast & usable window manager
V =3.6.1
-REVISION = 11
+REVISION = 12
DISTNAME = openbox-${V}
SHARED_LIBS += obrender12.0# 32.0
SHARED_LIBS += obt 1.1 # 2.2
@@ -15,7 +15,7 @@ MAINTAINER = Benoit Lecocq https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719620
+
+Index: configure
+--- configure.orig
configure
+@@ -14647,12 +14647,12 @@ if test -n "$LIBSN_CFLAGS"; then
+ pkg_cv_LIBSN_CFLAGS="$LIBSN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8")
2>&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8 xi\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8
xi") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBSN_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >=
0.8" 2>/dev/null`
++ pkg_cv_LIBSN_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >=
0.8 xi" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -14664,12 +14664,12 @@ if test -n "$LIBSN_LIBS"; then
+ pkg_cv_LIBSN_LIBS="$LIBSN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8")
2>&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8 xi\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8
xi") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBSN_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0 >= 0.8"
2>/dev/null`
++ pkg_cv_LIBSN_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0 >= 0.8
xi" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -14690,9 +14690,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBSN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libstartup-notification-1.0 >= 0.8" 2>&1`
++ LIBSN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libstartup-notification-1.0 >= 0.8 xi" 2>&1`
+ else
+- LIBSN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libstartup-notification-1.0 >= 0.8" 2>&1`
++ LIBSN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libstartup-notification-1.0 >= 0.8 xi" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSN_PKG_ERRORS" >&5
Index: x11/openbox/patches/patch-obrender_theme_c
===
RCS file: x11/openbox/patches/patch-obrender_theme_c
diff -N x11/openbox/patches/patch-obrender_theme_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ x11/openbox/patches/patch-obrender_theme_c 18 Oct 2023 08:54:58 -
@@ -0,0 +1,33 @@
+Fix for toggled hover and pressed images masks not loaded.
+Toggled hover and pressed images masks in Openbox themes are not loaded
+which broke many existing themes.
+Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887908
+
+Index: obrender/theme.c
+--- obrender/theme.c.orig
obrender/theme.c
+@@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDatabase db, const R
+ READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask);
+ READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask);
+ if (toggled_mask) {
+-READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask);
+-READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask);
++g_snprintf(name, 128, "%s_toggled_press
Re: [print/hplip] Fix printing a test page (lpr path)
On Thu, 28 Sep 2023, Antoine Jacoutot wrote:
> Ok then. I will revisit the port anyway.
> But use LOCALBASE please.
Commit the patch yourself if you want to, my account is probably
long gone since I haven't committed anything in years.
Thanks,
David
Index: print/hplip/Makefile
===
RCS file: /cvs/ports/print/hplip/Makefile,v
retrieving revision 1.211
diff -u -p -u -p -r1.211 Makefile
--- print/hplip/Makefile7 Jun 2023 15:45:56 - 1.211
+++ print/hplip/Makefile28 Sep 2023 05:40:49 -
@@ -18,6 +18,9 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
+REVISION-main =0
+REVISION-gui = 0
+
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud2.0 # 0.6
SHARED_LIBS += hpipp0.0 # 0.1
@@ -184,6 +187,7 @@ pre-configure:
${WRKSRC}/ui4/devmgr5.py \
${WRKSRC}/fax/backend/hpfax.py \
${WRKSRC}/base/codes.py \
+ ${WRKSRC}/base/device.py \
${WRKSRC}/base/g.py \
${WRKSRC}/base/queues.py \
${WRKSRC}/base/services.py \
@@ -202,8 +206,11 @@ pre-configure:
${WRKSRC}/scan.py \
${WRKSRC}/setup.py \
${WRKSRC}/ui4/nodevicesdialog.py \
+ ${WRKSRC}/ui4/printsettingstoolbox.py \
+ ${WRKSRC}/ui5/printsettingstoolbox.py \
${WRKSRC}/ui/devmgr4.py \
${WRKSRC}/ui/nodevicesform.py \
+ ${WRKSRC}/ui/scrollprint.py \
${WRKSRC}/logcapture.py \
${WRKSRC}/createPPD.sh
Index: print/hplip/patches/patch-base_device_py
===
RCS file: print/hplip/patches/patch-base_device_py
diff -N print/hplip/patches/patch-base_device_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-base_device_py28 Sep 2023 05:40:49 -
@@ -0,0 +1,15 @@
+Index: base/device.py
+--- base/device.py.orig
base/device.py
+@@ -2450,9 +2450,9 @@ Content-length: %d\r
+ if remove: rem_str = '-r'
+
+ if is_gzip:
+-c = 'gunzip -c %s | lpr %s %s -P%s' % (file_name,
raw_str, rem_str, printer_name)
++c = 'gunzip -c %s | ${LOCALBASE}/bin/lpr %s %s -P%s' %
(file_name, raw_str, rem_str, printer_name)
+ else:
+-c = 'lpr -P%s %s %s %s' % (printer_name, raw_str,
rem_str, file_name)
++c = '${LOCALBASE}/bin/lpr -P%s %s %s %s' % (printer_name,
raw_str, rem_str, file_name)
+
+ exit_code = os_utils.execute(c)
+
Index: print/hplip/patches/patch-ui4_printsettingstoolbox_py
===
RCS file: print/hplip/patches/patch-ui4_printsettingstoolbox_py
diff -N print/hplip/patches/patch-ui4_printsettingstoolbox_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-ui4_printsettingstoolbox_py 28 Sep 2023
05:40:49 -
@@ -0,0 +1,15 @@
+Index: ui4/printsettingstoolbox.py
+--- ui4/printsettingstoolbox.py.orig
ui4/printsettingstoolbox.py
+@@ -264,9 +264,9 @@ class PrintSettingsToolbox(QToolBox):
+
+ if utils.which('lpr'):
+ if alt_nup:
+-cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| lpr -P', self.cur_printer])
++cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| ${LOCALBASE}/bin/lpr -P', self.cur_printer])
+ else:
+-cmd = ' '.join(['lpr -P', self.cur_printer])
++cmd = ' '.join(['${LOCALBASE}/bin/lpr -P',
self.cur_printer])
+
+ if copies > 1:
+ cmd = ' '.join([cmd, '-#%d' % copies])
Index: print/hplip/patches/patch-ui5_printsettingstoolbox_py
===
RCS file: print/hplip/patches/patch-ui5_printsettingstoolbox_py
diff -N print/hplip/patches/patch-ui5_printsettingstoolbox_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-ui5_printsettingstoolbox_py 28 Sep 2023
05:40:49 -
@@ -0,0 +1,15 @@
+Index: ui5/printsettingstoolbox.py
+--- ui5/printsettingstoolbox.py.orig
ui5/printsettingstoolbox.py
+@@ -247,9 +247,9 @@ class PrintSettingsToolbox(QToolBox):
+
+ if utils.which('lpr'):
+ if alt_nup:
+-cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| lpr -P', self.cur_printer])
++cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| ${LOCALBASE}/bin/lpr -P', self.cur_printer])
+ else:
+-cmd = ' '.join(['lpr -P', self.cur_printer])
++cmd = ' '.j
Re: [print/hplip] Fix printing a test page (lpr path)
On Thu, 28 Sep 2023, Stuart Henderson wrote:
> On 2023/09/28 08:34, David Coppa wrote:
> > ++c = '${TRUEPREFIX}/bin/lpr -P%s %s %s %s' %
> > (printer_name, raw_str, rem_str, file_name)
>
> ${LOCALBASE} (since this is from a different port, not from hplip itself)
>
> or just /usr/local, imho...
You're right. Updated diff:
Index: print/hplip/Makefile
===
RCS file: /cvs/ports/print/hplip/Makefile,v
retrieving revision 1.211
diff -u -p -u -p -r1.211 Makefile
--- print/hplip/Makefile7 Jun 2023 15:45:56 - 1.211
+++ print/hplip/Makefile28 Sep 2023 05:40:49 -
@@ -18,6 +18,9 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
+REVISION-main =0
+REVISION-gui = 0
+
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud2.0 # 0.6
SHARED_LIBS += hpipp0.0 # 0.1
@@ -184,6 +187,7 @@ pre-configure:
${WRKSRC}/ui4/devmgr5.py \
${WRKSRC}/fax/backend/hpfax.py \
${WRKSRC}/base/codes.py \
+ ${WRKSRC}/base/device.py \
${WRKSRC}/base/g.py \
${WRKSRC}/base/queues.py \
${WRKSRC}/base/services.py \
@@ -202,8 +206,11 @@ pre-configure:
${WRKSRC}/scan.py \
${WRKSRC}/setup.py \
${WRKSRC}/ui4/nodevicesdialog.py \
+ ${WRKSRC}/ui4/printsettingstoolbox.py \
+ ${WRKSRC}/ui5/printsettingstoolbox.py \
${WRKSRC}/ui/devmgr4.py \
${WRKSRC}/ui/nodevicesform.py \
+ ${WRKSRC}/ui/scrollprint.py \
${WRKSRC}/logcapture.py \
${WRKSRC}/createPPD.sh
Index: print/hplip/patches/patch-base_device_py
===
RCS file: print/hplip/patches/patch-base_device_py
diff -N print/hplip/patches/patch-base_device_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-base_device_py28 Sep 2023 05:40:49 -
@@ -0,0 +1,15 @@
+Index: base/device.py
+--- base/device.py.orig
base/device.py
+@@ -2450,9 +2450,9 @@ Content-length: %d\r
+ if remove: rem_str = '-r'
+
+ if is_gzip:
+-c = 'gunzip -c %s | lpr %s %s -P%s' % (file_name,
raw_str, rem_str, printer_name)
++c = 'gunzip -c %s | ${LOCALBASE}/bin/lpr %s %s -P%s' %
(file_name, raw_str, rem_str, printer_name)
+ else:
+-c = 'lpr -P%s %s %s %s' % (printer_name, raw_str,
rem_str, file_name)
++c = '${LOCALBASE}/bin/lpr -P%s %s %s %s' % (printer_name,
raw_str, rem_str, file_name)
+
+ exit_code = os_utils.execute(c)
+
Index: print/hplip/patches/patch-ui4_printsettingstoolbox_py
===
RCS file: print/hplip/patches/patch-ui4_printsettingstoolbox_py
diff -N print/hplip/patches/patch-ui4_printsettingstoolbox_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-ui4_printsettingstoolbox_py 28 Sep 2023
05:40:49 -
@@ -0,0 +1,15 @@
+Index: ui4/printsettingstoolbox.py
+--- ui4/printsettingstoolbox.py.orig
ui4/printsettingstoolbox.py
+@@ -264,9 +264,9 @@ class PrintSettingsToolbox(QToolBox):
+
+ if utils.which('lpr'):
+ if alt_nup:
+-cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| lpr -P', self.cur_printer])
++cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| ${LOCALBASE}/bin/lpr -P', self.cur_printer])
+ else:
+-cmd = ' '.join(['lpr -P', self.cur_printer])
++cmd = ' '.join(['${LOCALBASE}/bin/lpr -P',
self.cur_printer])
+
+ if copies > 1:
+ cmd = ' '.join([cmd, '-#%d' % copies])
Index: print/hplip/patches/patch-ui5_printsettingstoolbox_py
===
RCS file: print/hplip/patches/patch-ui5_printsettingstoolbox_py
diff -N print/hplip/patches/patch-ui5_printsettingstoolbox_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-ui5_printsettingstoolbox_py 28 Sep 2023
05:40:49 -
@@ -0,0 +1,15 @@
+Index: ui5/printsettingstoolbox.py
+--- ui5/printsettingstoolbox.py.orig
ui5/printsettingstoolbox.py
+@@ -247,9 +247,9 @@ class PrintSettingsToolbox(QToolBox):
+
+
Re: [print/hplip] Fix printing a test page (lpr path)
On Thu, Sep 28, 2023 at 10:46 AM Antoine Jacoutot wrote: > > But this would prevent printing with regular lpr, no? (honestly I don’t even > know if it’s possible ). It seems that cups is a strict requirement for hplip: https://developers.hp.com/hp-linux-imaging-and-printing/faqs ciao, David
[print/hplip] Fix printing a test page (lpr path)
Hi all,
When trying to print a test page in the final stage of hp-setup,
the following error occurs:
Printing test page to printer ENVY_4520...
lpr: ENVY_4520: unknown printer
error: Print command failed with exit code 256!
This is because /usr/bin/lpr comes before /usr/local/bin/lpr in the
PATH environment variable.
Here's my fix. I don't use the HPLIP GUI, but I applied the same
fix to all occurrences.
Ciao,
David
Index: print/hplip/Makefile
===
RCS file: /cvs/ports/print/hplip/Makefile,v
retrieving revision 1.211
diff -u -p -u -p -r1.211 Makefile
--- print/hplip/Makefile7 Jun 2023 15:45:56 - 1.211
+++ print/hplip/Makefile28 Sep 2023 05:40:49 -
@@ -18,6 +18,9 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
+REVISION-main =0
+REVISION-gui = 0
+
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud2.0 # 0.6
SHARED_LIBS += hpipp0.0 # 0.1
@@ -184,6 +187,7 @@ pre-configure:
${WRKSRC}/ui4/devmgr5.py \
${WRKSRC}/fax/backend/hpfax.py \
${WRKSRC}/base/codes.py \
+ ${WRKSRC}/base/device.py \
${WRKSRC}/base/g.py \
${WRKSRC}/base/queues.py \
${WRKSRC}/base/services.py \
@@ -202,8 +206,11 @@ pre-configure:
${WRKSRC}/scan.py \
${WRKSRC}/setup.py \
${WRKSRC}/ui4/nodevicesdialog.py \
+ ${WRKSRC}/ui4/printsettingstoolbox.py \
+ ${WRKSRC}/ui5/printsettingstoolbox.py \
${WRKSRC}/ui/devmgr4.py \
${WRKSRC}/ui/nodevicesform.py \
+ ${WRKSRC}/ui/scrollprint.py \
${WRKSRC}/logcapture.py \
${WRKSRC}/createPPD.sh
Index: print/hplip/patches/patch-base_device_py
===
RCS file: print/hplip/patches/patch-base_device_py
diff -N print/hplip/patches/patch-base_device_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-base_device_py28 Sep 2023 05:40:49 -
@@ -0,0 +1,15 @@
+Index: base/device.py
+--- base/device.py.orig
base/device.py
+@@ -2450,9 +2450,9 @@ Content-length: %d\r
+ if remove: rem_str = '-r'
+
+ if is_gzip:
+-c = 'gunzip -c %s | lpr %s %s -P%s' % (file_name,
raw_str, rem_str, printer_name)
++c = 'gunzip -c %s | ${TRUEPREFIX}/bin/lpr %s %s -P%s' %
(file_name, raw_str, rem_str, printer_name)
+ else:
+-c = 'lpr -P%s %s %s %s' % (printer_name, raw_str,
rem_str, file_name)
++c = '${TRUEPREFIX}/bin/lpr -P%s %s %s %s' %
(printer_name, raw_str, rem_str, file_name)
+
+ exit_code = os_utils.execute(c)
+
Index: print/hplip/patches/patch-ui4_printsettingstoolbox_py
===
RCS file: print/hplip/patches/patch-ui4_printsettingstoolbox_py
diff -N print/hplip/patches/patch-ui4_printsettingstoolbox_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-ui4_printsettingstoolbox_py 28 Sep 2023
05:40:49 -
@@ -0,0 +1,15 @@
+Index: ui4/printsettingstoolbox.py
+--- ui4/printsettingstoolbox.py.orig
ui4/printsettingstoolbox.py
+@@ -264,9 +264,9 @@ class PrintSettingsToolbox(QToolBox):
+
+ if utils.which('lpr'):
+ if alt_nup:
+-cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| lpr -P', self.cur_printer])
++cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| ${TRUEPREFIX}/bin/lpr -P', self.cur_printer])
+ else:
+-cmd = ' '.join(['lpr -P', self.cur_printer])
++cmd = ' '.join(['${TRUEPREFIX}/bin/lpr -P',
self.cur_printer])
+
+ if copies > 1:
+ cmd = ' '.join([cmd, '-#%d' % copies])
Index: print/hplip/patches/patch-ui5_printsettingstoolbox_py
===
RCS file: print/hplip/patches/patch-ui5_printsettingstoolbox_py
diff -N print/hplip/patches/patch-ui5_printsettingstoolbox_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/hplip/patches/patch-ui5_printsettingstoolbox_py 28 Sep 2023
05:40:49 -
@@ -0,0 +1,15 @@
+Index: ui5/printsettingstoolbox.py
+--- ui5/printsettingstoolbox.py.orig
ui5/printsettingstoolbox.py
+@@ -247,9 +247,9 @@ class PrintSettingsToolbox(QToolBox):
+
+ if utils.which('lpr'):
+ if alt_nup:
+-cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"']), '| lpr -P', self.cur_printer])
++cmd = ' '.join(['psnup', '-%d' % nup, ''.join(['"', p,
'"'
Re: chromium disk write directories
Il Mer 4 Mag 2022, 22:57 Mihai Popescu ha scritto: https://wiki.archlinux.org/title/chromium#Tmpfs Ciao, David
Re: ncspot/portaudio: Stream drop error: PortAudio not initialized
On Thu, Feb 3, 2022 at 4:46 PM Matthias Schmidt wrote: > > Hi Klemens, > > * Klemens Nanni wrote: > > Playing music in ncspot reliably stops after some time with > > "Stream drop error: PortAudio not initialized". > > > > Not sure when this started to happen, but I remember times when there was no > > such issue and I could listen for hours without error. Now audio usually > > stops after a few tracks. > > > > I'm running ncspot 0.9.5 on an X230 with internal audio, no sndiod flags or > > fancy audio devices. > > > > Once this error occurs, I can just start playing again and ncspot recovers > > without restart. > > > > Has anyone else experienced this? Any advice on where to start with this? > > I know this error, however, here (T450s, -current) it occurs very > seldom and usually after a suspend resume cycle. ncspot also doesn't crash > here. I restart the song and fix the garbled screen display with > Ctrl+l. > > Cheers > > Matthias > Probably this error is happening since the portaudio-rs dependency has been updated from 0.3.1 to 0.3.2. It was on Tue Jun 2 2020: could it be possible? Ciao, David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
Re: devel/boost broken by libc++ update
On Tue, Feb 5, 2019 at 12:21 AM Christian Weisgerber wrote: > > It looks like the libc++ 7.0.1 update on our clang archs has broken > devel/boost: > > In file included from libs/log/src/syslog_backend.cpp:29: > In file included from ./boost/asio/buffer.hpp:27: > In file included from ./boost/asio/detail/string_view.hpp:23: > /usr/include/c++/v1/experimental/string_view:11:2: error: > " has been removed. Use instead." > #error " has been removed. Use > instead." > ^ Hi, Already fixed upstream: https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb Ciao! David
Re: unable to use audio/vagalume
Il giorno ven 21 dic 2018, 10:29 Solene Rapenne ha scritto: > when starting vagalum, the gtk window appear but also pop an error "error > while > initialize audio system" and the console output reports "** > (vagalume:25148): > CRITICAL **: 10:17:42.301: Error creating GStreamer elements" > > $HOMEPAGE doesn't exist anymore and version 0.8.2 is from 2010 > > does someone know how to fix this? > Quoting from wikipedia (https://en.m.wikipedia.org/wiki/Last.fm): <> So I think vagalume can be safely removed from the tree. Ciao, David
Re: math/R: libreadline.so.4.0: undefined symbol 'tgetent'
Il giorno mar 6 nov 2018, 20:58 Ingo Feinerer ha scritto: > Hi, > > math/R now gets killed at start-up with: > > R:/usr/lib/libreadline.so.4.0: undefined symbol 'tgetent' > ld.so: R: lazy binding failed! > Killed > > I noticed there was some readline restructuring/discussion in the last > weeks but do not know about the current status or best practice now. > > So if someone immediately notices what is going on here I appreciate all > pointers or patches. > Probably a missing "-ltermcap"?
Re: Qt5Webkit -> USE_WXNEEDED
On Thu, Aug 2, 2018 at 11:38 AM, Stuart Henderson wrote: > On 2018/08/02 07:17, Rafael Sadowski wrote: >> If no concerns I would like to commit the patch. > > I'm a bit confused about this because: > > 1. we have a patch described as "Enable W^X in QtWebkit's JIT" > in x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_jsc_pro > > 2. these programs (at least the ones I tested, which isn't all of > them) already work - I see they are somehow getting the OPENBSD_WXNEEDED > section added despite not having USE_WXNEEDED > > Any idea what's going on? cmake "automagically" adds "-Wl,-z,wxneeded", see devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx Ciao! David
Re: update net/amule clang6 fix
On Wed, Apr 11, 2018 at 4:52 PM, David CARLIER wrote: > Hi, > > Here a small fix for amule. > > Regards. Ok with me. Thanks, David
Re: clang 6 fix devel/jdk/1.8
On Wed, Apr 11, 2018 at 12:21 PM, Stuart Henderson wrote: > On 2018/04/11 10:02, David Coppa wrote: >> Hi, >> >> Does it work at runtime? >> > > It doesn't work for me. Here's a backtrace from a standard build, I'll try > again and see if I can get it with symbols. > > (gdb) bt > #0 0x08908ee471c6 in NativeCallStack::NativeCallStack () >from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so > #1 0x08908ee0268e in MemTracker::init_tracking_level () from > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so > #2 0x08908e912880 in ResourceObj::operator new () from > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so > #3 0x08908eee12fb in _GLOBAL__sub_I_reflectionUtils.cpp () >from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so > #4 0x08908e8401c3 in pthread_atfork () from > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so > #5 0x08908e83f359 in _init () from > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so > #6 0x7f7f6120 in ?? () > #7 0x0890a7a0bc94 in _dl_call_init_recurse (object=0x890c178c800, > initfirst=0) > at /usr/src/libexec/ld.so/loader.c:722 > #8 0x0890a7a02b50 in dlopen (libname=0x7f7f6a30 > "/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so", > flags=Variable "flags" is not available. > ) at /usr/src/libexec/ld.so/dlfcn.c:126 > #9 0x088dcb805eef in LoadJavaVM () from /usr/local/jdk-1.8.0/bin/java > #10 0x088dcb8016b2 in JLI_Launch () from /usr/local/jdk-1.8.0/bin/java > #11 0x088dcb8084cd in main () from /usr/local/jdk-1.8.0/bin/java > Ok, so we also need this patch from FreeBSD: https://svnweb.freebsd.org/ports/head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp?view=markup https://svnweb.freebsd.org/ports/head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp?revision=459368&view=co Ciao! David
Re: clang 6 fix devel/jdk/1.8
On Wed, Apr 11, 2018 at 4:23 AM, Matthew Martin wrote: > Add lots of whitespace and change a few types from signed to unsigned. > Probably should get a REVISION bump, but I'm not sure where that goes > for subpackages. > > Is anyone already an OpenJDK contributor or know someone upstream with > whom I could work? Hi, Does it work at runtime?
Re: UPDATE: devel/cmake
On Sat, 10 Feb 2018, Rafael Sadowski wrote:
> Here's the update to CMake-3.10.2.
>
> It certainly needs a bulk to find eventual failures in dependant ports.
> Please build and run it with jsoncpp 1.8.4 (extra mail),
>
> Feedback welcome.
Hi Rafael,
Please don't remove stuff that it's there on purpose.
The wxneeded bits into patch-Source_cmComputeLinkInformation_cxx
for example... By removing them you will break (at runtime)
www/otter-browser and mail/trojita, among others.
Another minor nit: '--system-jsoncpp' is not needed, you already
have '--system-libs' some lines below.
Remaining parts are all good: 100% tests passed, 0 tests failed out
of 427
Here's my revised diff:
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.165
diff -u -p -u -p -r1.165 Makefile
--- Makefile22 Sep 2017 13:42:54 - 1.165
+++ Makefile10 Feb 2018 15:53:08 -
@@ -4,7 +4,7 @@ DPB_PROPERTIES =parallel
COMMENT = portable build system
-VER = 3.9.3
+VER = 3.10.2
DISTNAME = cmake-${VER}
CATEGORIES = devel
@@ -17,8 +17,8 @@ MASTER_SITES =${HOMEPAGE}files/v${VER:R
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += archive c curl expat form jsoncpp m ncurses pthread
-WANTLIB += rhash ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} archive c curl curses expat form
+WANTLIB += jsoncpp m rhash uv z
# XXX: Ninja is broken on m88k
.if ${MACHINE_ARCH} != "m88k"
@@ -28,6 +28,7 @@ BUILD_DEPENDS = devel/ninja>=1.5.1
BUILD_DEPENDS += textproc/py-sphinx>=1.4
LIB_DEPENDS = archivers/libarchive \
+ devel/libuv \
devel/jsoncpp \
net/curl \
security/rhash
@@ -38,7 +39,6 @@ CONFIGURE_ARGS = --prefix=${PREFIX} \
--docdir=share/doc/cmake \
--mandir=man \
--no-qt-gui \
- --no-server \
--parallel=${MAKE_JOBS} \
--sphinx-build=${LOCALBASE}/bin/sphinx-build \
--sphinx-html \
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 distinfo
--- distinfo22 Sep 2017 13:42:54 - 1.50
+++ distinfo10 Feb 2018 15:53:08 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.9.3.tar.gz) = jq914ekyFZqumKtedJFJlUVVS+YqCMvLx8dchLmZ8oo=
-SIZE (cmake-3.9.3.tar.gz) = 7705238
+SHA256 (cmake-3.10.2.tar.gz) = gND6rUq1beB6ohp/xpLIjEzmFW1CsFecaWIASnCjIYs=
+SIZE (cmake-3.10.2.tar.gz) = 7824452
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt26 Aug 2017 17:53:35 - 1.23
+++ patches/patch-CMakeLists_txt10 Feb 2018 15:53:08 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.23 20
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -305,6 +305,15 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -317,6 +317,15 @@ macro (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward
"${kwsys_folder}")
endif()
@@ -18,7 +18,7 @@ Index: CMakeLists.txt
#-
# Setup third-party libraries.
# Everything in the tree should be able to include files from the
-@@ -342,7 +351,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -350,7 +359,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
endif()
@@ -28,7 +28,7 @@ Index: CMakeLists.txt
else()
set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
add_subdirectory(Utilities/cmlibrhash)
-@@ -512,7 +522,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -516,7 +526,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
endif()
@@ -38,22 +38,13 @@ Index: CMakeLists.txt
else()
set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
add_subdirectory(Utilities/cmjsoncpp)
-@@ -522,7 +533,7 @@ macro (CMAKE_BUILD_UTILITIES)
- #-
- # Build libuv library.
- if(NOT DEFINED CMAKE_USE_LIBUV)
--set(CMAKE_USE_LIBUV 1)
-+set(CMAKE_USE_LIBUV 0)
- if(APPLE)
- include(CheckCSourceCompiles)
- check_c_source_compiles("
-@@ -552,7 +563,8 @@ int main(void) { return 0; }
- message(FATAL_ERROR
- "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
- endif()
-- set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV)
-+ set(CMAKE_LIBUV_INCLUDES ${LibUV_INCLU
Re: UPDATE: devel/boost
Il 28 gen 2018 16:32, "Landry Breuil" ha scritto:
On Sun, Jan 28, 2018 at 11:29:35AM +0100, Landry Breuil wrote:
> On Fri, Jan 26, 2018 at 02:38:34PM +0100, Rafael Sadowski wrote:
> > Hi All!
> >
> > This time easier than last time and a relative easy update to the
> > current boost.
> >
> > Changelog: http://www.boost.org/users/history/version_1_66_0.html
> >
> > I did not build all consumers. Bulk feedback wanted.
>
> Seen the same kea failure. So far (more or less halfway through the
> bulk), games/pokerth also failed:
>
> ../src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp:422:45:
error: use of class template 'boost::asio::strand' requires template
arguments
> m_strand.reset(new boost::asio::strand(*io_service));
>
> Which seems like the kea failure. FreeBSD also saw it (cf
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224123) and fixed
> it with patches from upstream (cf https://github.com/pokerth/
pokerth/issues/338)
audio/mumble also fails but with a different error:
AudioOutput.cpp:434:23: fatal error: expected '(' for function-style cast
or type construction
if (std::abs(front[0] * top[0] +
front[1] * top[1] + front[2] * top[2]) > 0.01f) {
~^
190 warnings and 1 error generated.
This too has been fixed upstream:
https://github.com/mumble-voip/mumble/commit/ea861fe86743c8402bbad77d8d1dd9de8dce447e
Cheers,
David
Re: [David Coppa] Re: UPDATE: devel/boost
I only tested a few deps on sparc64 so far. devel/dlib and games/bastet* succeed, but net/kea** seems to suffer: It's also upstream: https://github.com/isc-projects/kea/commit/17ed090beb6cefa78e29a95c645eb6da4edf8028
Re: UPDATE: devel/boost
Il 27 gen 2018 3:56 PM, "Jeremie Courreges-Anglas" ha scritto: On Fri, Jan 26 2018, Rafael Sadowski wrote: > Hi All! Hey, > This time easier than last time and a relative easy update to the > current boost. > > Changelog: http://www.boost.org/users/history/version_1_66_0.html > > I did not build all consumers. Bulk feedback wanted. I only tested a few deps on sparc64 so far. devel/dlib and games/bastet* succeed, but net/kea** seems to suffer: [...] c++ --std=c++11 -DHAVE_CONFIG_H -I. -I../../.. -I../../../src/lib -I../../../src/lib -I/usr/local/include -DOS_BSD -I../../../ext/coroutine -DBOOST_ASIO_HEADER_ONLY -DBOOST_ASIO_DISABLE_THREADS=1 -Wall -Wextra -Wnon-virtual-dtor -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare -pthread -Wno-missing-field-initializers -fPIC -O2 -pipe -MT libkea_asiolink_la-io_socket.lo -MD -MP -MF .deps/libkea_asiolink_la-io_socket.Tpo -c io_socket.cc -fPIC -DPIC -o .libs/libkea_asiolink_la-io_socket.o In file included from io_service.cc:9:0: ../../../src/lib/asiolink/io_service.h:14:11: error: using typedef-name 'boost::asio::io_service' after 'class' class io_service; ^ In file included from /usr/local/include/boost/asio.hpp:69:0, from ../../../src/lib/asiolink/asio_wrapper.h:67, from io_service.cc:8: /usr/local/include/boost/asio/io_service.hpp:27:20: note: 'boost::asio::io_service' has a previous declaration here typedef io_context io_service; ^ In file included from ../../../src/lib/asiolink/interval_timer.h:13:0, from interval_timer.cc:9: ../../../src/lib/asiolink/io_service.h:14:11: error: using typedef-name 'boost::asio::io_service' after 'class' class io_service; ^ In file included from /usr/local/include/boost/asio.hpp:69:0, from ../../../src/lib/asiolink/asio_wrapper.h:67, from interval_timer.cc:8: /usr/local/include/boost/asio/io_service.hpp:27:20: note: 'boost::asio::io_service' has a previous declaration here typedef io_context io_service; ^ Error while executing c++ --std=c++11 -DHAVE_CONFIG_H -I. -I../../.. -I../../../src/lib -I../../../src/lib -I/usr/local/include -DOS_BSD -I../../../ext/coroutine -DBOOST_ASIO_HEADER_ONLY -DBOOST_ASIO_DISABLE_THREADS=1 -Wall -Wextra -Wnon-virtual-dtor -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare -pthread -Wno-missing-field-initializers -fPIC -O2 -pipe -MT libkea_asiolink_la-io_service.lo -MD -MP -MF .deps/libkea_asiolink_la-io_service.Tpo -c io_service.cc -fPIC -DPIC -o .libs/libkea_asiolink_la-io_service.o *** Error 2 in target 'libkea_asiolink_la-io_service.lo' Error while executing c++ --std=c++11 -DHAVE_CONFIG_H -I. -I../../.. -I../../../src/lib -I../../../src/lib -I/usr/local/include -DOS_BSD -I../../../ext/coroutine -DBOOST_ASIO_HEADER_ONLY -DBOOST_ASIO_DISABLE_THREADS=1 -Wall -Wextra -Wnon-virtual-dtor -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare -pthread -Wno-missing-field-initializers -fPIC -O2 -pipe -MT libkea_asiolink_la-interval_timer.lo -MD -MP -MF .deps/libkea_asiolink_la-interval_timer.Tpo -c interval_timer.cc -fPIC -DPIC -o .libs/libkea_asiolink_la- interval_timer.o *** Error 1 in target 'libkea_asiolink_la-interval_timer.lo' mv -f .deps/libkea_asiolink_la-io_socket.Tpo .deps/libkea_asiolink_la-io_ socket.Plo mv -f .deps/libkea_asiolink_la-io_endpoint.Tpo .deps/libkea_asiolink_la-io_ endpoint.Plo *** Error 1 in src/lib/asiolink (Makefile:601 'libkea_asiolink_la-interval_ timer.lo') *** Error 2 (Makefile:622 'libkea_asiolink_la-io_service.lo') *** Error 1 in src/lib/asiolink (Makefile:701 'all-recursive') *** Error 1 in src/lib (Makefile:431 'all-recursive') *** Error 1 in src (Makefile:432 'all-recursive') *** Error 1 in . (Makefile:600 'all-recursive') *** Error 2 in /usr/ports/pobj/kea-1.2.0/kea-1.2.0 (Makefile:441 'all') *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2742 '/usr/ports/pobj/kea-1.2.0/.build_done') *** Error 1 in /usr/ports/net/kea (/usr/ports/infrastructure/mk/ bsd.port.mk:2419 'all') https://git.archlinux.org/svntogit/community.git/plain/trunk/asiolink-fix-build-with-boost-1.66.patch?h=packages/kea Ciao, David
Re: fix i3 horizontal split
Il 08 nov 2017 6:41 PM, "Daniel Jakots" ha scritto:
Hi David (and ports@),
Since 4.14.1, $mod+e is broken. It has been reported upstream multiple
times:
https://github.com/i3/i3/issues/2846
https://github.com/i3/i3/issues/3026
I tried to backport the first chunk (see the patch inline) but it was
not enough, with the second chunk now it woks as before.
Comments? OK?
Sure, it's from upstream.
Ok with me
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile
--- Makefile21 Oct 2017 19:22:04 - 1.110
+++ Makefile8 Nov 2017 17:39:45 -
@@ -3,7 +3,7 @@
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.14.1
-REVISION = 0
+REVISION = 1
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
Index: patches/patch-src_con_c
===
RCS file: patches/patch-src_con_c
diff -N patches/patch-src_con_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_con_c 8 Nov 2017 17:39:45 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+backport https://github.com/i3/i3/pull/2849/commits/
c028f0cb173ebc4c7033c758c7f942adfbc224af
+an https://github.com/i3/i3/pull/2849/commits/
26014ca1a22c1b862c782f4dfa3d40a5ab629627
+
+Index: src/con.c
+--- src/con.c.orig
src/con.c
+@@ -1735,7 +1756,7 @@ void con_set_layout(Con *con, layout_t layout) {
+ con->workspace_layout = ws_layout;
+ DLOG("Setting layout to %d\n", layout);
+ con->layout = layout;
+-} else if (layout == L_STACKED || layout == L_TABBED) {
++} else if (layout == L_STACKED || layout == L_TABBED || layout ==
L_SPLITV || layout == L_SPLITH) {
+ DLOG("Creating new split container\n");
+ /* 1: create a new split container */
+ Con *new = con_new(NULL, NULL);
+@@ -1827,6 +1848,10 @@ void con_toggle_layout(Con *con, const char
*toggle_mo
+ * change to the opposite split layout. */
+ if (parent->layout != L_SPLITH && parent->layout !=
L_SPLITV) {
+ layout = parent->last_split_layout;
++/* In case last_split_layout was not initialized… */
++if (layout == L_DEFAULT) {
++layout = L_SPLITH;
++}
+ } else {
+ layout = (parent->layout == L_SPLITH) ? L_SPLITV :
L_SPLITH;
+ }
Re: linking error when compiling zdoom
On Mon, Oct 2, 2017 at 8:17 AM, Timo Myyrä wrote: > Hi, > > I'm trying to make port of zdoom but I can't get it to link. > > The error I got was: > CMakeFiles/zdoom.dir/scripting/vm/vmexec.cpp.o: In function > `__cxx_global_var_init': > /home/tmy/tmp/gzdoom-g3.1.0/src/scripting/vm/vmexec.cpp:(.text+0x42): > undefined reference to `__cxa_thread_atexit' > c++: error: linker command failed with exit code 1 (use -v to see invocation) > *** Error 1 in . (src/CMakeFiles/zdoom.dir/build.make:10917 'gzdoom') > > I got a bit of help in this and added following to Makefile: > CONFIGURE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS="-lc++abi" > > That changed the above linking error to: > usr/bin/../lib/libc++abi.so.0.0: undefined reference to > `pthread_rwlock_rdlock' > /usr/bin/../lib/libc++abi.so.0.0: undefined reference to > `pthread_rwlock_unlock' > /usr/bin/../lib/libc++abi.so.0.0: undefined reference to > `pthread_rwlock_wrlock' > > > I tried to change CONFIGURE_ARGS as follows: > CONFIGURE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS="-lpthread -lc++abi" > > After compiling the linking failed with "undefined reference to > `__cxa_thread_atexit'" which seems odd as it should be in the c++abi library. > > Any idea whats going on? Unfortunately, our libc lacks __cxa_thread_atexit(). It is required for C++ TLS, for registering cleanups to be run when a thread exits. Mark Kettenis posted a diff on tech@ some time ago[1] but, afaik, it has not yet been committed. [1] https://marc.info/?l=openbsd-tech&m=150246192013629 Ciao! David
Re: [security] graphics/libraw
On Thu, Sep 28, 2017 at 10:18 PM, Rafael Sadowski wrote: > This is bugfix release, changes are (compared to 0.18.2): > > - Fix for possible buffer overrun in kodak_65000 decoder > - Fix for possible heap overrun in Canon makernotes parser > - Fix for CVE-2017-13735 CVE-2017-14265: Additional check for X-Trans > CFA pattern data > > -- https://www.libraw.org/news/libraw-0-18-5 > > No shared libs changes detected by nm(1). I'd like to take the > maintainership. > > Best regards, > > Rafael Sadowksi ok dcoppa@ But please, since we're approaching the lock, also wait for an ok from naddy@ or sthen@ ... Ciao! David
Re: fix cantor
On Thu, 28 Sep 2017, Jeremie Courreges-Anglas wrote:
> +cc maintainer
CCing Vadim too...
> On Thu, Sep 28 2017, David Coppa wrote:
> > On Wed, 27 Sep 2017, Christian Weisgerber wrote:
> >
> >> Jeremie Courreges-Anglas:
> >>
> >> > > * Mark as BROKEN the remaining ports that have failed to build since
> >> > > the clang switch on amd64/i386.
> >> >
> >> > Should probably use NOT_FOR_ARCHS = ${CLANG_ARCHS}.
> >>
> >> >
> >> > http://exopi.exo.bsdfrog.org/logs/old/amd64/2017-09-26T21:25:35+0200/paths/x11/kde4/cantor.log
> >>
> >> No. cantor only fails sometimes. Something in the build environment
> >> causes -I/usr/local/include to be lost.
> >
> > The diff below (from upstream) should fix the thing.
> >
> > I did five, six test builds without problems, but who knows...
> >
> > BTW, it's a more elegant solution and I'd like to have it in
> > nonetheless.
>
> It looks better indeed, and you seem to have performed sufficient
> testing. This should probably be committed for 6.2.
>
> > Ciao!
> > David
Index: Makefile
===
RCS file: /cvs/ports/x11/kde4/cantor/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile27 Jul 2017 11:57:48 - 1.17
+++ Makefile28 Sep 2017 17:28:22 -
@@ -2,7 +2,7 @@
COMMENT = KDE mathematical applications
DISTNAME = cantor-${MODKDE4_VERSION}
-REVISION = 7
+REVISION = 8
# Bogus message about "backend /usr/local/bin/latex" at startup when no
# backend is choosen on the command line.
Index: patches/patch-cmake_FindLuaJIT_cmake
===
RCS file: /cvs/ports/x11/kde4/cantor/patches/patch-cmake_FindLuaJIT_cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-cmake_FindLuaJIT_cmake
--- patches/patch-cmake_FindLuaJIT_cmake6 Aug 2017 20:04:16 -
1.1
+++ patches/patch-cmake_FindLuaJIT_cmake28 Sep 2017 17:28:22 -
@@ -1,23 +1,40 @@
$OpenBSD: patch-cmake_FindLuaJIT_cmake,v 1.1 2017/08/06 20:04:16 zhuk Exp $
-The luajit headers are included using idiom,
-so use the same for LUAJIT_INCLUDE_DIR.
-Tweak DIR vs. DIRS while there.
+
+commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
+Author: Vadim A. Misbakh-Soloviov
+Date: Wed, 15 Feb 2017 15:21:47 -0300
+
+Fix the hardcoded include for lua backend
+
+Currently Cantor has a hardcoded include to get lua.hpp library.
+This patch fix the search to include different versions of lua
+library. The hardcoded solution is no more necessary.
Index: cmake/FindLuaJIT.cmake
--- cmake/FindLuaJIT.cmake.orig
+++ cmake/FindLuaJIT.cmake
-@@ -1,12 +1,12 @@
- SET (LuaJIT_FOUND FALSE)
- SET (LUAJIT_LIBRARY_NAME luajit-5.1)
+@@ -1,14 +1,13 @@
+-SET (LuaJIT_FOUND FALSE)
+-SET (LUAJIT_LIBRARY_NAME luajit-5.1)
-SET (LUAJIT_INCLUDE_DIRS /usr/include/luajit-2.0
/usr/local/include/luajit-2.0)
++find_package(PkgConfig)
-FIND_PATH(LUAJIT_INCLUDE_DIR lua.h ${LUAJIT_INCLUDE_DIRS} )
-+FIND_PATH(LUAJIT_INCLUDE_DIR luajit-2.0/lua.h)
- FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS
${CMAKE_LIBRARY_PATH})
+-FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS
${CMAKE_LIBRARY_PATH})
++pkg_check_modules(LUAJIT QUIET luajit)
- IF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
- SET (LuaJIT_FOUND TRUE)
-+SET (LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
- ENDIF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
+-IF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
+-SET (LuaJIT_FOUND TRUE)
+-ENDIF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
++find_path(LUAJIT_INCLUDE_DIR lua.hpp HINTS ${LUAJIT_INCLUDEDIR}
${LUAJIT_INCLUDE_DIRS})
++find_library(LUAJIT_LIBRARY NAMES luajit-5.1 luajit HINTS ${LUAJIT_LIBDIR}
${LUAJIT_LIBRARY_DIRS})
- INCLUDE(FindPackageHandleStandardArgs)
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY
LUAJIT_INCLUDE_DIR)
+-MARK_AS_ADVANCED ( LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
++set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
++set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY
LUAJIT_INCLUDE_DIR)
++mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
Index: patches/patch-src_backends_lua_luaexpression_cpp
===
RCS file: patches/patch-src_backends_lua_luaexpression_cpp
diff -N patches/patch-src_backends_lua_luaexpression_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_backends_lua_luaexpression_cpp28 Sep 2017 17:28:22
-
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
+Author: Vadim A.
fix cantor (was: ports broken on clang archs)
On Wed, 27 Sep 2017, Christian Weisgerber wrote:
> Jeremie Courreges-Anglas:
>
> > > * Mark as BROKEN the remaining ports that have failed to build since
> > > the clang switch on amd64/i386.
> >
> > Should probably use NOT_FOR_ARCHS = ${CLANG_ARCHS}.
>
> >
> > http://exopi.exo.bsdfrog.org/logs/old/amd64/2017-09-26T21:25:35+0200/paths/x11/kde4/cantor.log
>
> No. cantor only fails sometimes. Something in the build environment
> causes -I/usr/local/include to be lost.
The diff below (from upstream) should fix the thing.
I did five, six test builds without problems, but who knows...
BTW, it's a more elegant solution and I'd like to have it in
nonetheless.
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/x11/kde4/cantor/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile27 Jul 2017 11:57:48 - 1.17
+++ Makefile28 Sep 2017 11:11:50 -
@@ -2,7 +2,7 @@
COMMENT = KDE mathematical applications
DISTNAME = cantor-${MODKDE4_VERSION}
-REVISION = 7
+REVISION = 8
# Bogus message about "backend /usr/local/bin/latex" at startup when no
# backend is choosen on the command line.
Index: patches/patch-cmake_FindLuaJIT_cmake
===
RCS file: /cvs/ports/x11/kde4/cantor/patches/patch-cmake_FindLuaJIT_cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-cmake_FindLuaJIT_cmake
--- patches/patch-cmake_FindLuaJIT_cmake6 Aug 2017 20:04:16 -
1.1
+++ patches/patch-cmake_FindLuaJIT_cmake28 Sep 2017 11:11:50 -
@@ -1,23 +1,40 @@
$OpenBSD: patch-cmake_FindLuaJIT_cmake,v 1.1 2017/08/06 20:04:16 zhuk Exp $
-The luajit headers are included using idiom,
-so use the same for LUAJIT_INCLUDE_DIR.
-Tweak DIR vs. DIRS while there.
+
+commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
+Author: Vadim A. Misbakh-Soloviov
+Date: Wed, 15 Feb 2017 15:21:47 -0300
+
+Fix the hardcoded include for lua backend
+
+Currently Cantor has a hardcoded include to get lua.hpp library.
+This patch fix the search to include different versions of lua
+library. The hardcoded solution is no more necessary.
Index: cmake/FindLuaJIT.cmake
--- cmake/FindLuaJIT.cmake.orig
+++ cmake/FindLuaJIT.cmake
-@@ -1,12 +1,12 @@
- SET (LuaJIT_FOUND FALSE)
- SET (LUAJIT_LIBRARY_NAME luajit-5.1)
+@@ -1,14 +1,13 @@
+-SET (LuaJIT_FOUND FALSE)
+-SET (LUAJIT_LIBRARY_NAME luajit-5.1)
-SET (LUAJIT_INCLUDE_DIRS /usr/include/luajit-2.0
/usr/local/include/luajit-2.0)
++find_package(PkgConfig)
-FIND_PATH(LUAJIT_INCLUDE_DIR lua.h ${LUAJIT_INCLUDE_DIRS} )
-+FIND_PATH(LUAJIT_INCLUDE_DIR luajit-2.0/lua.h)
- FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS
${CMAKE_LIBRARY_PATH})
+-FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS
${CMAKE_LIBRARY_PATH})
++pkg_check_modules(LUAJIT QUIET luajit)
- IF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
- SET (LuaJIT_FOUND TRUE)
-+SET (LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
- ENDIF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
+-IF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
+-SET (LuaJIT_FOUND TRUE)
+-ENDIF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
++find_path(LUAJIT_INCLUDE_DIR lua.hpp HINTS ${LUAJIT_INCLUDEDIR}
${LUAJIT_INCLUDE_DIRS})
++find_library(LUAJIT_LIBRARY NAMES luajit-5.1 luajit HINTS ${LUAJIT_LIBDIR}
${LUAJIT_LIBRARY_DIRS})
- INCLUDE(FindPackageHandleStandardArgs)
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY
LUAJIT_INCLUDE_DIR)
+-MARK_AS_ADVANCED ( LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
++set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
++set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY
LUAJIT_INCLUDE_DIR)
++mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
Index: patches/patch-src_backends_lua_luaexpression_cpp
===
RCS file: patches/patch-src_backends_lua_luaexpression_cpp
diff -N patches/patch-src_backends_lua_luaexpression_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_backends_lua_luaexpression_cpp28 Sep 2017 11:11:50
-
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
+Author: Vadim A. Misbakh-Soloviov
+Date: Wed, 15 Feb 2017 15:21:47 -0300
+
+Fix the hardcoded include for lua backend
+
+Currently Cantor has a hardcoded include to get lua.hpp library.
+This patch fix the search to include different versions of lua
+library. The hardcoded solution is no more necessary.
+
+Index: src/backends/lua/luaexpression.cpp
+--- src/backends/lua/luaexpression.cpp.orig
src/backends/lua/luaexpression.cpp
+@@ -26,7 +26,7 @@
+ #include "imageresult.h"
+ #include "helpresult.h"
+
+-#include // need the luajit-2.0 prefix to avoid
conflicts with Lua 5.2
++#in
Re: [update] audacious-3.9
On Wed, Sep 6, 2017 at 1:57 PM, Timo Myyrä wrote: > Ok, got it. Here's updated diff which restores the package back. Reviewed and tested (this and audacious-plugins). audacious 3.9 works fine, tested basic functionalities and the like. I'd like to commit them if nobody objects, they have no dependant ports... Ciao! David
Re: ncmpcpp core dumps on amd64
Il 05 set 2017 20:50, "Ingo Schwarze" ha scritto: Hi, David Coppa wrote on Tue, Sep 05, 2017 at 04:54:24PM +0200: > On Tue, Sep 5, 2017 at 4:41 PM, Marc Peters wrote: >> running Sundays snapshot and just reinstalled ncmpcpp and dependencies >> with "pkg_add -D installed -u ncmpcpp" ncmpcpp core dumps: >> >> $ ncmpcpp >> terminating with uncaught exception of type std::runtime_error: >> ctype_byname::ctype_byname failed to construct for C >> Abort trap (core dumped) >> >> CC'ing the maintainer. >> >> Does anyone know what the exception means and how to solve it? > Ingo's POSIX xlocale implementation > (https://marc.info/?l=openbsd-cvs&m=150458138122317) should fix it. > > I'm about to rebuild ncmpcpp and all its dependencies to check if it > is true, but I'm pretty confident... To make sure that i did not break this, i just did that as well on amd64-current: i rebuilt ncmpcpp with all its dependencies, and i can no longer reproduce the crash. So it should be good when the next complete package snapshot arrives on your mirror. (My system is still slightly Frankenstein'ed because i have various ports installed that were built against a libc with my xlocale patch but without guenther@'s pthread patch. Those no longer work, but i no longer have anything of that kind in what affects ncmpcpp.) Confirmed. ncmpcpp works without problems now. Ciao! David
Re: ncmpcpp core dumps on amd64
On Tue, Sep 5, 2017 at 4:41 PM, Marc Peters wrote: > Hi List, > > running Sundays snapshot and just reinstalled ncmpcpp and dependencies > with "pkg_add -D installed -u ncmpcpp" ncmpcpp core dumps: > > $ ncmpcpp > terminating with uncaught exception of type std::runtime_error: > ctype_byname::ctype_byname failed to construct for C > Abort trap (core dumped) > > CC'ing the maintainer. > > Does anyone know what the exception means and how to solve it? Ingo's POSIX xlocale implementation (https://marc.info/?l=openbsd-cvs&m=150458138122317) should fix it. I'm about to rebuild ncmpcpp and all its dependencies to check if it is true, but I'm pretty confident... > Cheers, > Marc Ciao! David
Re: [update] i3-4.14
On Mon, Sep 4, 2017 at 2:11 PM, Josh Grosse wrote: > On Mon, Sep 04, 2017 at 09:18:18AM +0000, David Coppa wrote: >> >> Now that 4.14 is out, here's the diff to update our port. >> >> Comments / OKs ? > > Builes and works fine here on amd64. But I happened to issue a make test, > and it fails with: > > testcases/test_inject_randr15-inject_randr1.5.o: In function `child_cb': > /usr/ports/pobj/i3-4.14/i3-4.14/../i3-4.14/testcases/inject_randr1.5.c:(.text+0x4a4): > undefined reference to `WIFEXITED' > /usr/ports/pobj/i3-4.14/i3-4.14/../i3-4.14/testcases/inject_randr1.5.c:(.text+0x4b2): > undefined reference to `WTERMSIG' > /usr/ports/pobj/i3-4.14/i3-4.14/../i3-4.14/testcases/inject_randr1.5.c:(.text+0x4c3): > undefined reference to `WEXITSTATUS' > cc: error: linker command failed with exit code 1 (use -v to see invocation) > gmake[1]: *** [Makefile:1612: test.inject_randr15] Error 1 The test suite is non-functional since basically the beginning. Never found the time/motivation to fix it... maybe after 6.2 is out, but no guarantees ;)
[update] i3-4.14
Now that 4.14 is out, here's the diff to update our port.
Comments / OKs ?
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.106
diff -u -p -u -p -r1.106 Makefile
--- Makefile13 Nov 2016 20:46:23 - 1.106
+++ Makefile4 Sep 2017 09:16:43 -
@@ -2,7 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.13
+DISTNAME = i3-4.14
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo13 Nov 2016 20:46:23 - 1.26
+++ distinfo4 Sep 2017 09:16:43 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.13.tar.bz2) = lMExg+UnqYQTKjsFDIv2KWJlAqbhM+B7QTZBrsX4z4o=
-SIZE (i3-4.13.tar.bz2) = 1121298
+SHA256 (i3-4.14.tar.bz2) = rjq9468bh+Jp2KrSNIvm9ymDOMuOBrrRHL+Rzb+SpdY=
+SIZE (i3-4.14.tar.bz2) = 1152501
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 13 Nov 2016 20:46:23 - 1.1
+++ patches/patch-Makefile_in 4 Sep 2017 09:16:43 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
Makefile.in.orig Tue Nov 8 19:54:08 2016
-+++ Makefile.inThu Nov 10 19:44:19 2016
-@@ -744,10 +744,7 @@ i3include_HEADERS = \
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -752,10 +752,7 @@ i3include_HEADERS = \
dist_bin_SCRIPTS = \
i3-dmenu-desktop \
i3-migrate-config-to-v4 \
@@ -13,7 +14,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2016/1
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -882,9 +879,6 @@ docs_poddir = ${docdir}
+@@ -893,9 +890,6 @@ docs_poddir = ${docdir}
@BUILD_MANS_TRUE@ man/i3-nagbar.1 \
@BUILD_MANS_TRUE@ man/i3-config-wizard.1 \
@BUILD_MANS_TRUE@ man/i3-migrate-config-to-v4.1 \
@@ -23,7 +24,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2016/1
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3121,7 +3115,7 @@ distclean-tags:
+@@ -3156,7 +3150,7 @@ distclean-tags:
# Leading 'am--fnord' is there to ensure the list of targets does not
# expand to empty, as could happen e.g. with make check TESTS=''.
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/i3/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-configure
--- patches/patch-configure 13 Nov 2016 20:46:23 - 1.1
+++ patches/patch-configure 4 Sep 2017 09:16:43 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-configure,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
configure.orig Thu Nov 10 21:43:14 2016
-+++ configure Thu Nov 10 21:43:53 2016
-@@ -3351,7 +3351,7 @@ if test "x$_cv_gnu_make_command" = x""; then :
- fi
-
- case $srcdir in #(
-- .|.*) :
-+ /*|.|.*) :
-
- # pwd -P is specified in IEEE 1003.1 from 2004
- as_dir=`cd "$srcdir" && pwd -P`
+Index: configure
+--- configure.orig
configure
+@@ -6388,7 +6388,7 @@ char iconv_open ();
+ int
+ main ()
+ {
+-return iconv_open ();
++return libiconv_open ();
+ ;
+ return 0;
+ }
Index: patches/patch-i3-dmenu-desktop
===
RCS file: /cvs/ports/x11/i3/patches/patch-i3-dmenu-desktop,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-i3-dmenu-desktop
--- patches/patch-i3-dmenu-desktop 13 Nov 2016 20:46:23 - 1.6
+++ patches/patch-i3-dmenu-desktop 4 Sep 2017 09:16:43 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-i3-dmenu-desktop,v 1.6 2016/11/13 20:46:23 dcoppa Exp $
i3-dmenu-desktop.orig Tue Nov 8 19:54:01 2016
-+++ i3-dmenu-desktop Thu Nov 10 18:04:35 2016
+Index: i3-dmenu-desktop
+--- i3-dmenu-desktop.orig
i3-dmenu-desktop
@@ -111,7 +111,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
! -d $xdg_data_home;
@@ -25,7 +26,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.6 2
# }
# };
-@@ -424,7 +424,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
+@@ -450,7 +450,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
# we need to create a temporary script that contains the full command line
# as the syntax for starting commands with arguments varies from terminal
# emulator to terminal emulator.
@@ -34,7 +35,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.6 2
my ($fh, $filename) = tempfile();
binmode($fh, ':utf8');
say $fh
Re: Remove KDE 3
Il 30 ago 2017 08:31, "Jeremie Courreges-Anglas" ha scritto: On Wed, Aug 30 2017, Rafael Sadowski wrote: > Hi All, > > before we can wipe out KDE3 from our ports tree, we have to remove or > update the following consumers: > > Ports we should erase: > > games/kbilliards > > - Last updated 12 years ago > - dead upstream and no replacement > > sysutils/knutclient > - dead upstream and new KDE4 version[1] looks also dead because there is > no online/current tarball. > [1]: https://sites.google.com/a/prynych.cz/knutclient/home > > games/taxipilot > - Dead beef: http://taxipilot.sourceforge.net/download.php > > multimedia/kguitar > - Last news from 2010: KGuitar is not dead. In my opinion, it's dead! > > Updates: > > x11/kdirstat > - A new port which replace the old Qt3/KDE3-based KDirStat is ready. > https://github.com/shundhammer/qdirstat > See ports@ > > math/kst > - Update is almost done. See ports@ > > Ok to remove kbilliards || knutclient || taxipilot || kguitar || $ALL > are welcome. Comments? Nuke all the things! Yes, thanks. David
Re: remove audio/akode ?
Il 27 ago 2017 18:00, "Jeremie Courreges-Anglas" ha scritto: On Sun, Aug 27 2017, Rafael Sadowski wrote: > Hi, > > audio/akode is ancient, completely dead upstream, and no ports use it. > > Opinions? Opposing views? ok to delete it Ok with me too
[UPDATE] libinotify-20170711
The diff below updates devel/libinotify to the latest release.
Please test it with the usual suspects (owncloudclient, seafile,
incron, ...)
Cheers!
David
Index: Makefile
===
RCS file: /cvs/ports/devel/libinotify/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile12 May 2016 09:27:39 - 1.8
+++ Makefile24 Aug 2017 14:06:24 -
@@ -2,14 +2,15 @@
COMMENT = kevent based inotify
-DISTNAME = libinotify-20160503
+GH_ACCOUNT = libinotify-kqueue
+GH_PROJECT = libinotify-kqueue
+GH_TAGNAME = 20170711
+PKGNAME = libinotify-${GH_TAGNAME}
-SHARED_LIBS = inotify 2.0
+SHARED_LIBS = inotify 3.0
CATEGORIES = devel
-HOMEPAGE = https://github.com/wulf7/libinotify-kqueue
-
MAINTAINER = Kirill Bychkov
# MIT
@@ -17,10 +18,6 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = pthread
-MASTER_SITES = http://www.linklevel.net/distfiles/ \
- http://ohvost.ru/dnl/
-WRKDIST = ${WRKDIR}/wulf7-libinotify-kqueue-c637d04
-
BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@@ -38,5 +35,8 @@ TEST_TARGET = test
pre-configure:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -f -i
+
+post-install:
+ @rm -rf ${WRKINST}${LOCALBASE}/lib/inotify/pkgconfig
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/libinotify/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo12 May 2016 09:27:39 - 1.6
+++ distinfo24 Aug 2017 14:06:24 -
@@ -1,2 +1,2 @@
-SHA256 (libinotify-20160503.tar.gz) =
V9uwr18JY4T4ryN24r8MaCgckzIhxk/Tw2cVtlHGmgE=
-SIZE (libinotify-20160503.tar.gz) = 67220
+SHA256 (libinotify-kqueue-20170711.tar.gz) =
9/xo3TbAf7Mwh8lB6+kQKNfFDzcoLouX1Hh8DMhXrbw=
+SIZE (libinotify-kqueue-20170711.tar.gz) = 71707
Index: patches/patch-Makefile_am
===
RCS file: /cvs/ports/devel/libinotify/patches/patch-Makefile_am,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile_am
--- patches/patch-Makefile_am 12 May 2016 09:27:39 - 1.5
+++ patches/patch-Makefile_am 24 Aug 2017 14:06:24 -
@@ -2,14 +2,15 @@ $OpenBSD: patch-Makefile_am,v 1.5 2016/0
Unbreak separate build
Makefile.am.orig Wed May 11 12:06:59 2016
-+++ Makefile.amWed May 11 12:25:03 2016
-@@ -41,7 +41,7 @@ libinotify_la_SOURCES += compat/ik_atomic.c
+Index: Makefile.am
+--- Makefile.am.orig
Makefile.am
+@@ -58,7 +58,7 @@ libinotify_la_SOURCES += compat/tree.h
endif
- libinotify_la_CFLAGS = -I. -DNDEBUG @PTHREAD_CFLAGS@
+ libinotify_la_CFLAGS = -I. -DNDEBUG @PTHREAD_CFLAGS@ -Wall -Werror
-libinotify_la_LDFLAGS = @PTHREAD_LIBS@ -export-symbols libinotify.sym
+libinotify_la_LDFLAGS = @PTHREAD_LIBS@ -export-symbols
$(top_srcdir)/libinotify.sym
endif
-
+ inotify_test_SOURCES = inotify-test.c
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libinotify/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 24 Jun 2014 08:09:05 - 1.1.1.1
+++ pkg/PLIST 24 Aug 2017 14:06:24 -
@@ -6,3 +6,10 @@ lib/inotify/
lib/inotify/libinotify.a
lib/inotify/libinotify.la
@lib lib/inotify/libinotify.so.${LIBinotify_VERSION}
+@man man/man3/inotify_add_watch.3
+@man man/man3/inotify_event.3
+@man man/man3/inotify_init.3
+@man man/man3/inotify_init1.3
+@man man/man3/inotify_rm_watch.3
+@man man/man3/inotify_set_param.3
+@man man/man3/libinotify.3
Re: CMake-3.9.1
On Thu, Aug 24, 2017 at 2:46 PM, Stuart Henderson wrote: > On 2017/08/21 18:03, David Coppa wrote: >> >> Here's the update to CMake-3.9.1 >> >> Still needing a bulk build, so I can fix eventual failures in >> dependant ports... > > I'll start a bulk with this later today. > Great news! Thanks a lot, David
CMake-3.9.1
Here's the update to CMake-3.9.1
Still needing a bulk build, so I can fix eventual failures in
dependant ports...
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.161
diff -u -p -u -p -r1.161 Makefile
--- Makefile26 Jul 2017 22:45:17 - 1.161
+++ Makefile21 Aug 2017 17:57:58 -
@@ -4,10 +4,9 @@ DPB_PROPERTIES =parallel
COMMENT = portable build system
-VER = 3.7.2
+VER = 3.9.1
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 4
HOMEPAGE = https://www.cmake.org/
@@ -19,7 +18,7 @@ MASTER_SITES =${HOMEPAGE}files/v${VER:R
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += archive c curl expat form jsoncpp m ncurses pthread
-WANTLIB += ${COMPILER_LIBCXX} z
+WANTLIB += rhash ${COMPILER_LIBCXX} z
# XXX: Ninja is broken on m88k
.if ${MACHINE_ARCH} != "m88k"
@@ -30,7 +29,8 @@ BUILD_DEPENDS += textproc/py-sphinx>=1.4
LIB_DEPENDS = archivers/libarchive \
devel/jsoncpp \
- net/curl
+ net/curl \
+ security/rhash
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 distinfo
--- distinfo16 Jan 2017 08:51:50 - 1.47
+++ distinfo21 Aug 2017 17:57:58 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.7.2.tar.gz) = 3BJGxObRaOpNbgQs+6V3wazWX+6iflb1/zffkgwwyuA=
-SIZE (cmake-3.7.2.tar.gz) = 7361593
+SHA256 (cmake-3.9.1.tar.gz) = 12jug9IX+Ru1l7PKKsZj2nqGA8l+HxpRhLwB4K0rErs=
+SIZE (cmake-3.9.1.tar.gz) = 7702497
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt28 Nov 2016 09:15:13 - 1.22
+++ patches/patch-CMakeLists_txt21 Aug 2017 17:57:58 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-CMakeLists_txt,v 1.22 2016/11/28 09:15:13 dcoppa Exp $
CMakeLists.txt.origFri Nov 11 15:37:13 2016
-+++ CMakeLists.txt Sat Nov 26 15:18:08 2016
-@@ -274,6 +274,15 @@ macro (CMAKE_BUILD_UTILITIES)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -305,6 +305,15 @@ macro (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward
"${kwsys_folder}")
endif()
@@ -17,7 +18,17 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
#-
# Setup third-party libraries.
# Everything in the tree should be able to include files from the
-@@ -453,7 +462,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -342,7 +351,8 @@ macro (CMAKE_BUILD_UTILITIES)
+ message(FATAL_ERROR
+ "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
+ endif()
+-set(CMAKE_LIBRHASH_LIBRARIES LibRHash::LibRHash)
++set(CMAKE_LIBRHASH_INCLUDES ${LibRHash_INCLUDE_DIRS})
++set(CMAKE_LIBRHASH_LIBRARIES ${LibRHash_LIBRARIES})
+ else()
+ set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
+ add_subdirectory(Utilities/cmlibrhash)
+@@ -512,7 +522,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
endif()
@@ -27,7 +38,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
else()
set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
add_subdirectory(Utilities/cmjsoncpp)
-@@ -463,7 +473,7 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -522,7 +533,7 @@ macro (CMAKE_BUILD_UTILITIES)
#-
# Build libuv library.
if(NOT DEFINED CMAKE_USE_LIBUV)
@@ -36,7 +47,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
if(APPLE)
include(CheckCSourceCompiles)
check_c_source_compiles("
-@@ -499,7 +509,8 @@ int main(void) { return 0; }
+@@ -552,7 +563,8 @@ int main(void) { return 0; }
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
endif()
Index: patches/patch-Modules_CMakeCInformation_cmake
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCInformation_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake 28 Nov 2016 09:15:13
- 1.5
+++ patches/patch-Modules_CMakeCInformation_cmake 21 Aug 2017 17:57:58
-
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.5 2016/11/28 09:15:13
dcoppa Exp $
Modules/CMakeCInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeCInformation.cmak
New diff for CMake-3.9.0 (3rd rev)
3rd revision of the patch: remove the (now) useless patch patch-Modules_FindBoost_cmake. Upstream implemented the same feature, but in a different way, so the patch was still applying cleanly. Now, if someone could run a bulk build with the attached diff, it would be great... Ciao! David cmake-3.9.0_rev3.diff.gz Description: application/gunzip
productivity/kmymoney: fix Ninja build
All these fixes come from upstream git. With somewhat misleading
comments, but hey...
OK?
Index: Makefile
===
RCS file: /cvs/ports/productivity/kmymoney/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile27 Jul 2017 10:05:20 - 1.12
+++ Makefile15 Aug 2017 12:33:32 -
@@ -66,9 +66,6 @@ CONFIGURE_ARGS = -DENABLE_KBANKING:Bool=
TEST_IS_INTERACTIVE = X11
-# fails to pick up something MOC-generated in kmymoney/plugins/onlinetasks/sepa
-USE_NINJA =No
-
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py
${PREFIX}/share/apps/kmm_weboob/weboob.py
Index: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
===
RCS file: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
diff -N patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-kmymoney_dialogs_settings_CMakeLists_txt 15 Aug 2017
12:33:32 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+commit b0a68ca075928aa29ee1e0007bfb14d714f5a948
+Author: Ralf Habacker
+Date: Thu Aug 10 13:45:04 2017 +0200
+
+Fix 'Compile error on Fedora 26'
+
+CMake build system used some outdated variables which has been replaced
+by cmake built-in variables to fix the issue.
+
+* Unbreaks Ninja builds too
+
+Index: kmymoney/dialogs/settings/CMakeLists.txt
+--- kmymoney/dialogs/settings/CMakeLists.txt.orig
kmymoney/dialogs/settings/CMakeLists.txt
+@@ -1,12 +1,11 @@
+ add_custom_command(
+- OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
+- DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg
${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
+- COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/
${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg
${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h
${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
++ DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg
${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
++ COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/
${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg
${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
+ )
+
+-
+ set (libsettings_a_SOURCES
+- ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
++ ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
+ ksettingscolors.cpp
+ ksettingsfonts.cpp
+ ksettingsforecast.cpp
Index: patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt
===
RCS file: patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt
diff -N patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt 15 Aug
2017 12:33:32 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+commit 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5
+Author: Ralf Habacker
+Date: Tue May 23 19:52:20 2017 +0200
+
+Fix 'duplicated symbol' compile error on Windows.
+
+Because the whole project uses cmake automoc support additional
+calls to automoc4 causes 'duplicated symbol' errors on Windows.
+
+* Unbreaks Ninja builds too
+
+Index: kmymoney/plugins/onlinetasks/national/CMakeLists.txt
+--- kmymoney/plugins/onlinetasks/national/CMakeLists.txt.orig
kmymoney/plugins/onlinetasks/national/CMakeLists.txt
+@@ -20,7 +20,6 @@ kde4_add_ui_files( konlinetasks_national_SCRS
+ )
+
+ # Make this plugin unit testable
+-automoc4(konlinetasks_national_OBJECTS konlinetasks_national_SCRS)
+ add_library( konlinetasks_national_OBJECTS OBJECT
${konlinetasks_national_SCRS} )
+
+ # Add plugin which is not allowed in the unit test
Index: patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt
===
RCS file:
/cvs/ports/productivity/kmymoney/patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt
--- patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt 14 Jan
2017 11:19:04 - 1.1
+++ patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt 15 Aug
2017 12:33:32 -
@@ -1,7 +1,28 @@
$OpenBSD: patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt,v 1.1
2017/01/14 11:19:04 zhuk Exp $
kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt.orig Fri Jan 13
18:59:04 2017
-+++ kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt Fri Jan 13 19:00:13 2017
-@@ -27,21 +27,21 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-se
+
+commit 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5
+Author: Ralf Habacker
+Date: Tue May 23 19:52:20 2017 +0200
+
+Fix 'duplicated symbol' compile error on Windows.
+
+Because the whole project uses cmake automoc suppor
Re: boost 1.64.0
On Tue, Aug 15, 2017 at 12:54 PM, Reyk Floeter wrote: > Hi, > > btw., cmake needs an update to recognize boost 1.64.0 > > /usr/local/share/cmake/Modules/FindBoost.cmake supports VERION_LESS 106400 > > Reyk CMake-3.9.0 does support Boost 1.64. Here's again the update I've sent to ports@ some days ago... Ciao! David cmake-3.9.0_rev2.diff.gz Description: GNU Zip compressed data
qt5 and W^X violation
Hi! Every time I launch minitube, I see this: ---8<--- $ minitube & [1] 16239 QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-dcoppa' JIT is disabled for QML. Property bindings and animations will be very slow. Visit https://wiki.qt.io/V4 to learn about possible solutions for your platform. JIT is disabled for QML. Property bindings and animations will be very slow. Visit https://wiki.qt.io/V4 to learn about possible solutions for your platform. $ dmesg | tail -n 1 minitube(16239): mmap W^X violation ---8<--- This is new to me. Searching on Google, it seems this feature has been introduced with Qt 5.7. Does it mean that now every qt5-based port should be marked with WXNEEDED? What would be the downside of disabling this QML JIT? Is it really so slow without it? Ciao, David
Re: [UPDATE] CMake-3.9.0
On Sun, Aug 13, 2017 at 2:22 PM, Rafael Sadowski wrote:
> On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote:
>>
>> Hi all,
>>
>> Here's the update to the latest CMake.
>>
>> As usual, I'd like to have the attached diff tested in a ports bulk
>> build...
>>
>> Thanks!
>> David
>>
>
> fix x11/kde4/libs with CMake 3.9.0
>
> Index: patches/patch-kdeui_CMakeLists_txt
> ===
> RCS file: patches/patch-kdeui_CMakeLists_txt
> diff -N patches/patch-kdeui_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-kdeui_CMakeLists_txt 13 Aug 2017 12:21:39 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: kdeui/CMakeLists.txt
> +--- kdeui/CMakeLists.txt.orig
> kdeui/CMakeLists.txt
> +@@ -313,8 +313,6 @@ if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> + add_definitions(-DMAC_USE_OSXKEYCHAIN)
> + else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> + set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
> +-else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> +- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
> + endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
> +
> + if(NOT WINCE)
lol :)
Sure, ok with me.
Ciao!
David
--
"If you try a few times and give up, you'll never get there. But if
you keep at it... There's a lot of problems in the world which can
really be solved by applying two or three times the persistence that
other people will."
-- Stewart Nelson
Re: git security update
On Fri, Aug 11, 2017 at 6:41 AM, Daniel Jakots wrote: > Hello && coucou Benoit, > > Git's upstream released a couple of git releases to fix > CVE-2017-1000117. Here's diff that update old-stable, stable and > current. > > I went the lazy way which is 'update to latest bugfix release' and not > just backporting patches. This was the easiest thing for me and it > "sounds like the correct approach to" sthen :) > > Test, comments and ok? > > Cheers, > Daniel ok with me for the -current one. Ciao! David
Re: [UPDATE] CMake-3.9.0
On Thu, 10 Aug 2017, Rafael Sadowski wrote:
> On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote:
> >
> > Hi all,
> >
> > Here's the update to the latest CMake.
> >
> > As usual, I'd like to have the attached diff tested in a ports bulk
> > build...
> >
> > Thanks!
> > David
>
> $ make regress
> 100% tests passed, 0 tests failed out of 451
>
> CMake tests are all green but it breaks my graphics/lensfun build:
...
> FAILED: tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o
> /usr/ports/pobj/lensfun-0.3.2/bin/c++ -I.
> -I/usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/include/lensfun -isystem
> /usr/local/lib/glib-2.0/include -isystem /usr/local/include/glib-2.0 -O2
> -pipe NOTFOUND -DNDEBUG -MD -MT
> tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -MF
> tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o.d -o
> tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -c
> /usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/tests/test_modifier.cpp
> c++: error: no such file or directory: 'NOTFOUND'
> ninja: build stopped: subcommand failed.
> *** Error 1 in . (/usr/ports/devel/cmake/cmake.port.mk:31 'do-build': @cd
> /usr/ports/pobj/lensfun-0.3.2/build-amd64 && exec /usr/bin/env -i ...)
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2701
> '/usr/ports/pobj/lensfun-0.3.2/build-amd64/.build_done')
> *** Error 1 in /usr/ports/graphics/lensfun
> (/usr/ports/infrastructure/mk/bsd.port.mk:2408 'all')
CMake-3.9 found a bug: "${OpenMP_CXX_FLAGS}" should not be used
unconditionally...
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: patches/patch-tests_CMakeLists_txt
diff -N patches/patch-tests_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_CMakeLists_txt 11 Aug 2017 05:00:09 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: tests/CMakeLists.txt
+--- tests/CMakeLists.txt.orig
tests/CMakeLists.txt
+@@ -7,7 +7,9 @@ TARGET_LINK_LIBRARIES(test_modifier lensfun ${COMMON_L
+ ADD_TEST(Modifier test_modifier)
+
+ find_package(OpenMP)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
++if(OpenMP_CXX_FOUND)
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
++endif()
+
+ ADD_EXECUTABLE(test_modifier_color test_modifier_color.cpp)
+ TARGET_LINK_LIBRARIES(test_modifier_color lensfun ${COMMON_LIBS})
Re: [UPDATE] CMake-3.9.0
On Thu, 10 Aug 2017, David Coppa wrote: > > Hi all, > > Here's the update to the latest CMake. > > As usual, I'd like to have the attached diff tested in a ports bulk > build... > > Thanks! > David New revision of the diff fixing a problem with FindLua.cmake. Please, trash the previous one. Cheers! David cmake-3.9.0_rev2.diff.gz Description: application/gunzip
[UPDATE] CMake-3.9.0
Hi all,
Here's the update to the latest CMake.
As usual, I'd like to have the attached diff tested in a ports bulk
build...
Thanks!
David
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.161
diff -u -p -u -p -r1.161 Makefile
--- Makefile26 Jul 2017 22:45:17 - 1.161
+++ Makefile10 Aug 2017 15:21:38 -
@@ -4,10 +4,9 @@ DPB_PROPERTIES =parallel
COMMENT = portable build system
-VER = 3.7.2
+VER = 3.9.0
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 4
HOMEPAGE = https://www.cmake.org/
@@ -19,7 +18,7 @@ MASTER_SITES =${HOMEPAGE}files/v${VER:R
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += archive c curl expat form jsoncpp m ncurses pthread
-WANTLIB += ${COMPILER_LIBCXX} z
+WANTLIB += rhash ${COMPILER_LIBCXX} z
# XXX: Ninja is broken on m88k
.if ${MACHINE_ARCH} != "m88k"
@@ -30,7 +29,8 @@ BUILD_DEPENDS += textproc/py-sphinx>=1.4
LIB_DEPENDS = archivers/libarchive \
devel/jsoncpp \
- net/curl
+ net/curl \
+ security/rhash
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 distinfo
--- distinfo16 Jan 2017 08:51:50 - 1.47
+++ distinfo10 Aug 2017 15:21:38 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.7.2.tar.gz) = 3BJGxObRaOpNbgQs+6V3wazWX+6iflb1/zffkgwwyuA=
-SIZE (cmake-3.7.2.tar.gz) = 7361593
+SHA256 (cmake-3.9.0.tar.gz) = FncBUlGD27ciuf/mn7UlqiuBeYzxL1zhwCDJM5Tfrg8=
+SIZE (cmake-3.9.0.tar.gz) = 7691313
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt28 Nov 2016 09:15:13 - 1.22
+++ patches/patch-CMakeLists_txt10 Aug 2017 15:21:38 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-CMakeLists_txt,v 1.22 2016/11/28 09:15:13 dcoppa Exp $
CMakeLists.txt.origFri Nov 11 15:37:13 2016
-+++ CMakeLists.txt Sat Nov 26 15:18:08 2016
-@@ -274,6 +274,15 @@ macro (CMAKE_BUILD_UTILITIES)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -305,6 +305,15 @@ macro (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward
"${kwsys_folder}")
endif()
@@ -17,7 +18,17 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
#-
# Setup third-party libraries.
# Everything in the tree should be able to include files from the
-@@ -453,7 +462,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -342,7 +351,8 @@ macro (CMAKE_BUILD_UTILITIES)
+ message(FATAL_ERROR
+ "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
+ endif()
+-set(CMAKE_LIBRHASH_LIBRARIES LibRHash::LibRHash)
++set(CMAKE_LIBRHASH_INCLUDES ${LibRHash_INCLUDE_DIRS})
++set(CMAKE_LIBRHASH_LIBRARIES ${LibRHash_LIBRARIES})
+ else()
+ set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
+ add_subdirectory(Utilities/cmlibrhash)
+@@ -512,7 +522,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
endif()
@@ -27,7 +38,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
else()
set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
add_subdirectory(Utilities/cmjsoncpp)
-@@ -463,7 +473,7 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -522,7 +533,7 @@ macro (CMAKE_BUILD_UTILITIES)
#-
# Build libuv library.
if(NOT DEFINED CMAKE_USE_LIBUV)
@@ -36,7 +47,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
if(APPLE)
include(CheckCSourceCompiles)
check_c_source_compiles("
-@@ -499,7 +509,8 @@ int main(void) { return 0; }
+@@ -552,7 +563,8 @@ int main(void) { return 0; }
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
endif()
Index: patches/patch-Modules_CMakeCInformation_cmake
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCInformation_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake 28 Nov 2016 09:15:13
- 1.5
+++ patches/patch-Modules_CMakeCInformation_cmake 10 Aug 2017 15:21:38
-
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.5 2016/11/28 09:15:13
dcoppa Exp $
Modules/CMakeCInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeCInf
Re: UPDATE: mail/isync 1.2.1 to 1.2.2
On Thu, Aug 10, 2017 at 5:33 AM, Daniel Jakots wrote:
> On Thu, 10 Aug 2017 02:53:59 +0200, Klemens Nanni
> wrote:
>
>> > I'm not entirely sure yet whether the introduced patch to get
>> > X509_OBJECT_get0_X509() and X509_STORE_get0_objects() working is the
>> > way to go, maybe someone more knowledgable about OpenSSL internals
>> > can comment/fix this?
>
>> +-# if OPENSSL_VERSION_NUMBER < 0x1010L
>> ++/*# if OPENSSL_VERSION_NUMBER < 0x1010L*/
>
> That's not the best way to fix it. Here's an updated diff that also
> addresses the fact it doesn't build with gcc4.2:
>
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c: In function 'map_name':
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c:526: error: #pragma GCC
> diagnostic not allowed inside functions
>
> Cheers,
> Daniel
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile20 Dec 2015 09:59:22 - 1.30
> +++ Makefile10 Aug 2017 03:26:41 -
> @@ -2,7 +2,7 @@
>
> COMMENT= synchronize IMAP4 and maildir mailboxes
>
> -DISTNAME= isync-1.2.1
> +DISTNAME= isync-1.2.2
> CATEGORIES=mail
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
>
> @@ -12,6 +12,8 @@ HOMEPAGE= http://isync.sourceforge.net/
> PERMIT_PACKAGE_CDROM= Yes
>
> WANTLIB= c crypto db sasl2 ssl z
> +
> +COMPILER= clang gcc
>
> LIB_DEPENDS= databases/db/v4 \
> security/cyrus-sasl2
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo20 Dec 2015 09:59:22 - 1.11
> +++ distinfo10 Aug 2017 03:26:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.2.1.tar.gz) = 5xbeKMmgjmJKA1yq45AvzztRFVO+XWFRehM+A6o1Mq4=
> -SIZE (isync-1.2.1.tar.gz) = 281990
> +SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
> +SIZE (isync-1.2.2.tar.gz) = 285745
> Index: patches/patch-src_socket_c
> ===
> RCS file: patches/patch-src_socket_c
> diff -N patches/patch-src_socket_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_socket_c 10 Aug 2017 03:26:45 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/socket.c
> +--- src/socket.c.orig
> src/socket.c
> +@@ -40,7 +40,7 @@
> + # include
> + # include
> + # include
> +-# if OPENSSL_VERSION_NUMBER < 0x1010L
> ++# if OPENSSL_VERSION_NUMBER < 0x1010L ||
> defined(LIBRESSL_VERSION_NUMBER)
> + # define X509_OBJECT_get0_X509(o) ((o)->data.x509)
> + # define X509_STORE_get0_objects(o) ((o)->objs)
> + # endif
>
ok dcoppa@
Ciao!
David
Re: NEW: security/rhash
Il 08 ago 2017 22:55, "Rafael Sadowski" ha scritto:
On Tue Aug 08, 2017 at 10:37:19PM +0200, David Coppa wrote:
> On Tue, 08 Aug 2017, Rafael Sadowski wrote:
>
> > On Tue Aug 08, 2017 at 04:50:10PM +0200, David Coppa wrote:
> > >
> > > Hi all,
> > >
> > > Attached you have security/rhash, a new dependency for CMake-3.8.x
Why CMake 3.8 andnot 3.9? https://blog.kitware.com/
kitware-powers-project-builds-with-cmake-3-9/
OMG! CMake 3.9 is already out!
> > >
> > > ---8<---
> > >
> > > $ pkg_info rhash
> > > Information for inst:rhash-1.3.4
> > >
> > > Comment:
> > > utility and library for computing hash sums
> > >
> > > Description:
> > > RHash is a console utility and library for computing and verifying
> > > hash sums of files.
> > > It supports CRC32, MD4, MD5, SHA1, SHA256, SHA512, Tiger, DC++ TTH,
> > > BitTorrent BTIH, ED2K, AICH, GOST R 34.11-94, RIPEMD-160, HAS-160,
> > > EDON-R 256/512, Whirlpool and Snefru-128/256 algorithms.
> > >
> > > Maintainer: David Coppa
> > >
> > > WWW: http://rhash.anz.ru/
> > >
> > > ---8<---
> > >
> > > ===> Regression tests for rhash-1.3.4
> > > cd /usr/pobj/rhash-1.3.4/rhash-1.3.4/tests && /bin/sh ./test_rhash.sh
--full
> > > Testing /usr/local/bin/rhash
> > > 1. test with text string: Ok
> > > 2. test with 1Kb data file:Ok
> > > 3. test handling empty files: Ok
> > > 4. test default format:Ok
> > > 5. test %x, %b, %B modifiers: Ok
> > > 6. test special characters:Ok
> > > 7. test eDonkey link: Ok
> > > 8. test all hash options: Ok
> > > 9. test checking all hashes: Ok
> > > 10. test checking magnet link: Ok
> > > 11. test bsd format checking: Ok
> > > 12. test checking w/o filename: Ok
> > > 13. test checking embedded crc: Ok
> > > 14. test wrong sums detection: Ok
> > > 15. test *accept options: Ok
> > > 16. test ignoring of log files: Ok
> > > 17. test creating torrent file: Ok
> > > 18. test exit code: Ok
> > >
> > > Ok?
> > >
> > > Ciao!
> > > David
> > >
> >
> > Hi David,
> >
> > my test results:
> >
> > cd /usr/ports/pobj/rhash-1.3.4/rhash-1.3.4/tests && /bin/sh
./test_rhash.sh --full
> > Testing /usr/local/bin/rhash
> > 1. test with text string: Ok
> > 2. test with 1Kb data file:Ok
> > 3. test handling empty files: Ok
> > 4. test default format:Ok
> > 5. test %x, %b, %B modifiers: Ok
> > 6. test special characters:Ok
> > 7. test eDonkey link: Ok
> > 8. test all hash options: Ok
> > 9. test checking all hashes: Ok
> > 10. test checking magnet link: Ok
> > 11. test bsd format checking: Ok
> > 12. test checking w/o filename: Ok
> > 13. test checking embedded crc: Illegal instruction (core dumped)
> > Failed Subtest #1
> > obtained: "test_[D3D99E8B].data"
> > regexp: /^test_.*OK/
> > Illegal instruction (core dumped)
> > Failed Subtest #2
> > obtained: "test_[D3D99E8C].data"
> > regexp: /^test_.*ERROR, embedded CRC32 should be/
> > Illegal instruction (core dumped)
> > Failed Subtest #3
> > obtained: "test_[D3D99E8B].data"
> > regexp: /test_.*OK/
> > Illegal instruction (core dumped)
> > Failed Subtest #4
> > obtained: "test_[D3D99E8C].data"
> > regexp: /test_.*ERR/
> > Ok
> > 14. test wrong sums detection: Ok
> > 15. test *accept options: Ok
> > 16. test ignoring of log files: Ok
> > 17. test creating torrent file: Ok
> > 18. test exit code: Ok
>
> I was naive enough to test this port on a pre-clang system, sorry.
>
> But I'm a lucky guy, because this bug has already been fixed upstream
> ;) ;)
>
> Here's a fixed version.
>
> Thanks for testing,
> David
>
All tests are green, now! Could you adjust do-test like this:
do-test:
cd ${WRKSRC}/tests && \
LD_PRELOAD=${WRKBUILD}/librhash/librhash.so.${LIBrhash_VERSION} \
${SHELL} ./test_rhash.sh --full
to fix one line is longer than 80 chars message from portscheck?
Sure, I'll do.
ok rsadowski@
Thanks.
I'm looking forward to test your cmake update with digikam 5.6.0.
Our current cmake port has problems with CMAKE_AUTOMOC and ninja:
https://gitlab.kitware.com/cmake/cmake/issues/15967
Best regards,
Rafael Sadowski
Re: NEW: security/rhash
On Tue, 08 Aug 2017, Rafael Sadowski wrote: > On Tue Aug 08, 2017 at 04:50:10PM +0200, David Coppa wrote: > > > > Hi all, > > > > Attached you have security/rhash, a new dependency for CMake-3.8.x > > > > ---8<--- > > > > $ pkg_info rhash > > Information for inst:rhash-1.3.4 > > > > Comment: > > utility and library for computing hash sums > > > > Description: > > RHash is a console utility and library for computing and verifying > > hash sums of files. > > It supports CRC32, MD4, MD5, SHA1, SHA256, SHA512, Tiger, DC++ TTH, > > BitTorrent BTIH, ED2K, AICH, GOST R 34.11-94, RIPEMD-160, HAS-160, > > EDON-R 256/512, Whirlpool and Snefru-128/256 algorithms. > > > > Maintainer: David Coppa > > > > WWW: http://rhash.anz.ru/ > > > > ---8<--- > > > > ===> Regression tests for rhash-1.3.4 > > cd /usr/pobj/rhash-1.3.4/rhash-1.3.4/tests && /bin/sh ./test_rhash.sh --full > > Testing /usr/local/bin/rhash > > 1. test with text string: Ok > > 2. test with 1Kb data file:Ok > > 3. test handling empty files: Ok > > 4. test default format:Ok > > 5. test %x, %b, %B modifiers: Ok > > 6. test special characters:Ok > > 7. test eDonkey link: Ok > > 8. test all hash options: Ok > > 9. test checking all hashes: Ok > > 10. test checking magnet link: Ok > > 11. test bsd format checking: Ok > > 12. test checking w/o filename: Ok > > 13. test checking embedded crc: Ok > > 14. test wrong sums detection: Ok > > 15. test *accept options: Ok > > 16. test ignoring of log files: Ok > > 17. test creating torrent file: Ok > > 18. test exit code: Ok > > > > Ok? > > > > Ciao! > > David > > > > Hi David, > > my test results: > > cd /usr/ports/pobj/rhash-1.3.4/rhash-1.3.4/tests && /bin/sh ./test_rhash.sh > --full > Testing /usr/local/bin/rhash > 1. test with text string: Ok > 2. test with 1Kb data file:Ok > 3. test handling empty files: Ok > 4. test default format:Ok > 5. test %x, %b, %B modifiers: Ok > 6. test special characters:Ok > 7. test eDonkey link: Ok > 8. test all hash options: Ok > 9. test checking all hashes: Ok > 10. test checking magnet link: Ok > 11. test bsd format checking: Ok > 12. test checking w/o filename: Ok > 13. test checking embedded crc: Illegal instruction (core dumped) > Failed Subtest #1 > obtained: "test_[D3D99E8B].data" > regexp: /^test_.*OK/ > Illegal instruction (core dumped) > Failed Subtest #2 > obtained: "test_[D3D99E8C].data" > regexp: /^test_.*ERROR, embedded CRC32 should be/ > Illegal instruction (core dumped) > Failed Subtest #3 > obtained: "test_[D3D99E8B].data" > regexp: /test_.*OK/ > Illegal instruction (core dumped) > Failed Subtest #4 > obtained: "test_[D3D99E8C].data" > regexp: /test_.*ERR/ > Ok > 14. test wrong sums detection: Ok > 15. test *accept options: Ok > 16. test ignoring of log files: Ok > 17. test creating torrent file: Ok > 18. test exit code: Ok I was naive enough to test this port on a pre-clang system, sorry. But I'm a lucky guy, because this bug has already been fixed upstream ;) ;) Here's a fixed version. Thanks for testing, David rhash_v2.tgz Description: application/tar-gz
NEW: security/rhash
Hi all, Attached you have security/rhash, a new dependency for CMake-3.8.x ---8<--- $ pkg_info rhash Information for inst:rhash-1.3.4 Comment: utility and library for computing hash sums Description: RHash is a console utility and library for computing and verifying hash sums of files. It supports CRC32, MD4, MD5, SHA1, SHA256, SHA512, Tiger, DC++ TTH, BitTorrent BTIH, ED2K, AICH, GOST R 34.11-94, RIPEMD-160, HAS-160, EDON-R 256/512, Whirlpool and Snefru-128/256 algorithms. Maintainer: David Coppa WWW: http://rhash.anz.ru/ ---8<--- ===> Regression tests for rhash-1.3.4 cd /usr/pobj/rhash-1.3.4/rhash-1.3.4/tests && /bin/sh ./test_rhash.sh --full Testing /usr/local/bin/rhash 1. test with text string: Ok 2. test with 1Kb data file:Ok 3. test handling empty files: Ok 4. test default format:Ok 5. test %x, %b, %B modifiers: Ok 6. test special characters:Ok 7. test eDonkey link: Ok 8. test all hash options: Ok 9. test checking all hashes: Ok 10. test checking magnet link: Ok 11. test bsd format checking: Ok 12. test checking w/o filename: Ok 13. test checking embedded crc: Ok 14. test wrong sums detection: Ok 15. test *accept options: Ok 16. test ignoring of log files: Ok 17. test creating torrent file: Ok 18. test exit code: Ok Ok? Ciao! David rhash.tgz Description: application/tar-gz
Re: Remove chinese/crxvt?
Il 15 lug 2017 18:16, "Frederic Cambus" ha scritto: Hi ports@, We recently removed mrxvt and rxvt due to the fact that upstream is dead and that thee code is vulnerable to CVE-2017-7483 [1]. On top of that, crxvt is very unstable: it dumps core after entering a few commands or pressing enter repeatedly a couple of times. Comments? OK to remove? Ok dcoppa@
Re: cmake woes wrt libxml2 include_dirs
Il 07 lug 2017 21:54, "Landry Breuil" ha scritto:
On Tue, Jul 04, 2017 at 01:21:48PM +0300, Vadim Zhukov wrote:
> >>
> >> a port i'm working on (pgpointcloud) uses cmake to detect libxml2:
> >>
> >> https://github.com/pgpointcloud/pointcloud/blob/
master/CMakeLists.txt#L91
> >>
> >> with this CMakeLists the build fails because -I/usr/local/include is
not
> >> on the CFLAGS:
> >>
> >> /usr/obj/ports/pgpointcloud-1.1.0pre0/bin/cc
-I/usr/local/include/libxml2 -Ilib -O2 -pipe -DNDEBUG -fPIC
> >> -MD -MT lib/CMakeFiles/libpc-static.dir/pc_schema.c.o -MF
lib/CMakeFiles/libpc-static.dir/pc_schema.c.o.d -o
> >> lib/CMakeFiles/libpc-static.dir/pc_schema.c.o -c
> >> /usr/obj/ports/pgpointcloud-1.1.0pre0/pointcloud-
0130a1c49dc3f8c3beaa5f033c66691bdc422987/lib/pc_schema.c
> >> In file included from /usr/obj/ports/pgpointcloud-1.1.0pre0/pointcloud-
0130a1c49dc3f8c3beaa5f033c66691bdc422987/lib/pc_schema.c:13
> >> In file included from /usr/local/include/libxml2/libxml/parser.h:810:
> >> /usr/local/include/libxml2/libxml/encoding.h:28:10: fatal error:
'iconv.h' file not found
> >> #include
> >>
> >> What i dont understand is that libxml-2.0.pc sets it:
> >>
> >> $pkg-config --cflags libxml-2.0
> >> -I/usr/local/include/libxml2 -I/usr/local/include
> >>
> >> And afaik our FindLibxml2.cmake module in
> >> /usr/local/share/cmake/Modules/FindLibXml2.cmake uses that:
> >> ===
> >> find_package(PkgConfig QUIET)
> >> PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0)
> >> set(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
> >>
> >> find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
> >>HINTS
> >>${PC_LIBXML_INCLUDEDIR}
> >>${PC_LIBXML_INCLUDE_DIRS}
> >>PATH_SUFFIXES libxml2
> >>)
> >>
> >> find_library(LIBXML2_LIBRARIES NAMES xml2 libxml2
> >>HINTS
> >>${PC_LIBXML_LIBDIR}
> >>${PC_LIBXML_LIBRARY_DIRS}
> >>)
> >>
> >> ===
> >>
> >> So with my limited cmake-fu, i'm puzzled as to why usr/local/include
> >> isnt part of the include paths. It 'works' if i patch the
CmakeLists.txt
> >> this way:
> >>
> >> find_package (LibXml2 REQUIRED)
> >> mark_as_advanced (CLEAR LIBXML2_INCLUDE_DIR)
> >> mark_as_advanced (CLEAR LIBXML2_LIBRARIES)
> >> include_directories (${LIBXML2_INCLUDE_DIR})
> >> +include_directories (/usr/local/include)
> >>
> >> But that's of course ugly, so i'm looking for help to figure out if
this
> >> is a problem in FindLibxml2.cmake or in pgpointcloud's CMakeLists.txt..
> >>
> >
> > It's definitely not a FindLibxml2.cmake problem because
> > "find_package(LibXml2)" works fine with akonadi-17.04.1 (kf5 port on
> > openbsd-wip).
>
> It's definitely the FindLibXml2.cmake problem, since it doesn't
> provide LIBXML2_INCLUDE_DIRS (notice the 'S'), and only
LIBXML_INCLUDE_DIR.
> This should be fixed upstream with patch like below; I'll need to recover
> my Kitware account password, though... :)
>
> After that applied, you'll need to tweak the pgpointcloud port to use
> the ${LIBXML2_INCLUDE_DIRS} instead of ${LIBXML2_INCLUDE_DIR}.
Fwiw, with your patch and this in pgpointcloud:
find_package (LibXml2 REQUIRED)
-mark_as_advanced (CLEAR LIBXML2_INCLUDE_DIR)
+mark_as_advanced (CLEAR LIBXML2_INCLUDE_DIRS)
mark_as_advanced (CLEAR LIBXML2_LIBRARIES)
-include_directories (${LIBXML2_INCLUDE_DIR})
+include_directories (${LIBXML2_INCLUDE_DIRS})
it builds fine. Ok for me too on the cmake diff - with the link to the
upstream report/pushback..
Ok to import pgpointcloud now that cmake has been fixed.
Ciao!
David
Re: cmake woes wrt libxml2 include_dirs
Il 04 lug 2017 12:24, "Vadim Zhukov" ha scritto:
>>
>> a port i'm working on (pgpointcloud) uses cmake to detect libxml2:
>>
>> https://github.com/pgpointcloud/pointcloud/blob/master/CMakeLists.txt#L91
>>
>> with this CMakeLists the build fails because -I/usr/local/include is not
>> on the CFLAGS:
>>
>> /usr/obj/ports/pgpointcloud-1.1.0pre0/bin/cc
-I/usr/local/include/libxml2 -Ilib -O2 -pipe -DNDEBUG -fPIC
>> -MD -MT lib/CMakeFiles/libpc-static.dir/pc_schema.c.o -MF
lib/CMakeFiles/libpc-static.dir/pc_schema.c.o.d -o
>> lib/CMakeFiles/libpc-static.dir/pc_schema.c.o -c
>> /usr/obj/ports/pgpointcloud-1.1.0pre0/pointcloud-
0130a1c49dc3f8c3beaa5f033c66691bdc422987/lib/pc_schema.c
>> In file included from /usr/obj/ports/pgpointcloud-1.1.0pre0/pointcloud-
0130a1c49dc3f8c3beaa5f033c66691bdc422987/lib/pc_schema.c:13
>> In file included from /usr/local/include/libxml2/libxml/parser.h:810:
>> /usr/local/include/libxml2/libxml/encoding.h:28:10: fatal error:
'iconv.h' file not found
>> #include
>>
>> What i dont understand is that libxml-2.0.pc sets it:
>>
>> $pkg-config --cflags libxml-2.0
>> -I/usr/local/include/libxml2 -I/usr/local/include
>>
>> And afaik our FindLibxml2.cmake module in
>> /usr/local/share/cmake/Modules/FindLibXml2.cmake uses that:
>> ===
>> find_package(PkgConfig QUIET)
>> PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0)
>> set(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
>>
>> find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
>>HINTS
>>${PC_LIBXML_INCLUDEDIR}
>>${PC_LIBXML_INCLUDE_DIRS}
>>PATH_SUFFIXES libxml2
>>)
>>
>> find_library(LIBXML2_LIBRARIES NAMES xml2 libxml2
>>HINTS
>>${PC_LIBXML_LIBDIR}
>>${PC_LIBXML_LIBRARY_DIRS}
>>)
>>
>> ===
>>
>> So with my limited cmake-fu, i'm puzzled as to why usr/local/include
>> isnt part of the include paths. It 'works' if i patch the CmakeLists.txt
>> this way:
>>
>> find_package (LibXml2 REQUIRED)
>> mark_as_advanced (CLEAR LIBXML2_INCLUDE_DIR)
>> mark_as_advanced (CLEAR LIBXML2_LIBRARIES)
>> include_directories (${LIBXML2_INCLUDE_DIR})
>> +include_directories (/usr/local/include)
>>
>> But that's of course ugly, so i'm looking for help to figure out if this
>> is a problem in FindLibxml2.cmake or in pgpointcloud's CMakeLists.txt..
>>
>
> It's definitely not a FindLibxml2.cmake problem because
> "find_package(LibXml2)" works fine with akonadi-17.04.1 (kf5 port on
> openbsd-wip).
It's definitely the FindLibXml2.cmake problem, since it doesn't
provide LIBXML2_INCLUDE_DIRS (notice the 'S'), and only LIBXML_INCLUDE_DIR.
This should be fixed upstream with patch like below; I'll need to recover
my Kitware account password, though... :)
After that applied, you'll need to tweak the pgpointcloud port to use
the ${LIBXML2_INCLUDE_DIRS} instead of ${LIBXML2_INCLUDE_DIR}.
Oh, and with akonadi we just get lucky due to smth. else picking up
/usr/local/include.
--
WBR,
Vadim Zhukov
Index: patches/patch-Modules_FindLibXml2_cmake
===
RCS file: patches/patch-Modules_FindLibXml2_cmake
diff -N patches/patch-Modules_FindLibXml2_cmake
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Modules_FindLibXml2_cmake 4 Jul 2017 10:18:02 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+Provide de-facto standard CMake variables.
+
+Index: Modules/FindLibXml2.cmake
+--- Modules/FindLibXml2.cmake.orig
Modules/FindLibXml2.cmake
+@@ -12,7 +12,9 @@
+ # ::
+ #
+ # LIBXML2_FOUND - System has LibXml2
+-# LIBXML2_INCLUDE_DIR - The LibXml2 include directory
++# LIBXML2_INCLUDE_DIR - The actual LibXml2 include directory
++# LIBXML2_INCLUDE_DIRS - The list of include directories needed to use
LibXml2
++# LIBXML2_LIBRARY - The actual LibXml2 library
+ # LIBXML2_LIBRARIES - The libraries needed to use LibXml2
+ # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
+ # LIBXML2_XMLLINT_EXECUTABLE - The XML checking tool xmllint coming
with LibXml2
+@@ -31,7 +33,7 @@ find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
+PATH_SUFFIXES libxml2
+)
+
+-find_library(LIBXML2_LIBRARIES NAMES xml2 libxml2
++find_library(LIBXML2_LIBRARY NAMES xml2 libxml2
+HINTS
+${PC_LIBXML_LIBDIR}
+${PC_LIBXML_LIBRARY_DIRS}
+@@ -52,11 +54,14 @@ elseif(LIBXML2_INCLUDE_DIR AND EXISTS "${LIBXML2_INCLU
+ unset(libxml2_version_str)
+ endif()
+
++set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR} ${PC_LIBXML_INCLUDE_DIRS})
++set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY})
++
+ # handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
if
+ # all listed variables are TRUE
+ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2
+- REQUIRED_VARS LIBXML2_LIBRARIES
LIBXML2_INCLUDE_DIR
++ REQUIRED_VARS LIBXML2_LIBRARY
LIBXML2_INCLUDE_DIR
+ VERSION_VAR LIBXML2_VERSION_STRING)
+
+-mark
Re: git 2.13.0 broken on sparc64
On Mon, Jun 26, 2017 at 12:10 PM, Martin Pieuchot wrote: > On 26/06/17(Mon) 11:56, Landry Breuil wrote: >> On Mon, Jun 26, 2017 at 11:51:15AM +0200, Martin Pieuchot wrote: >> > No debug symbols, so I can't find/fix the problem. >> > >> > OpenBSD 6.1-current (GENERIC.MP) #18: Mon Jun 26 11:20:49 CEST 2017 >> > m...@oliva.grenadille.net:/sys/arch/sparc64/compile/GENERIC.MP >> > >> > $ git --version >> > git version 2.13.0 >> >> Maybe it's the sha1 thing that was broken in 2.13.0 and got fixed in >> 2.13.0p0 and the sparc64 havent catched up yet ? It was 2.13.1p0, and now we're at 2.13.2. > Dunno, I updated my packages before reporting: > > # pkg_add -u git > quirks-2.325 signed on 2017-06-18T10:35:43Z > # pkg_info |grep git > git-2.13.0p0GIT - Tree History Storage Tool So, yes, sparc64 is a little behind with packages. Ciao! David
Re: Remove x11/mrxvt?
Il 24 giu 2017 00:16, "Frederic Cambus" ha scritto: Hi ports@, Mrxvt is based on rxvt which we recently removed due to the fact that upstream is dead and that thee code is vulnerable to CVE-2017-7483 [1]. Mrxvt is vulnerable as well, and latest release is from 2008. Comments? OK to remove? Ok dcoppa
Re: UPDATE: devel/giblib (MASTER_SITES/HOMEPAGE)
Il 14 giu 2017 22:23, "Rafael Sadowski" ha scritto:
Hi All,
remove dead homepage url and fix MASTER_SITES (found via
https://www.archlinux.org/packages/extra/x86_64/giblib/).
Ok? Comments?
Best regards,
Rafael
Index: Makefile
===
RCS file: /cvs/ports/devel/giblib/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile16 Mar 2015 18:07:40 - 1.20
+++ Makefile14 Jun 2017 20:16:21 -
@@ -3,20 +3,18 @@
COMMENT= utility library including a imlib2 wrapper
DISTNAME= giblib-1.2.4
-REVISION = 6
+REVISION = 7
SHARED_LIBS= giblib 1.6 # .1.6
CATEGORIES=devel
-HOMEPAGE= http://www.linuxbrit.co.uk/giblib/
-
MAINTAINER=Victor Sahlstedt
# BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= X11 Xext freetype m xcb z
-MASTER_SITES= http://www.linuxbrit.co.uk/downloads/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=project/
slackbuildsdirectlinks/giblib/}
LIB_DEPENDS= graphics/imlib2
WANTLIB += Imlib2>=1
Ok dcoppa@
Ciao!
David
Re: git-2.13.1
On Mon, Jun 12, 2017 at 2:23 PM, Mikolaj Kucharski wrote: > On Mon, Jun 12, 2017 at 08:52:02AM +0200, Theo Buehler wrote: >> On Thu, Jun 08, 2017 at 09:44:07AM +0200, David Coppa wrote: >> > >> > Straightforward update to git-2.13.1. >> >> Hi, >> >> With this update, many of my repos started looking corrupted. Whatever I >> did generated messages like this: >> >> $ git status >> error: sha1 mismatch 12cc7ead7a435b5f2617e0a6c069bb6fcb155703 >> fatal: bad object HEAD >> $ git log >> error: sha1 mismatch 12cc7ead7a435b5f2617e0a6c069bb6fcb155703 >> fatal: bad object HEAD >> >> and git fsck only spits out tons of errors like this: >> >> error: sha1 mismatch for >> .git/objects/f9/cd88b8c0f7c4028cab06db0574af5d9c867fce (expected >> f9cd88b8c0f7c4028cab06db0574af5d9c867fce) >> error: f9cd88b8c0f7c4028cab06db0574af5d9c867fce: object corrupt or missing: >> .git/objects/f9/cd88b8c0f7c4028cab06db0574af5d9c867fce >> error: sha1 mismatch for >> .git/objects/fa/e5d73ad3484aab54ad2913af285855652daca6 (expected >> fae5d73ad3484aab54ad2913af285855652daca6) >> error: fae5d73ad3484aab54ad2913af285855652daca6: object corrupt or missing: >> .git/objects/fa/e5d73ad3484aab54ad2913af285855652daca6 >> >> [...] >> >> error: HEAD: invalid reflog entry e6eeef466d4ba8e6e61867bf0bf6f60f42ba4cf7 >> error: HEAD: invalid reflog entry 12cc7ead7a435b5f2617e0a6c069bb6fcb155703 >> error: refs/heads/master: invalid reflog entry >> 9b750e8e1b77f5a07feba5277e6d17ff0f959796 >> error: refs/heads/master: invalid reflog entry >> 9b750e8e1b77f5a07feba5277e6d17ff0f959796 >> >> [...] >> >> Reverting to 2.13.0p0 appears to have fixed all the problems I saw. > > Same here. I cannot `git fetch` from my own repos nor from > git.savannah.gnu.org or github.com with git version 2.13.1 Please update, a fix has been committed. Use git-2.13.1p0 Ciao! David
Re: pcsc-lite, MODULES -> COMPILER
Il 09 giu 2017 18:47, "Stuart Henderson" ha scritto: Hi, this diff is a noop for current mainstream arches, but will allow it to build on aarch64 (which has no ports GCC). COMPILER basically means "use the base compiler if it's modern, otherwise use one of the following ports compilers". OK? Ah yes, you're right... the new lingo. Please go ahead, ok with me. CC'ing to ports@ to show people how to do it. Index: Makefile === RCS file: /cvs/ports/security/pcsc-lite/Makefile,v retrieving revision 1.37 diff -u -p -r1.37 Makefile --- Makefile8 Jun 2017 19:34:03 - 1.37 +++ Makefile9 Jun 2017 16:42:57 - @@ -23,11 +23,11 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB= c pthread usb-1.0 -MODULES= gcc4 \ - lang/python +MODULES+= lang/python -MODGCC4_ARCHS= * -MODGCC4_LANGS= c +# thread-local storage +COMPILER= gcc +COMPILER_LANGS=c LIB_DEPENDS= devel/libusb1
git-2.13.1
Straightforward update to git-2.13.1.
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.170
diff -u -p -u -p -r1.170 Makefile
--- Makefile1 Jun 2017 19:58:04 - 1.170
+++ Makefile8 Jun 2017 07:43:18 -
@@ -4,12 +4,11 @@ COMMENT-main =GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V =2.13.0
+V =2.13.1
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
-REVISION = 0
CATEGORIES = devel
HOMEPAGE = http://git-scm.com/
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.130
diff -u -p -u -p -r1.130 distinfo
--- distinfo10 May 2017 08:05:04 - 1.130
+++ distinfo8 Jun 2017 07:43:18 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.13.0.tar.gz) = ny+oBA66/AwsquSp4ss4XG8WwFJbyw+9hJOLx5Y3LoA=
-SHA256 (git-manpages-2.13.0.tar.gz) =
52RyF5bK0XWkz5pK/n+0xPxXWC9vmm4hQjlJjgg1NVs=
-SIZE (git-2.13.0.tar.gz) = 6902610
-SIZE (git-manpages-2.13.0.tar.gz) = 659556
+SHA256 (git-2.13.1.tar.gz) = VJxeYtG96YyNaIyO2I0qm2gS5qhCpOsP5scLAbA0wGE=
+SHA256 (git-manpages-2.13.1.tar.gz) =
H+1vdmcWtN+5zuSr8nfgmjKxaTgs5uBVGpg1UDVavJw=
+SIZE (git-2.13.1.tar.gz) = 6910847
+SIZE (git-manpages-2.13.1.tar.gz) = 661156
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 patch-Makefile
--- patches/patch-Makefile 10 May 2017 08:05:04 - 1.70
+++ patches/patch-Makefile 8 Jun 2017 07:43:18 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.70 2017/05/
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -2311,7 +2311,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2318,7 +2318,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Re: mpd does not work on i386 (patch from FreeBSD)
Il 23 mag 2017 20:54, "Antoine Jacoutot" ha scritto:
OK aja
Landry,
Please go ahead with your update.
Thanks!
David
On Tue, May 23, 2017 at 08:16:47PM +0200, Landry Breuil wrote:
> On Tue, May 23, 2017 at 08:01:51PM +0200, Landry Breuil wrote:
> > On Tue, May 23, 2017 at 01:18:17PM -0400, Andre Smagin wrote:
> > > I think this is the relevant discussion about the same issue FreeBSD
had:
> > >
> > > https://github.com/MusicPlayerDaemon/MPD/issues/41
> > >
> > > This is the FreeBSD commit to fix it:
> > > https://svnweb.freebsd.org/ports/head/audio/musicpd/
files/patch-src_Compiler.h?revision=440334&view=markup
> > >
> > > "Fix library updating
> > > Details:
> > > Apparently, clang optimises exceptions with __attribute__((pure))
> > > more aggressively than gcc, causing mpd to not notice files removed
> > > from the library. This patch causes mpd to be built without the pure
> > > attribute."
> > >
> > >
> > > I am testing with this diff (from FreeBSD) now and at a first glance
> > > it seems to fix the database update problem:
> >
> > Good catch, testing it here too.
>
> Actually, we might aswell update to 0.20.8, which contains the fix
> commmited upstream (ie removing the gcc_pure usage) in
> https://github.com/MusicPlayerDaemon/MPD/commit/
788e3b31e1ab8243386339eaf136ede18f015d55
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/mpd/Makefile,v
> retrieving revision 1.103
> diff -u -r1.103 Makefile
> --- Makefile12 Mar 2017 10:13:49 - 1.103
> +++ Makefile23 May 2017 18:14:59 -
> @@ -2,7 +2,7 @@
>
> BROKEN-hppa = no atomic ops
> COMMENT = Music Player Daemon
> -VER = 0.20.6
> +VER = 0.20.8
> DISTNAME = mpd-${VER}
> CATEGORIES = audio
> HOMEPAGE = http://www.musicpd.org/
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/mpd/distinfo,v
> retrieving revision 1.44
> diff -u -r1.44 distinfo
> --- distinfo12 Mar 2017 10:13:49 - 1.44
> +++ distinfo23 May 2017 18:14:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (mpd-0.20.6.tar.gz) = HRTyzRcGcIpRm7yI8wqsgF+HkSOMoIN0r18IJYcfVQI=
> -SIZE (mpd-0.20.6.tar.gz) = 1091201
> +SHA256 (mpd-0.20.8.tar.gz) = RRlzEbbDAlUoFQTjamrvtHktAqGmM4xVaq1jN0vL73g=
> +SIZE (mpd-0.20.8.tar.gz) = 1093412
>
--
Antoine
Re: iridium: sync files/iridium with files/chrome
Il 25 apr 2017 14:22, "Caspar Schutijser" ha
scritto:
Hi,
I noticed that the wxallowed check that is in the startup script of
the chromium port is not present in the iridium port. Also, the chromium
port uses ${TRUEPREFIX} in the exec line.
Thanks,
Caspar Schutijser
Index: Makefile
===
RCS file: /cvs/ports/www/iridium/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile22 Apr 2017 11:53:55 - 1.59
+++ Makefile25 Apr 2017 12:13:52 -
@@ -11,6 +11,7 @@ V=57.0
DISTNAME= iridium-browser-${V}
PKGNAME= iridium-${V}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+REVISION= 0
CATEGORIES=www
Index: files/iridium
===
RCS file: /cvs/ports/www/iridium/files/iridium,v
retrieving revision 1.2
diff -u -p -r1.2 iridium
--- files/iridium 12 Aug 2015 10:56:13 - 1.2
+++ files/iridium 25 Apr 2017 12:13:52 -
@@ -22,6 +22,13 @@ if [ $(ulimit -Sn) -lt ${OPENFILES} ]; t
[ $? -eq 0 ] || exit
fi
+if ! mount | grep `df -h ${TRUEPREFIX} | tail -1 | awk '{print $6}'` |
+ grep -q wxallowed; then
+ echo "Filesystem containing ${TRUEPREFIX} must have the 'wxallowed'
flag" |
+ ${X11BASE}/bin/xmessage -file - -center -buttons exit:0
-default exit
+ exit
+fi
+
#
# Temporary workaround for the case when iridium crashes and leaves
# the SingletonLock, which prevents iridium to start up.
@@ -40,4 +47,4 @@ fi
#
[ -z ${LANG} ] && _l=en_US.UTF-8 || _l=${LANG}
-LANG=${_l} exec "/usr/local/iridium/iridium" "${@}"
+LANG=${_l} exec "${TRUEPREFIX}/iridium/iridium" "${@}"
Ok dcoppa@
Ciao!
David
Re: fix devel/sdl-pango build with clang
Il 22 apr 2017 05:30, "Jonathan Gray" ha scritto:
Freetype headers no longer define __FT2_BUILD_UNIX_H__.
Remove the ifdef to fix the clang build:
cc -DPACKAGE_NAME="" -DPACKAGE_TARNAME="" -DPACKAGE_VERSION=""
-DPACKAGE_STRING="" -DPACKAGE_BUGREPORT="" -DPACKAGE="SDL_Pango"
-DVERSION="0.1.2" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1
-DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1
-DBUILD_DLL -I. -I. -O2 -pipe -I/usr/local/include/pango-1.0
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include
-I/usr/local/include -I/usr/local/include/pango-1.0
-I/usr/local/include/harfbuzz -I/usr/local/include
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include
-I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -I/usr/include
-I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-I/usr/X11R6/include -DXTHREADS -MT SDL_Pango.lo -MD -MP -MF
.deps/SDL_Pango.Tpo -c SDL_Pango.c -fPIC -DPIC -o .libs/SDL_Pango.o
SDL_Pango.c:301:5: warning: 'g_type_init' is deprecated
[-Wdeprecated-declarations]
g_type_init();
^
/usr/local/include/glib-2.0/gobject/gtype.h:686:23: note: 'g_type_init' has
been explicitly marked deprecated here
void g_type_init(void);
^
SDL_Pango.c:345:5: warning: implicit declaration of function
'SDLPango_CopyFTBitmapToSurface'
is invalid in C99 [-Wimplicit-function-declaration]
SDLPango_CopyFTBitmapToSurface(
^
SDL_Pango.c:661:1: error: conflicting types for 'SDLPango_
CopyFTBitmapToSurface'
SDLPango_CopyFTBitmapToSurface(
^
SDL_Pango.c:345:5: note: previous implicit declaration is here
SDLPango_CopyFTBitmapToSurface(
^
SDL_Pango.c:735:24: warning: 'pango_ft2_font_map_create_context' is
deprecated [-Wdeprecated-declarations]
context->context = pango_ft2_font_map_create_context
(PANGO_FT2_FONT_MAP (context->font_map));
^
/usr/local/include/pango-1.0/pango/pangoft2.h:114:15: note:
'pango_ft2_font_map_create_context' has been explicitly marked deprecated
here
PangoContext *pango_ft2_font_map_create_context (PangoFT2FontMap
*fontmap);
^
SDL_Pango.c:1071:50: warning: implicit conversion from enumeration type
'SDLPango_Alignment' to different enumeration type 'PangoAlignment'
[-Wenum-conversion]
pango_layout_set_alignment (context->layout, alignment);
~~ ^
Index: patches/patch-src_SDL_Pango_h
===
RCS file: /cvs/ports/devel/sdl-pango/patches/patch-src_SDL_Pango_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_SDL_Pango_h
--- patches/patch-src_SDL_Pango_h 24 May 2007 13:38:11 -
1.1.1.1
+++ patches/patch-src_SDL_Pango_h 22 Apr 2017 03:24:48 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_SDL_Pango_h,v 1.1.1.1 2007/05/24 13:38:11 ajacoutot
Exp $
src/SDL_Pango.h.orig Tue Mar 27 10:12:28 2007
-+++ src/SDL_Pango.hTue Mar 27 10:16:11 2007
+--- src/SDL_Pango.h.orig Sat Apr 22 13:16:31 2017
src/SDL_Pango.hSat Apr 22 13:24:08 2017
@@ -47,10 +47,10 @@ typedef struct _SDLPango_Matrix {
} SDLPango_Matrix;
@@ -73,3 +73,21 @@ $OpenBSD: patch-src_SDL_Pango_h,v 1.1.1.
/*!
Specifies transparent back and transparent letter.
This is useful for KARAOKE like rendering.
+@@ -184,17 +184,11 @@ extern DECLSPEC void SDLCALL
SDLPango_SetBaseDirection
+ SDLPango_Context *context,
+ SDLPango_Direction direction);
+
+-
+-#ifdef __FT2_BUILD_UNIX_H__
+-
+ extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface(
+ const FT_Bitmap *bitmap,
+ SDL_Surface *surface,
+ const SDLPango_Matrix *matrix,
+ SDL_Rect *rect);
+-
+-#endif/* __FT2_BUILD_UNIX_H__ */
+-
+
+ #ifdef __PANGO_H__
+
OK with me.
Cheers,
dcoppa
Re: firefox 52 - crashes at startup or later due to oom
On Tue, Mar 14, 2017 at 11:21 AM, Sebastien Marie wrote: > On Tue, Mar 14, 2017 at 10:28:05AM +0100, Landry Breuil wrote: >> You can't sanely run a desktop session with any browser using the >> default limits anyway... > > I disagree. I run firefox with low memory pressure: > > 97871 semarie20 434M 320M sleep/1 poll 34:42 0.68% firefox > 95072 semarie20 338M 260M sleep/1 poll 27:04 0.34% firefox > > (with two processes due to e10n). > > My session has 12 tabs opened with 3 or 4 tabs javascript enabled. But I > agree my use of firefox isn't representative of common use-case (no > videos or other ressources consuming websites). > > The running process is firefox-52.0 patched for allocating 128 Mo for > javascript (instead of 1 Go). Try using maps.google.com ... ;)
Re: ghc.port.mk (was: Ports with hardcoded "gcc", "g++")
On Thu, Mar 2, 2017 at 11:35 PM, Matthias Kilian wrote:
> On Thu, Mar 02, 2017 at 09:23:25PM +0100, Matthias Kilian wrote:
>> Running an update bulk build with the diff below now for ghc-7.10.3,
>> to see wether it helps... however, all the hs-ports in my tree are still
>> updated for ghc-8.0.1, so I've no idea wether I'll see anything useful.
>>
>> Also, I've no idea wether --with-clang=${CC} will work after the
>> switch to clang.
>
> Sigh... cabal ports don't't support --with-clang (in contrast to
> ghc, if I didn't misread its configure and build magic). New diff
> below (and I've already failures from pkg_create, which is a *good*
> sign, because it means my (ahead of head) hs-ports at least don't
> fail to build).
>
>
> Index: ghc.port.mk
> ===
> RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
> retrieving revision 1.38
> diff -u -p -r1.38 ghc.port.mk
> --- ghc.port.mk 20 Jan 2016 16:08:29 - 1.38
> +++ ghc.port.mk 2 Mar 2017 22:23:03 -
> @@ -56,7 +56,7 @@ DIST_SUBDIR ?=ghc
> . if ${MODGHC_BUILD:L:Mcabal}
> MODGHC_SETUP_SCRIPT ?= Setup.lhs Setup.hs
> MODGHC_SETUP_PROG ?= ${WRKSRC}/Setup
> -MODGHC_SETUP_CONF_ARGS ?=
> +MODGHC_SETUP_CONF_ARGS += --with-gcc=${CC}
> MODGHC_SETUP_CONF_ENV ?=
>
> . if !${MODGHC_BUILD:L:Mnort}
>
ok dcoppa@
Ciao!
David
Re: HOMEPAGE and MASTER_SITES: devel/libevent2
Ok with me.
Ciao!
David
Il 28 feb 2017 18:32, "Rafael Sadowski" ha scritto:
- Switch to HTTPS
- fix MASTER_SITES
Index: Makefile
===
RCS file: /cvs/ports/devel/libevent2/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile11 Mar 2016 19:59:13 - 1.13
+++ Makefile28 Feb 2017 17:29:53 -
@@ -5,9 +5,9 @@ COMMENT=event notification library
V= 2.0.22
DISTNAME= libevent-$V-stable
PKGNAME= libevent-$V
-REVISION= 0
+REVISION= 1
CATEGORIES=devel
-HOMEPAGE= http://libevent.org/
+HOMEPAGE= https://libevent.org/
SHARED_LIBS+= event_core 1.1 # 6.9
SHARED_LIBS+= event_extra 0.1 # 6.9
@@ -17,7 +17,7 @@ SHARED_LIBS+= event_pthreads 0.0 # 6.9
# BSD
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=levent/}
+MASTER_SITES= https://github.com/libevent/libevent/releases/download/
release-${V}-stable/
WANTLIB= crypto pthread ssl
Re: spring cleanup, old scripts removal
On Mon, Feb 20, 2017 at 10:13 AM, Marc Espie wrote: > I'd like to remove > extract-dependencies > find-build-order > (dpb does it and more) > > portslogger > (haven't used it in ages, again, dpb) > > and maybe > retrieve-index > does anyone actually use that one ? > > (personally, I do either grep on INDEX, or I use > sqlports whenever I really need something) > I use portslogger a lot, for the others I don't care (never used them). Ciao! David
Re: libev: less hacks for arm
On Sun, Feb 19, 2017 at 11:27 AM, Jeremie Courreges-Anglas wrote: > > Hi, > > so libev previously needed a hack to build on arm (and sparc). > "SMP" support was disabled to avoid the need for sync assembly > instructions. Now that cc advertize support for __ARM_ARCH_6K__ we can > use the mcr instruction, and don't need any hack. > > cubox /tmp$ cc -E -dM - < /dev/null | grep ARM > #define __ARMEL__ 1 > #define __ARM_ARCH_6K__ 1 > #define __ARM_EABI__ 1 > > With the patches below, the various libev ports still work fine on my > cubox. > > ok? Sure, ok with me. Thanks! David
Re: wpa_supplicant: set DEFAULT_AP_SCAN 0 on OpenBSD
On Wed, Feb 8, 2017 at 12:24 PM, Stuart Henderson wrote: > Since it's not supported on OpenBSD, it doesn't make much sense for > wpa_supplicant to default to scanning. OK? > > Index: Makefile > === > RCS file: /cvs/ports/security/wpa_supplicant/Makefile,v > retrieving revision 1.34 > diff -u -p -r1.34 Makefile > --- Makefile7 Oct 2016 14:44:03 - 1.34 > +++ Makefile8 Feb 2017 11:23:17 - > @@ -3,6 +3,7 @@ > COMMENT= IEEE 802.1X supplicant > > DISTNAME= wpa_supplicant-2.6 > +REVISION= 0 > CATEGORIES=security net > > HOMEPAGE= http://w1.fi/wpa_supplicant/ > Index: patches/patch-wpa_supplicant_config_h > === > RCS file: patches/patch-wpa_supplicant_config_h > diff -N patches/patch-wpa_supplicant_config_h > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-wpa_supplicant_config_h 8 Feb 2017 11:23:17 - > @@ -0,0 +1,24 @@ > +$OpenBSD$ > +--- wpa_supplicant/config.h.orig Wed Feb 8 11:22:05 2017 > wpa_supplicant/config.hWed Feb 8 11:22:57 2017 > +@@ -10,11 +10,15 @@ > + #define CONFIG_H > + > + #define DEFAULT_EAPOL_VERSION 1 > +-#ifdef CONFIG_NO_SCAN_PROCESSING > +-#define DEFAULT_AP_SCAN 2 > +-#else /* CONFIG_NO_SCAN_PROCESSING */ > +-#define DEFAULT_AP_SCAN 1 > +-#endif /* CONFIG_NO_SCAN_PROCESSING */ > ++#ifdef __OpenBSD__ > ++# define DEFAULT_AP_SCAN 0 > ++#else > ++# ifdef CONFIG_NO_SCAN_PROCESSING > ++#define DEFAULT_AP_SCAN 2 > ++# else /* CONFIG_NO_SCAN_PROCESSING */ > ++#define DEFAULT_AP_SCAN 1 > ++# endif /* CONFIG_NO_SCAN_PROCESSING */ > ++#endif > + #define DEFAULT_USER_MPM 1 > + #define DEFAULT_MAX_PEER_LINKS 99 > + #define DEFAULT_MESH_MAX_INACTIVITY 300 > OK. You can even remove "ap_scan=0" from the default config file (files/wpa_supplicant.conf)... Ciao! David
Re: games/hedgewars EAccessViolation on game start
On Sat, Feb 4, 2017 at 11:12 AM, Adam Wolk wrote:
> Not that I know of but the diff removes a hardcoded -O2 passed to ghc.
>
> The port in general hardcodes -O2 in a couple of places:
> CMakeLists.txt
> 89:add_flag_append(CMAKE_C_FLAGS_RELEASE "-O2")
> 92:add_flag_append(CMAKE_CXX_FLAGS_RELEASE "-O2")
> 113:list(APPEND haskell_flags ${ghflags_parsed} "-O2")
>
> cmake_modules/CMakePascalInformation.cmake
> 14:set(CMAKE_Pascal_FLAGS_RELEASE_INIT "-O2 -dNDEBUG")
> 15:set(CMAKE_Pascal_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -gl -gp")
>
> cmake_modules/CMakePascalInformation.cmake.orig
> 14:set(CMAKE_Pascal_FLAGS_RELEASE_INIT "-O2 -dNDEBUG")
> 15:set(CMAKE_Pascal_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -gl -gp")
>
> should we patch out the -O2 optimization regardless if bulks break?
Some time ago I ran a full sweep of the hardcoded optimization flags
wrt cmake-based ports.
I might have missed these or they have been readded later... I don't
know, but I'm in favor of removing them.
Ciao!
David
Re: [UPDATE] audio/mpd - now with sndio support
On Sat, Jan 28, 2017 at 10:28 PM, Christopher Zimmermann wrote: > Hi, > > > this time with the diff attached. > > mpd has had sndio support for quite some time now, but not in our ports > tree. So here's an update. Our g++ doesn't support constexpr with > switch/case statements, therefore use clang. > > OK? Works fine, ok dcoppa@ Thanks a lot! David
Re: LibreOffice Crash if started other than opening a document
On Wed, Jan 11, 2017 at 11:55 AM, Robert Nagy wrote: > Try a different window manager. Or you can try with wmname. Install wmname with 'pkg_add wmname' And then put: /usr/local/bin/wmname LG3D into your ~/.xinitrc right before the line that exec your window manager... Ciao! David > On (2017-01-09 18:28), Ed Ahlsen-Girard wrote: >> > I had similar issue, was not even aware of it. For me following >> > command makes it work again: >> > >> > rm -rf ~/.config/libreoffice >> > >> > It was on: >> > >> > OpenBSD 6.0-current (GENERIC.MP) #97: Tue Jan 3 00:47:09 MST 2017 >> > bu...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP >> > >> > with libreoffice-5.2.4.2p0v0 packaged at 2017-01-05T14:48:47Z >> > >> > >> > On Thu, Jan 05, 2017 at 09:30:08PM -0600, Ed Ahlsen-Girard wrote: >> > > First message December 21, no replies. Text below is the Document >> > > Foundation bugzilla bug and exchange with developers there. >> > > >> > > I'm baffled that nobody else seems to has seen this. >> > > >> > > Description: >> > > If LibreOffice is opened from the command line or from the cwm start >> > > menu, it displays a dialog box to the effect that due to an >> > > unexpected error, LibreOffice crashed, that documents that had been >> > > open will be recovered. In the case when there had not be a real >> > > crash, the are no files in the list to choose recovery for. Closing >> > > the dialog box ends the program. If the command line is used, this >> > > error appears in the terminal window: Warning: failed to launch >> > > javaldx - java may not function correctly >> > ... >> > >> > -- >> > best regards >> > q# >> >> Thanks, I've tried that, and it works the first time. The issue always >> comes back. >> >> -- >> >> Edward Ahlsen-Girard >> Ft Walton Beach, FL >> > -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
Update to git-2.11.0 + fixes
Hi,
The diff below updates git to the latest release and fixes some
bugs in the tests.
Results:
fixed 2
success 13909
failed 0
broken 192
total 14372
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.164
diff -u -p -u -p -r1.164 Makefile
--- Makefile14 Nov 2016 08:10:59 - 1.164
+++ Makefile4 Dec 2016 09:10:34 -
@@ -4,12 +4,11 @@ COMMENT-main =GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V =2.10.2
+V =2.11.0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
-REVISION-main =0
CATEGORIES = devel
HOMEPAGE = http://git-scm.com/
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.125
diff -u -p -u -p -r1.125 distinfo
--- distinfo4 Nov 2016 09:43:29 - 1.125
+++ distinfo4 Dec 2016 09:10:34 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.10.2.tar.gz) = PX7yddgLl6qmHztr6dPcUWIC5vb12IXywJtZ66WS3MQ=
-SHA256 (git-manpages-2.10.2.tar.gz) =
HqtTgz+7Qy6ck23UalvrbSXS+ui+JY3vUDscIae/U2M=
-SIZE (git-2.10.2.tar.gz) = 6065116
-SIZE (git-manpages-2.10.2.tar.gz) = 636509
+SHA256 (git-2.11.0.tar.gz) = 076ZYceZViVl8VjOW4NuK5DzhQLTmSoRXftlPXgl/X4=
+SHA256 (git-manpages-2.11.0.tar.gz) =
Q3oBKKzXB+3OJOGjEKsvCfmgnuQt5YqOdkE2IBLc/iI=
+SIZE (git-2.11.0.tar.gz) = 6234127
+SIZE (git-manpages-2.11.0.tar.gz) = 644066
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 patch-Makefile
--- patches/patch-Makefile 4 Nov 2016 09:43:30 - 1.65
+++ patches/patch-Makefile 4 Dec 2016 09:10:34 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.65 2016/11/04 09:43:30 dcoppa Exp $
Makefile.orig Fri Oct 28 21:34:16 2016
-+++ Makefile Tue Nov 1 19:19:33 2016
-@@ -2270,7 +2270,7 @@ export TEST_NO_MALLOC_CHECK
+--- Makefile.orig Tue Nov 29 22:06:51 2016
Makefile Fri Dec 2 16:09:37 2016
+@@ -2274,7 +2274,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-gitweb_gitweb_perl
===
RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl25 May 2016 07:13:05 - 1.27
+++ patches/patch-gitweb_gitweb_perl4 Dec 2016 09:10:34 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-gitweb_gitweb_perl,v 1.2
This prevents the following error: '-T and -B not implemented on filehandles'
gitweb/gitweb.perl.origThu May 19 19:17:58 2016
-+++ gitweb/gitweb.perl Wed May 25 08:57:20 2016
-@@ -6988,7 +6988,7 @@ sub git_blob_plain {
+--- gitweb/gitweb.perl.origTue Nov 29 22:06:51 2016
gitweb/gitweb.perl Fri Dec 2 16:09:37 2016
+@@ -7003,7 +7003,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@@ -13,7 +13,7 @@ This prevents the following error: '-T a
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
-@@ -7050,7 +7050,7 @@ sub git_blob {
+@@ -7065,7 +7065,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');
Index: patches/patch-t_t1450-fsck_sh
===
RCS file: patches/patch-t_t1450-fsck_sh
diff -N patches/patch-t_t1450-fsck_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-t_t1450-fsck_sh 4 Dec 2016 09:10:34 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Avoid GNU grep syntax
+
+--- t/t1450-fsck.sh.orig Fri Dec 2 17:04:45 2016
t/t1450-fsck.shFri Dec 2 17:06:36 2016
+@@ -553,7 +553,7 @@ test_expect_success 'fsck --name-objects' '
+ remove_loose_object $(git rev-parse julius:caesar.t) &&
+ test_must_fail git fsck --name-objects >out &&
+ tree=$(git rev-parse --verify julius:) &&
+- grep "$tree (\(refs/heads/master\|HEAD\)@{[0-9]*}:" out
++ grep -E "$tree \(refs/heads/master|HEAD@{[0-9]*}:" out
+ )
+ '
+
Index: patches/patch-t_t4062-diff-pickaxe_sh
===
RCS file: patches/patch-t_t4062-diff-pickaxe_sh
diff -N patches/patch-t_t4062-diff-pickaxe_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-t_t4062-diff-pickaxe_sh 4 Dec 2016 09:10:34 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+RE_DUP_MAX is 255 on OpenBSD, while it's 32767 on Linux
+
+--- t/t4062-diff-pickaxe.sh.orig Sat Dec 3 20:10:24 2016
t/t4062-diff-pickaxe.shSat Dec 3 20:13:12 2016
+@@ -15,7 +15,7 @@ test
Re: Let's remove sysutils/lsof
Il 1 dicembre 2016 14:04:30 CET, Jeremie Courreges-Anglas ha scritto: >Jiri B writes: > >>> lsof is a problem. It is tightly coupled to the base system, enough >to >>> require /usr/src/sys checked out to be able to build it. This means >>> that it breaks quite frequently: >> >> Correcting Pascal's mail... >> >> IMO lsof is used because BSD' netstat >> doesn't show PID of a process with open sockets. fstat could be >> used with little filter effort. > >net/arm could indeed be easily patched to use fstat output, sthen@ >proposed an initial patch for this: > > http://marc.info/?l=openbsd-ports&m=147445148420200&w=2 > >More code is needed to completely replace the lsof bits. Someone who's >interested in tor / arm could take a look at this. > >However this is unrelated to whether we should keep lsof or not. >Testing shows that currently net/arm works *because* it can't use lsof. lsof has always caused troubles in the past, and it doesn't work well. Imho it's time to kill it. Ciao, David
Re: New port devel/libuv, a new dependency for CMake-3.7.0
On Sat, 26 Nov 2016, Martin Pieuchot wrote: > On 26/11/16(Sat) 14:51, David Coppa wrote: > > On Sat, Nov 26, 2016 at 2:47 PM, Stuart Henderson > > wrote: > > > On 2016/11/26 13:59, David Coppa wrote: > > >> > > >> Hi. > > >> > > >> Here's a new port for libuv-1.10.1, a new dependency for the upcoming > > >> update to CMake-3.7.0. > > >> > > >> Feedback welcome! > > > > > >> WANTLIB += kvm pthread > > > > > > ugh kvm.. > > > > Yes, the openbsd backend uses kvm. > > Are you sure? > > $ grep kvm libuv/src/unix/openbsd.c > #include > > It looks like only the netbsd and freebsd backends do kvm(3) > functions. Indeed, kvm is not really needed... I've attached an updated port. Same tests still failing as before. Thanks! David libuv_rev2.tar.gz Description: application/tar-gz
Re: UPDATE: cmake-3.7.0
On Sat, 26 Nov 2016, David Coppa wrote: > > Hi again, > > Here's the update to cmake-3.7.0. > > It depends on the new port "devel/libuv" I've sent in my previous > mail. > > I'd like to have it tested in a ports bulk build... New diff: + Switch to https for HOMEPAGE, as requested by Rafael + Disable server-mode -> no need for libuv Please put it in your next bulk build. Ciao! David cmake-3.7.0_rev2.diff.gz Description: application/gunzip
Re: New port devel/libuv, a new dependency for CMake-3.7.0
On Sat, 26 Nov 2016, David Coppa wrote: > Same failures I have on amd64, I'll have a look at them when time permits... Even better... This port doesn't inspire too much confidence and it's only used for the new server mode feature of cmake, which is not indispensable to us. So, I'm dropping it for now, and disable the optional server-mode in cmake. Please look at the other thread on ports@ for a new CMake-3.7.0 diff. Ciao! David
Re: New port devel/libuv, a new dependency for CMake-3.7.0
On Sat, Nov 26, 2016 at 2:47 PM, Stuart Henderson wrote: > On 2016/11/26 13:59, David Coppa wrote: >> >> Hi. >> >> Here's a new port for libuv-1.10.1, a new dependency for the upcoming >> update to CMake-3.7.0. >> >> Feedback welcome! > >> WANTLIB += kvm pthread > > ugh kvm.. Yes, the openbsd backend uses kvm. > Builds and packages OK on i386. (As a cmake dep we'll need to check that on > as many arches as possible). I see a few test failures: > > not ok 65 - tcp_connect_timeout > # exit code 134 > # Output from process `tcp_connect_timeout`: > # Assertion failed in test/test-tcp-connect-timeout.c on line 84: r == 0 > > not ok 66 - tcp_close_while_connecting > # exit code 134 > # Output from process `tcp_close_while_connecting`: > # Assertion failed in test/test-tcp-close-while-connecting.c on line 80: r == > 0 > > not ok 170 - process_title > # exit code 139 > # Output from process `process_title`: (no output) > > not ok 192 - poll_bad_fdtype > # exit code 134 > # Output from process `poll_bad_fdtype`: > # Assertion failed in test/test-poll.c on line 607: 0 != > uv_poll_init(uv_default_loop(), &poll_handle, fd) > > not ok 193 - poll_nested_kqueue > # exit code 134 > # Output from process `poll_nested_kqueue`: > # Assertion failed in test/test-poll.c on line 646: 0 == > uv_poll_init(uv_default_loop(), &poll_handle, fd) > > not ok 247 - fs_realpath > # exit code 134 > # Output from process `fs_realpath`: > # Assertion failed in test/test-fs.c on line 1613: req.ptr == NULL > Same failures I have on amd64, I'll have a look at them when time permits... Thanks! David
UPDATE: cmake-3.7.0
Hi again, Here's the update to cmake-3.7.0. It depends on the new port "devel/libuv" I've sent in my previous mail. I'd like to have it tested in a ports bulk build... TIA! David cmake-3.7.0.diff.gz Description: application/gunzip
New port devel/libuv, a new dependency for CMake-3.7.0
Hi. Here's a new port for libuv-1.10.1, a new dependency for the upcoming update to CMake-3.7.0. Feedback welcome! Ciao, David ---8<--- libuv is a multi-platform support library with a focus on asynchronous I/O. Feature highlights: + Full-featured event loop backed by epoll, kqueue, IOCP, event ports + Asynchronous TCP and UDP sockets + Asynchronous DNS resolution + Asynchronous file and file system operations + File system events + ANSI escape code controlled TTY + IPC with socket sharing, using Unix domain sockets or named pipes (Windows) + Child processes + Thread pool + Signal handling + High resolution clock + Threading and synchronization primitives libuv.tar.gz Description: application/tar-gz
Re: Another gstreamer security problem
On Wed, 23 Nov 2016, David Coppa wrote:
> Another gstreamer exploit by Chris Evans:
>
> https://scarybeastsecurity.blogspot.it/2016/11/0day-exploit-advancing-exploitation.html
>
> This time, we have patches for both gstreamer-0.10 and gstreamer1
> (from upstream).
>
> Ok for the diff below?
Fixed diff for gstreamer1 below.
Sorry, I've crossed the streams :(
Index: Makefile
===
RCS file: /cvs/ports/multimedia/gstreamer1/plugins-good/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile2 Nov 2016 22:19:52 - 1.42
+++ Makefile23 Nov 2016 11:29:30 -
@@ -12,6 +12,8 @@ PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-
PKGNAME-main= ${PKGNAME}
PKGNAME-pulse= ${GST_PKGNAME_PREFIX}-plugins-pulse-${V}
+REVISION-main= 0
+
MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-good/}
WANTLIB += ffi glib-2.0 gmodule-2.0 gobject-2.0 gstaudio-1.0 gstbase-1.0
Index: patches/patch-gst_flx_gstflxdec_c
===
RCS file: patches/patch-gst_flx_gstflxdec_c
diff -N patches/patch-gst_flx_gstflxdec_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-gst_flx_gstflxdec_c 23 Nov 2016 11:29:30 -
@@ -0,0 +1,306 @@
+$OpenBSD$
+
+From 2e203a79b7d9af4029307c1a845b3c148d5f5e62 Mon Sep 17 00:00:00 2001
+From: Matthew Waters
+Date: Tue, 22 Nov 2016 19:05:00 +1100
+Subject: flxdec: add some write bounds checking
+
+Without checking the bounds of the frame we are writing into, we can
+write off the end of the destination buffer.
+
+https://scarybeastsecurity.blogspot.dk/2016/11/0day-exploit-advancing-exploitation.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=774834
+
+--- gst/flx/gstflxdec.c.orig Fri Nov 4 18:07:09 2016
gst/flx/gstflxdec.cWed Nov 23 12:13:57 2016
+@@ -74,9 +74,9 @@ static gboolean gst_flxdec_src_query_handler (GstPad *
+ GstQuery * query);
+
+ static void flx_decode_color (GstFlxDec *, guchar *, guchar *, gint);
+-static void flx_decode_brun (GstFlxDec *, guchar *, guchar *);
+-static void flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *);
+-static void flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
++static gboolean flx_decode_brun (GstFlxDec *, guchar *, guchar *);
++static gboolean flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *);
++static gboolean flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
+
+ #define rndalign(off) ((off) + ((off) & 1))
+
+@@ -203,13 +203,14 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstObject
+ return ret;
+ }
+
+-static void
++static gboolean
+ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
+ guchar * dest)
+ {
+ FlxFrameChunk *hdr;
++ gboolean ret = TRUE;
+
+- g_return_if_fail (data != NULL);
++ g_return_val_if_fail (data != NULL, FALSE);
+
+ while (count--) {
+ hdr = (FlxFrameChunk *) data;
+@@ -228,17 +229,17 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, g
+ break;
+
+ case FLX_BRUN:
+-flx_decode_brun (flxdec, data, dest);
++ret = flx_decode_brun (flxdec, data, dest);
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+
+ case FLX_LC:
+-flx_decode_delta_fli (flxdec, data, dest);
++ret = flx_decode_delta_fli (flxdec, data, dest);
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+
+ case FLX_SS2:
+-flx_decode_delta_flc (flxdec, data, dest);
++ret = flx_decode_delta_flc (flxdec, data, dest);
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+
+@@ -256,7 +257,12 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, g
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+ }
++
++if (!ret)
++ break;
+ }
++
++ return ret;
+ }
+
+
+@@ -289,13 +295,13 @@ flx_decode_color (GstFlxDec * flxdec, guchar * data, g
+ }
+ }
+
+-static void
++static gboolean
+ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest)
+ {
+ gulong count, lines, row;
+ guchar x;
+
+- g_return_if_fail (flxdec != NULL);
++ g_return_val_if_fail (flxdec != NULL, FALSE);
+
+ lines = flxdec->hdr.height;
+ while (lines--) {
+@@ -313,12 +319,21 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, gu
+ if (count > 0x7f) {
+ /* literal run */
+ count = 0x100 - count;
++if ((glong) row - (glong) count < 0) {
++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
++ return FALSE;
++}
+ row -= count;
+
+ while (count--)
+ *dest++ = *data++;
+
+ } else {
++if ((glong) row - (glong) count < 0) {
++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
++ return FALSE;
++}
Another gstreamer security problem
Another gstreamer exploit by Chris Evans:
https://scarybeastsecurity.blogspot.it/2016/11/0day-exploit-advancing-exploitation.html
This time, we have patches for both gstreamer-0.10 and gstreamer1
(from upstream).
Ok for the diff below?
Index: gstreamer-0.10/plugins-good/Makefile
===
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-good/Makefile,v
retrieving revision 1.101
diff -u -p -u -p -r1.101 Makefile
--- gstreamer-0.10/plugins-good/Makefile26 Oct 2016 12:35:08 -
1.101
+++ gstreamer-0.10/plugins-good/Makefile23 Nov 2016 10:57:07 -
@@ -18,7 +18,7 @@ PKGNAME-dv= gstreamer-dv-${V}
PKGNAME-caca= gstreamer-libcaca-${V}
EPOCH-main=0
-REVISION-main= 17
+REVISION-main= 18
REVISION-aalib=8
REVISION-dv= 8
REVISION-caca= 8
Index: gstreamer-0.10/plugins-good/patches/patch-gst_flx_gstflxdec_c
===
RCS file: gstreamer-0.10/plugins-good/patches/patch-gst_flx_gstflxdec_c
diff -N gstreamer-0.10/plugins-good/patches/patch-gst_flx_gstflxdec_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ gstreamer-0.10/plugins-good/patches/patch-gst_flx_gstflxdec_c 23 Nov
2016 10:57:07 -
@@ -0,0 +1,300 @@
+$OpenBSD$
+
+From ec66c7c584f0b41c98e93758d9b53bd6dd582df2 Mon Sep 17 00:00:00 2001
+From: Matthew Waters
+Date: Tue, 22 Nov 2016 19:05:00 +1100
+Subject: flxdec: add some write bounds checking
+
+Without checking the bounds of the frame we are writing into, we can
+write off the end of the destination buffer.
+
+https://scarybeastsecurity.blogspot.dk/2016/11/0day-exploit-advancing-exploitation.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=774834
+
+--- gst/flx/gstflxdec.c.orig Fri Dec 30 14:59:09 2011
gst/flx/gstflxdec.cWed Nov 23 11:18:08 2016
+@@ -70,9 +70,9 @@ static gboolean gst_flxdec_src_event_handler (GstPad *
+ static gboolean gst_flxdec_sink_event_handler (GstPad * pad, GstEvent *
event);
+
+ static void flx_decode_color (GstFlxDec *, guchar *, guchar *, gint);
+-static void flx_decode_brun (GstFlxDec *, guchar *, guchar *);
+-static void flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *);
+-static void flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
++static gboolean flx_decode_brun (GstFlxDec *, guchar *, guchar *);
++static gboolean flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *);
++static gboolean flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
+
+ #define rndalign(off) ((off) + ((off) & 1))
+
+@@ -225,13 +225,14 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstEvent
+ return ret;
+ }
+
+-static void
++static gboolean
+ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
+ guchar * dest)
+ {
+ FlxFrameChunk *hdr;
++ gboolean ret = TRUE;
+
+- g_return_if_fail (data != NULL);
++ g_return_val_if_fail (data != NULL, FALSE);
+
+ while (count--) {
+ hdr = (FlxFrameChunk *) data;
+@@ -250,17 +251,17 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, g
+ break;
+
+ case FLX_BRUN:
+-flx_decode_brun (flxdec, data, dest);
++ret = flx_decode_brun (flxdec, data, dest);
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+
+ case FLX_LC:
+-flx_decode_delta_fli (flxdec, data, dest);
++ret = flx_decode_delta_fli (flxdec, data, dest);
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+
+ case FLX_SS2:
+-flx_decode_delta_flc (flxdec, data, dest);
++ret = flx_decode_delta_flc (flxdec, data, dest);
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+
+@@ -278,7 +279,12 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, g
+ data += rndalign (hdr->size) - FlxFrameChunkSize;
+ break;
+ }
++
++if (!ret)
++ break;
+ }
++
++ return ret;
+ }
+
+
+@@ -311,13 +317,13 @@ flx_decode_color (GstFlxDec * flxdec, guchar * data, g
+ }
+ }
+
+-static void
++static gboolean
+ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest)
+ {
+ gulong count, lines, row;
+ guchar x;
+
+- g_return_if_fail (flxdec != NULL);
++ g_return_val_if_fail (flxdec != NULL, FALSE);
+
+ lines = flxdec->hdr.height;
+ while (lines--) {
+@@ -335,12 +341,21 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, gu
+ if (count > 0x7f) {
+ /* literal run */
+ count = 0x100 - count;
++if ((glong) row - (glong) count < 0) {
++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
++ return FALSE;
++}
+ row -= count;
+
+ while (count--)
+ *dest++ = *data++;
+
+ } else {
++if ((glong) row - (glong) count < 0) {
++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
++ return FALSE;
++
Re: UPDATE: /devel/ninja 1.7.1 -> 1.7.2
On Sat, Nov 19, 2016 at 1:45 PM, Stuart Henderson wrote: > On 2016/11/18 19:25, Rafael Sadowski wrote: >> > To save time for testing, which ports did you try it with? (It will >> > need testing with at least a selection of cmake things, plus one of >> > chromium/iridium). >> >> Successful chromium-54.0.2840.100 build with ninja 1.7.2. > > Thanks, I think this is enough. It works for cmake too. > I just noticed this though: > > On 2016/11/13 20:57, Rafael Sadowski wrote: >> - add post-install to compile ninja_syntax.py > > I don't think this is useful, pyc files are only for things which > are imported. Agreed. I think this update can be committed, without the post-install, as Stuart said. Thanks! David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
ggstreamer-plugins-bad: disable NSF
Hi!
Even if OpenBSD shouldn't be vulnerable, the plugin itself is bugged
(and not so useful either):
http://scarybeastsecurity.blogspot.it/2016/11/0day-exploit-compromising-linux-desktop.html
So, why not disabling it?
Ubuntu did the same:
https://bugs.launchpad.net/ubuntu/+source/gst-plugins-bad0.10/+bug/1641700
Cheers,
David
Index: Makefile
===
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/Makefile,v
retrieving revision 1.93
diff -u -p -u -p -r1.93 Makefile
--- Makefile4 Nov 2016 11:35:19 - 1.93
+++ Makefile15 Nov 2016 19:43:54 -
@@ -12,7 +12,7 @@ PKGNAME-main= gstreamer-plugins-bad-${V
PKGNAME-neon= gstreamer-neon-${V}
PKGNAME-mjpeg= gstreamer-mjpeg-${V}
-REVISION-main= 24
+REVISION-main= 25
REVISION-mjpeg=10
REVISION-neon= 11
@@ -101,6 +101,7 @@ CONFIGURE_ARGS= --disable-acm \
--disable-musicbrainz \
--disable-mythtv \
--disable-nas \
+ --disable-nsf \
--disable-ofa \
--disable-openal \
--disable-opencv \
Index: patches/patch-gst_nsf_gstnsf_c
===
RCS file: patches/patch-gst_nsf_gstnsf_c
diff -N patches/patch-gst_nsf_gstnsf_c
--- patches/patch-gst_nsf_gstnsf_c 6 Sep 2012 14:30:59 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gst_nsf_gstnsf_c,v 1.5 2012/09/06 14:30:59 ajacoutot Exp $
-
-nsf_init -> gstnsf_init to prevent symbol conflict with security/nss
-
gst/nsf/gstnsf.c.orig Fri Dec 30 19:24:33 2011
-+++ gst/nsf/gstnsf.c Mon Mar 5 14:44:23 2012
-@@ -168,7 +168,7 @@ gst_nsfdec_class_init (GstNsfDec * klass)
- GST_DEBUG_CATEGORY_INIT (nsfdec_debug, "nsfdec", 0,
- "NES sound file (nsf) decoder");
-
-- nsf_init ();
-+ gstnsf_init ();
- }
-
- static void
Index: patches/patch-gst_nsf_nsf_c
===
RCS file: patches/patch-gst_nsf_nsf_c
diff -N patches/patch-gst_nsf_nsf_c
--- patches/patch-gst_nsf_nsf_c 6 Sep 2012 14:30:59 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gst_nsf_nsf_c,v 1.2 2012/09/06 14:30:59 ajacoutot Exp $
-
-nsf_init -> gstnsf_init to prevent symbol conflict with security/nss
-
gst/nsf/nsf.c.orig Thu Nov 27 13:08:14 2008
-+++ gst/nsf/nsf.c Thu Nov 27 13:08:46 2008
-@@ -376,7 +376,7 @@ nes_shutdown (nsf_t * nsf)
- }
-
- int
--nsf_init (void)
-+gstnsf_init (void)
- {
- nes6502_init ();
- return 0;
Index: patches/patch-gst_nsf_nsf_h
===
RCS file: patches/patch-gst_nsf_nsf_h
diff -N patches/patch-gst_nsf_nsf_h
--- patches/patch-gst_nsf_nsf_h 6 Sep 2012 14:30:59 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gst_nsf_nsf_h,v 1.2 2012/09/06 14:30:59 ajacoutot Exp $
-
-nsf_init -> gstnsf_init to prevent symbol conflict with security/nss
-
gst/nsf/nsf.h.orig Thu Nov 27 13:08:22 2008
-+++ gst/nsf/nsf.h Thu Nov 27 13:08:56 2008
-@@ -132,7 +132,7 @@ struct nsf_loader_t {
- };
-
- /* Function prototypes */
--extern int nsf_init(void);
-+extern int gstnsf_init(void);
-
- extern nsf_t * nsf_load_extended(struct nsf_loader_t * loader);
- extern nsf_t *nsf_load(const char *filename, void *source, int length);
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 PLIST-main
--- pkg/PLIST-main 23 Apr 2015 11:55:02 - 1.25
+++ pkg/PLIST-main 15 Nov 2016 19:43:54 -
@@ -100,7 +100,6 @@ lib/gstreamer-${VERSION}/libgstmpegvideo
lib/gstreamer-${VERSION}/libgstmusepack.so
lib/gstreamer-${VERSION}/libgstmve.so
lib/gstreamer-${VERSION}/libgstmxf.so
-lib/gstreamer-${VERSION}/libgstnsf.so
lib/gstreamer-${VERSION}/libgstnuvdemux.so
lib/gstreamer-${VERSION}/libgstopus.so
lib/gstreamer-${VERSION}/libgstpatchdetect.so
Re: lang/gcc/4.9: update dependency on gmp
Il 15 novembre 2016 10:52:10 CET, Tobias Ulmer ha scritto:
>The respun adastrap has introduced a hard dependency on gmp 6.1.1,
>save people some debug time:
>
>Index: Makefile
>===
>RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.9/Makefile,v
>retrieving revision 1.44
>diff -u -p -r1.44 Makefile
>--- Makefile 11 Nov 2016 20:13:43 - 1.44
>+++ Makefile 15 Nov 2016 09:47:21 -
>@@ -207,7 +207,7 @@ WANTLIB-main = ${WANTLIB}
> WANTLIB-ada = ${WANTLIB} pthread util
> WANTLIB-libs =m pthread
>
>-LIB_DEPENDS +=devel/gmp>=4.2 \
>+LIB_DEPENDS +=devel/gmp>=6.1.1 \
> devel/mpfr \
> devel/libmpc
> LIB_DEPENDS-libs =
Ok with me.
Re: UPDATE: /devel/ninja 1.7.1 -> 1.7.2
On Sun, Nov 13, 2016 at 8:57 PM, Rafael Sadowski wrote: > Hi ports@, Hi Matthew, > > simple ninja update. Tested @amd64 with some ports in the last days. > > Port highlights: > > - switch to new github repo (official) > - new HOMEPAGE > - add post-install to compile ninja_syntax.py > - cleanup do-install tabs > > Kind regards, > > Rafael Sadowski Thanks, I'll have a look at it tomorrow. Ciao! David
devel/git: fix PLIST
Hi!
I think these two directories should be registered in the PLIST
file.
Opinions?
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.163
diff -u -p -u -p -r1.163 Makefile
--- Makefile4 Nov 2016 09:43:29 - 1.163
+++ Makefile13 Nov 2016 20:02:59 -
@@ -9,6 +9,7 @@ DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
+REVISION-main =0
CATEGORIES = devel
HOMEPAGE = http://git-scm.com/
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 PLIST-main
--- pkg/PLIST-main 11 Oct 2016 10:59:27 - 1.74
+++ pkg/PLIST-main 13 Nov 2016 20:02:59 -
@@ -372,6 +372,8 @@ libexec/git/mergetools/xxdiff
@man man/man7/gittutorial.7
@man man/man7/gitworkflows.7
share/doc/pkg-readmes/${FULLPKGNAME}
+share/emacs/
+share/emacs/site-lisp/
share/emacs/site-lisp/git-blame.el
share/emacs/site-lisp/git.el
share/git-core/
Re: i3-4.13
On Fri, Nov 11, 2016 at 1:08 PM, Theo Buehler wrote: > On Fri, Nov 11, 2016 at 12:20:27PM +0100, David Coppa wrote: >> On Thu, 10 Nov 2016, Theo Buehler wrote: >> >> > On Thu, Nov 10, 2016 at 11:13:27PM +0100, David Coppa wrote: >> > > On Thu, Nov 10, 2016 at 10:06 PM, David Coppa wrote: >> > > > >> > > > Hi i3 users, >> > > > >> > > > Here's the update to i3-4.13. >> > > > >> > > > Please test and report (comments, OKs, whatever...) >> > > > >> > > > Ciao! >> > > > David >> > > >> > > And here's the diff as attachment, if the inline one causes problems. >> > >> > Thanks, running it now. Will probably have time to look more closely at >> > the diff tomorrow or on Saturday. >> >> New diff (also attached) with patches for manpages. >> >> I think this is ready for commit... > > I think so, too. ok tb. > > Survived half a day of normal work here, diffs look good. Seems to have > survived the switch to autotools quite well. > > Thanks! > > Just one question: I saw on the github repo that chrisz did some work on > the tests, but they still fail with 'make test'. Is that supposed to > work and is there a problem in my setup or does this only work by going > through the complicated stuff here: https://i3wm.org/docs/testsuite.html ? > > > FAIL: testcases/complete-run.pl > > Testsuite summary for i3 4.13 > > # TOTAL: 1 > # PASS: 0 > # SKIP: 0 > # XFAIL: 0 > # FAIL: 1 > # XPASS: 0 > # ERROR: 0 > > Well, i3's testsuite is quite convoluted: it requires a bunch of perl modules and the Xephyr xserver. I need to find the time to work on this stuff... Ciao! David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
Re: i3-4.13
On Thu, 10 Nov 2016, Theo Buehler wrote:
> On Thu, Nov 10, 2016 at 11:13:27PM +0100, David Coppa wrote:
> > On Thu, Nov 10, 2016 at 10:06 PM, David Coppa wrote:
> > >
> > > Hi i3 users,
> > >
> > > Here's the update to i3-4.13.
> > >
> > > Please test and report (comments, OKs, whatever...)
> > >
> > > Ciao!
> > > David
> >
> > And here's the diff as attachment, if the inline one causes problems.
>
> Thanks, running it now. Will probably have time to look more closely at
> the diff tomorrow or on Saturday.
New diff (also attached) with patches for manpages.
I think this is ready for commit...
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 Makefile
--- Makefile29 Aug 2016 09:13:37 - 1.105
+++ Makefile11 Nov 2016 11:14:30 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.12
-REVISION = 0
+DISTNAME = i3-4.13
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -16,9 +15,13 @@ PERMIT_PACKAGE_CDROM = Yes
# uses pledge()
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pcre startup-notification-1 xcb xcb-cursor
-WANTLIB += xcb-icccm xcb-keysyms xcb-randr xcb-render xcb-util
-WANTLIB += xcb-xinerama xcb-xkb xkbcommon xkbcommon-x11 yajl
+WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1 xcb
+WANTLIB += xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-util
+WANTLIB += xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
+WANTLIB += yajl
+
+BUILD_DEPENDS =textproc/asciidoc \
+ textproc/xmlto
LIB_DEPENDS = devel/libev \
devel/libyajl>=2.0.0 \
@@ -32,40 +35,29 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/i3status \
x11/p5-AnyEvent-I3
+FAKE_FLAGS = i3confdir="${PREFIX}/share/examples/i3/"
+
+SEPARATE_BUILD = Yes
+
USE_GMAKE =Yes
-NO_TEST = Yes
+CONFIGURE_STYLE = gnu
-MAKE_FLAGS = CC="${CC}" \
- SYSCONFDIR=${SYSCONFDIR} \
- V=1
-
-.if defined(DEBUG)
-MAKE_FLAGS += DEBUG=1
-.endif
-
-FAKE_FLAGS = PREFIX=${PREFIX} \
- EXEC_PREFIX=${PREFIX} \
- SYSCONFDIR=${PREFIX}/share/examples \
- INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ARGS = --enable-builddir=${WRKBUILD}
-post-configure:
- ${SUBST_CMD} ${WRKSRC}/i3-dmenu-desktop \
+CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include \
+ -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib \
+-L${LOCALBASE}/lib"
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/etc/config \
+ ${WRKSRC}/etc/config.keycodes \
+ ${WRKSRC}/i3-dmenu-desktop \
${WRKSRC}/i3-nagbar/main.c \
- ${WRKSRC}/i3.config \
- ${WRKSRC}/i3.config.keycodes \
${WRKSRC}/libi3/get_config_path.c \
- ${WRKSRC}/libi3/get_exe_path.c
-
-post-install:
- ${INSTALL_MAN} ${WRKBUILD}/man/*.1 ${PREFIX}/man/man1/
- ${SUBST_MAN} ${WRKBUILD}/man/i3-config-wizard.1 \
- ${PREFIX}/man/man1/i3-config-wizard.1
- ${SUBST_MAN} ${WRKBUILD}/man/i3-dmenu-desktop.1 \
- ${PREFIX}/man/man1/i3-dmenu-desktop.1
- ${SUBST_MAN} ${WRKBUILD}/man/i3.1 ${PREFIX}/man/man1/i3.1
- @rm ${PREFIX}/man/man1/i3-sensible*.1
+ ${WRKSRC}/libi3/get_exe_path.c \
+ ${WRKSRC}/man/i3-config-wizard.man \
+ ${WRKSRC}/man/i3.man
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo9 Mar 2016 09:25:51 - 1.25
+++ distinfo11 Nov 2016 11:14:30 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.12.tar.bz2) = 4Z4c4IwlScuoPgg8x2jUhyAsQXYNXCg/Z3UueR8deLQ=
-SIZE (i3-4.12.tar.bz2) = 988084
+SHA256 (i3-4.13.tar.bz2) = lMExg+UnqYQTKjsFDIv2KWJlAqbhM+B7QTZBrsX4z4o=
+SIZE (i3-4.13.tar.bz2) = 1121298
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 11 Nov 2016 11:14:30 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- Makefile.in.orig Tue Nov 8 19:54:08 2016
Makefile.inThu Nov 10 19:44:19 2016
+@@ -744,10 +744,7 @@ i3include_HEADERS = \
+ dist_bin_SCRIPTS = \
+ i3-dmenu-desktop \
+ i3-migrate-con
Re: i3-4.13
On Thu, Nov 10, 2016 at 10:06 PM, David Coppa wrote: > > Hi i3 users, > > Here's the update to i3-4.13. > > Please test and report (comments, OKs, whatever...) > > Ciao! > David And here's the diff as attachment, if the inline one causes problems. i3-4.13.diff.gz Description: GNU Zip compressed data
i3-4.13
Hi i3 users,
Here's the update to i3-4.13.
Please test and report (comments, OKs, whatever...)
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 Makefile
--- Makefile29 Aug 2016 09:13:37 - 1.105
+++ Makefile10 Nov 2016 21:06:13 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.12
-REVISION = 0
+DISTNAME = i3-4.13
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -16,9 +15,13 @@ PERMIT_PACKAGE_CDROM = Yes
# uses pledge()
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pcre startup-notification-1 xcb xcb-cursor
-WANTLIB += xcb-icccm xcb-keysyms xcb-randr xcb-render xcb-util
-WANTLIB += xcb-xinerama xcb-xkb xkbcommon xkbcommon-x11 yajl
+WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1 xcb
+WANTLIB += xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-util
+WANTLIB += xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
+WANTLIB += yajl
+
+BUILD_DEPENDS =textproc/asciidoc \
+ textproc/xmlto
LIB_DEPENDS = devel/libev \
devel/libyajl>=2.0.0 \
@@ -32,40 +35,27 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/i3status \
x11/p5-AnyEvent-I3
+FAKE_FLAGS = i3confdir="${PREFIX}/share/examples/i3/"
+
+SEPARATE_BUILD = Yes
+
USE_GMAKE =Yes
-NO_TEST = Yes
+CONFIGURE_STYLE = gnu
-MAKE_FLAGS = CC="${CC}" \
- SYSCONFDIR=${SYSCONFDIR} \
- V=1
-
-.if defined(DEBUG)
-MAKE_FLAGS += DEBUG=1
-.endif
-
-FAKE_FLAGS = PREFIX=${PREFIX} \
- EXEC_PREFIX=${PREFIX} \
- SYSCONFDIR=${PREFIX}/share/examples \
- INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ARGS = --enable-builddir=${WRKBUILD}
-post-configure:
- ${SUBST_CMD} ${WRKSRC}/i3-dmenu-desktop \
+CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include \
+ -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib \
+-L${LOCALBASE}/lib"
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/etc/config \
+ ${WRKSRC}/etc/config.keycodes \
+ ${WRKSRC}/i3-dmenu-desktop \
${WRKSRC}/i3-nagbar/main.c \
- ${WRKSRC}/i3.config \
- ${WRKSRC}/i3.config.keycodes \
${WRKSRC}/libi3/get_config_path.c \
${WRKSRC}/libi3/get_exe_path.c
-
-post-install:
- ${INSTALL_MAN} ${WRKBUILD}/man/*.1 ${PREFIX}/man/man1/
- ${SUBST_MAN} ${WRKBUILD}/man/i3-config-wizard.1 \
- ${PREFIX}/man/man1/i3-config-wizard.1
- ${SUBST_MAN} ${WRKBUILD}/man/i3-dmenu-desktop.1 \
- ${PREFIX}/man/man1/i3-dmenu-desktop.1
- ${SUBST_MAN} ${WRKBUILD}/man/i3.1 ${PREFIX}/man/man1/i3.1
- @rm ${PREFIX}/man/man1/i3-sensible*.1
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo9 Mar 2016 09:25:51 - 1.25
+++ distinfo10 Nov 2016 21:06:13 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.12.tar.bz2) = 4Z4c4IwlScuoPgg8x2jUhyAsQXYNXCg/Z3UueR8deLQ=
-SIZE (i3-4.12.tar.bz2) = 988084
+SHA256 (i3-4.13.tar.bz2) = lMExg+UnqYQTKjsFDIv2KWJlAqbhM+B7QTZBrsX4z4o=
+SIZE (i3-4.13.tar.bz2) = 1121298
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 10 Nov 2016 21:06:13 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- Makefile.in.orig Tue Nov 8 19:54:08 2016
Makefile.inThu Nov 10 19:44:19 2016
+@@ -744,10 +744,7 @@ i3include_HEADERS = \
+ dist_bin_SCRIPTS = \
+ i3-dmenu-desktop \
+ i3-migrate-config-to-v4 \
+- i3-save-tree \
+- i3-sensible-editor \
+- i3-sensible-pager \
+- i3-sensible-terminal
++ i3-save-tree
+
+ i3confdir = $(sysconfdir)/i3
+ dist_i3conf_DATA = \
+@@ -882,9 +879,6 @@ docs_poddir = ${docdir}
+ @BUILD_MANS_TRUE@ man/i3-nagbar.1 \
+ @BUILD_MANS_TRUE@ man/i3-config-wizard.1 \
+ @BUILD_MANS_TRUE@ man/i3-migrate-config-to-v4.1 \
+-@BUILD_MANS_TRUE@ man/i3-sensible-editor.1 \
+-@BUILD_MANS_TRUE@ man/i3-sensible-pager.1 \
+-@BUILD_MANS_TRUE@ man/i3-sensible-terminal.1 \
+ @BUILD_MANS_TRUE@ man/i3-dump-log.1
+
+ @BUILD_MANS_TRUE@pod_MANS = \
+@@ -3121,7 +3115,7 @@ distclean-tags:
+
+ # Leading 'am--fnord' is there to ensure the list of targets does not
+ # expand to empty, as could happen e.g. with make check TESTS=''.
+-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.
git-2.10.2
Hi!
Bugfixing update to 2.10.2
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.162
diff -u -p -u -p -r1.162 Makefile
--- Makefile11 Oct 2016 10:59:27 - 1.162
+++ Makefile3 Nov 2016 14:42:35 -
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V =2.10.1
+V =2.10.2
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.124
diff -u -p -u -p -r1.124 distinfo
--- distinfo11 Oct 2016 10:59:27 - 1.124
+++ distinfo3 Nov 2016 14:42:35 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.10.1.tar.gz) = eFU/eG8aZstomDwXC+SCVYAoozdgVsDy7TZvMxseNfI=
-SHA256 (git-manpages-2.10.1.tar.gz) =
RXJHeo/6aZY/K+fW4P5juBkt4sMB7fPjeoiPkEu/0S4=
-SIZE (git-2.10.1.tar.gz) = 6057915
-SIZE (git-manpages-2.10.1.tar.gz) = 636238
+SHA256 (git-2.10.2.tar.gz) = PX7yddgLl6qmHztr6dPcUWIC5vb12IXywJtZ66WS3MQ=
+SHA256 (git-manpages-2.10.2.tar.gz) =
HqtTgz+7Qy6ck23UalvrbSXS+ui+JY3vUDscIae/U2M=
+SIZE (git-2.10.2.tar.gz) = 6065116
+SIZE (git-manpages-2.10.2.tar.gz) = 636509
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 patch-Makefile
--- patches/patch-Makefile 11 Oct 2016 10:59:27 - 1.64
+++ patches/patch-Makefile 3 Nov 2016 14:42:35 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.64 2016/10/11 10:59:27 dcoppa Exp $
Makefile.orig Tue Oct 4 00:19:09 2016
-+++ Makefile Tue Oct 11 11:46:07 2016
-@@ -2269,7 +2269,7 @@ export TEST_NO_MALLOC_CHECK
+--- Makefile.orig Fri Oct 28 21:34:16 2016
Makefile Tue Nov 1 19:19:33 2016
+@@ -2270,7 +2270,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-t_test-lib_sh
===
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 11 Oct 2016 10:59:27 - 1.15
+++ patches/patch-t_test-lib_sh 3 Nov 2016 14:42:35 -
@@ -5,8 +5,8 @@ wants it badly.
Fix sum() function
t/test-lib.sh.orig Tue Oct 4 00:19:09 2016
-+++ t/test-lib.sh Tue Oct 11 11:41:06 2016
+--- t/test-lib.sh.orig Fri Oct 28 21:34:16 2016
t/test-lib.sh Tue Nov 1 19:19:33 2016
@@ -48,6 +48,11 @@ fi
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
@@ -19,7 +19,7 @@ Fix sum() function
# if --tee was passed, write the output not only to the terminal, but
# additionally to the file test-results/$BASENAME.out, too.
case "$GIT_TEST_TEE_STARTED, $* " in
-@@ -964,6 +969,12 @@ case $(uname -s) in
+@@ -990,6 +995,12 @@ case $(uname -s) in
test_set_prereq CYGWIN
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR
Re: UPDATE: math/R
On Tue, Nov 1, 2016 at 9:53 AM, Ingo Feinerer wrote:
> Dear useRs,
>
> update math/R 3.3.1 -> 3.3.2
>
> - remove two FTP mirrors (there are plenty of HTTP)
> - add print/texinfo to RUN_DEPENDS as 'R CMD build' needs it
> - regen patch
>
> Works for me on amd64.
>
> OK?
Looks good portswise, and works as expected.
ok dcoppa@
Ciao!
David
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/R/Makefile,v
> retrieving revision 1.87
> diff -u -p -r1.87 Makefile
> --- Makefile2 Sep 2016 13:02:24 - 1.87
> +++ Makefile1 Nov 2016 08:44:32 -
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.87 2016/09/02 13:02:24 dcoppa Exp $
>
> COMMENT= powerful math/statistics/graphics language
> -DISTNAME= R-3.3.1
> -REVISION= 1
> +DISTNAME= R-3.3.2
>
> SO_VERSION=32.0
> .for _lib in R Rblas Rlapack
> @@ -23,8 +22,6 @@ WANTLIB += lzma m ncurses nghttp2 pango-
> WANTLIB += png readline ssl tiff z ${MODTK_WANTLIB}
>
> MASTER_SITES= https://cran.r-project.org/src/base/R-3/ \
> - ftp://cran.r-project.org/pub/R/src/base/R-3/ \
> - ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/R-3/ \
> http://cran.at.r-project.org/src/base/R-3/ \
> http://cran.br.r-project.org/src/base/R-3/ \
> http://cran.ch.r-project.org/src/base/R-3/ \
> @@ -67,6 +64,7 @@ RUN_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
> archivers/zip \
> devel/gmake \
> devel/xdg-utils \
> + print/texinfo \
> print/texlive/base>=2014p1
>
> CONFIGURE_STYLE=gnu
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/R/distinfo,v
> retrieving revision 1.31
> diff -u -p -r1.31 distinfo
> --- distinfo21 Jun 2016 18:21:52 - 1.31
> +++ distinfo1 Nov 2016 08:44:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (R-3.3.1.tar.gz) = PcWa5YMfU4D4PBabrCEDrQUu/g7OxP+nS95NhaD9qeI=
> -SIZE (R-3.3.1.tar.gz) = 29848329
> +SHA256 (R-3.3.2.tar.gz) = 0pStIen1dPtIKOuzqUuMs09PMEpBaHqZS+AN1BpOUUw=
> +SIZE (R-3.3.2.tar.gz) = 29440670
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/math/R/patches/patch-configure,v
> retrieving revision 1.28
> diff -u -p -r1.28 patch-configure
> --- patches/patch-configure 6 May 2016 08:52:28 - 1.28
> +++ patches/patch-configure 1 Nov 2016 08:44:32 -
> @@ -1,8 +1,8 @@
> $OpenBSD: patch-configure,v 1.28 2016/05/06 08:52:28 feinerer Exp $
>
> configure.orig Tue May 3 12:17:51 2016
> -+++ configure Tue May 3 12:19:33 2016
> -@@ -35481,8 +35481,8 @@ fi
> +--- configure.orig Mon Oct 24 13:34:26 2016
> configure Tue Nov 1 09:06:08 2016
> +@@ -35492,8 +35492,8 @@ fi
>
> fi
> if test "${have_zlib}" = yes; then
> @@ -13,7 +13,7 @@ $OpenBSD: patch-configure,v 1.28 2016/05
> if ${r_cv_header_zlib_h+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> -@@ -35499,7 +35499,7 @@ int main() {
> +@@ -35510,7 +35510,7 @@ int main() {
> #ifdef ZLIB_VERSION
> /* Work around Debian bug: it uses 1.2.3.4 even though there was no such
> version on the master site zlib.net */
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/R/pkg/PLIST,v
> retrieving revision 1.31
> diff -u -p -r1.31 PLIST
> --- pkg/PLIST 21 Jun 2016 18:21:52 - 1.31
> +++ pkg/PLIST 1 Nov 2016 08:44:33 -
> @@ -1910,14 +1910,12 @@ share/doc/R/manual/images/fig12.png
> share/doc/R/manual/images/hist.png
> share/doc/R/manual/images/ice.png
> share/doc/pkg-readmes/${FULLPKGNAME}
> -share/texmf-local/
> share/texmf-local/bibtex/
> share/texmf-local/bibtex/bib/
> share/texmf-local/bibtex/bib/RJournal.bib
> share/texmf-local/bibtex/bib/Rnews.bib
> share/texmf-local/bibtex/bst/
> share/texmf-local/bibtex/bst/jss.bst
> -share/texmf-local/tex/
> share/texmf-local/tex/latex/
> share/texmf-local/tex/latex/Rd.sty
> share/texmf-local/tex/latex/Sweave.sty
>
--
"If you try a few times and give up, you'll never get there. But if
you keep at it... There's a lot of problems in the world which can
really be solved by applying two or three times the persistence that
other people will."
-- Stewart Nelson
Re: lualdoc & awesome
On Mon, Oct 17, 2016 at 8:26 PM, Jeremie Courreges-Anglas wrote: > David Coppa writes: > >> On Mon, Oct 17, 2016 at 7:51 PM, Jeremie Courreges-Anglas >> wrote: >>> >>> The switch to explicit FLAVORS is almost complete, there are two >>> remaining ports, luaposix and lualdoc. >>> >>> lualdoc is packaged as a library that supports flavors, but afaik it is >>> a standalone tool. Debian for example packages it as "lua-ldoc", not >>> "lua5.1-ldoc". >>> >>> Here's a diff to switch it to a standalone tool. Since x11/awesome is >>> its only consumer, I used MODLUA_VERSION = 5.2 so that people that build >>> from source don't need to install two lua versions (well, that's >>> cheap...). >>> >>> I added a @pkgpath so that people who have lua52ldoc installed can >>> transparently upgrade, but should I also add bin/lua51 and bin/lua52 >>> symlinks? I'd prefer not... >>> >>> Bonus: x11/awesome/patches loses weight. >>> >>> Thoughts? >> >> Reads ok to me, but why have you removed doxygen too? > > Oops, because I temporarily disabled it to do my tests. Downloading Qt > over crappy public wifi is painful. :) > > Fixed diff below. Just tested it, and it works as intended. OK dcoppa@ Thanks, David
Re: lualdoc & awesome (was: Re: lua ports: versions/flavors handling)
On Mon, Oct 17, 2016 at 7:51 PM, Jeremie Courreges-Anglas wrote: > > The switch to explicit FLAVORS is almost complete, there are two > remaining ports, luaposix and lualdoc. > > lualdoc is packaged as a library that supports flavors, but afaik it is > a standalone tool. Debian for example packages it as "lua-ldoc", not > "lua5.1-ldoc". > > Here's a diff to switch it to a standalone tool. Since x11/awesome is > its only consumer, I used MODLUA_VERSION = 5.2 so that people that build > from source don't need to install two lua versions (well, that's > cheap...). > > I added a @pkgpath so that people who have lua52ldoc installed can > transparently upgrade, but should I also add bin/lua51 and bin/lua52 > symlinks? I'd prefer not... > > Bonus: x11/awesome/patches loses weight. > > Thoughts? Reads ok to me, but why have you removed doxygen too?
Update: git-2.10.1
Hi!
Update to git-2.10.1.
Remove two now useless patch chunks:
- linking with -lrt is now protected by NEEDS_LIBRT
- vax is dead
Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.161
diff -u -p -u -p -r1.161 Makefile
--- Makefile26 Sep 2016 13:10:39 - 1.161
+++ Makefile11 Oct 2016 10:27:51 -
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V =2.9.3
+V =2.10.1
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.123
diff -u -p -u -p -r1.123 distinfo
--- distinfo17 Aug 2016 06:57:50 - 1.123
+++ distinfo11 Oct 2016 10:27:51 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.9.3.tar.gz) = olK2Y2sS1bpXcyyEaXAVRMJsKxaJkzvRtCXmA8uyR8A=
-SHA256 (git-manpages-2.9.3.tar.gz) =
jqGlWwSPr78MDG/LyktbD16ZF4kyIfxzRcCQUdZYMs4=
-SIZE (git-2.9.3.tar.gz) = 5918768
-SIZE (git-manpages-2.9.3.tar.gz) = 629834
+SHA256 (git-2.10.1.tar.gz) = eFU/eG8aZstomDwXC+SCVYAoozdgVsDy7TZvMxseNfI=
+SHA256 (git-manpages-2.10.1.tar.gz) =
RXJHeo/6aZY/K+fW4P5juBkt4sMB7fPjeoiPkEu/0S4=
+SIZE (git-2.10.1.tar.gz) = 6057915
+SIZE (git-manpages-2.10.1.tar.gz) = 636238
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 patch-Makefile
--- patches/patch-Makefile 25 May 2016 07:13:05 - 1.63
+++ patches/patch-Makefile 11 Oct 2016 10:27:51 -
@@ -1,37 +1,7 @@
$OpenBSD: patch-Makefile,v 1.63 2016/05/25 07:13:05 benoit Exp $
-
-No need for librt on OpenBSD
-
-Workaround for ar(1) not having 's' on VAX by calling ranlib
-
Makefile.orig Thu May 19 19:17:58 2016
-+++ Makefile Wed May 25 08:57:19 2016
-@@ -1465,7 +1465,6 @@ endif
-
- ifdef HAVE_CLOCK_GETTIME
- BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
-- EXTLIBS += -lrt
- endif
-
- ifdef HAVE_CLOCK_MONOTONIC
-@@ -2026,13 +2025,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
- $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
-
- $(LIB_FILE): $(LIB_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
-
- $(XDIFF_LIB): $(XDIFF_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
-
- $(VCSSVN_LIB): $(VCSSVN_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
-
- export DEFAULT_EDITOR DEFAULT_PAGER
-
-@@ -2217,7 +2216,7 @@ export TEST_NO_MALLOC_CHECK
+--- Makefile.orig Tue Oct 4 00:19:09 2016
Makefile Tue Oct 11 11:46:07 2016
+@@ -2269,7 +2269,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-t_test-lib_sh
===
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 17 Aug 2016 06:57:50 - 1.14
+++ patches/patch-t_test-lib_sh 11 Oct 2016 10:27:51 -
@@ -5,8 +5,8 @@ wants it badly.
Fix sum() function
t/test-lib.sh.orig Fri Aug 12 21:38:45 2016
-+++ t/test-lib.sh Mon Aug 15 22:12:19 2016
+--- t/test-lib.sh.orig Tue Oct 4 00:19:09 2016
t/test-lib.sh Tue Oct 11 11:41:06 2016
@@ -48,6 +48,11 @@ fi
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
@@ -19,7 +19,7 @@ Fix sum() function
# if --tee was passed, write the output not only to the terminal, but
# additionally to the file test-results/$BASENAME.out, too.
case "$GIT_TEST_TEE_STARTED, $* " in
-@@ -963,6 +968,12 @@ case $(uname -s) in
+@@ -964,6 +969,12 @@ case $(uname -s) in
test_set_prereq CYGWIN
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 PLIST-main
--- pkg/PLIST-main 28 Jun 2016 07:27:14 - 1.73
+++ pkg/PLIST-main 11 Oct 2016 10:27:51 -
@@ -391,6 +391,7 @@ share/git-core/templates/hooks/pre-apply
share/git-core/templates/hooks/pre-commit.sample
share/git-core/templates/hooks/pre-push.sample
share/git-core/templates/hooks/pre-rebase.sample
+share/git-core/templates/hooks/pre-receive.sample
share/git-core/templates/hooks/prepare-commit-msg.sample
share/git-core/templates/hooks/setgitperms.perl
share/git-core/templates/hooks/update.sample
Re: py-requests: use system cert.pem file
On Tue, Oct 11, 2016 at 11:01 AM, Stuart Henderson wrote:
> This doesn't fix my crash but while investigating it, I noticed that
> py-requests is using its own cacert.pem, it should use the system one.
> Fixup the distfile name while there as well. OK?
Sure, looks good to me.
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-requests/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile30 Sep 2016 09:45:56 - 1.18
> +++ Makefile11 Oct 2016 08:57:49 -
> @@ -3,11 +3,12 @@
> COMMENT= elegant and simple HTTP library for Python
>
> MODPY_EGG_VERSION= 2.11.1
> -DISTNAME= v${MODPY_EGG_VERSION}
> PKGNAME= py-requests-${MODPY_EGG_VERSION}
> +REVISION= 0
>
> GH_ACCOUNT=kennethreitz
> GH_PROJECT=requests
> +GH_TAGNAME=v${MODPY_EGG_VERSION}
>
> CATEGORIES=www
>
> @@ -31,6 +32,10 @@ FLAVOR?=
> MODPY_SETUPTOOLS= Yes
>
> WRKDIST= ${WRKDIR}/requests-${MODPY_EGG_VERSION}
> +
> +post-install:
> + ln -fs /etc/ssl/cert.pem \
> +
> ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem
>
> do-test:
> cd ${WRKSRC} && ${MODPY_BIN} -m pytest
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-requests/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo30 Sep 2016 09:45:56 - 1.13
> +++ distinfo11 Oct 2016 08:57:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (v2.11.1.tar.gz) = 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> -SIZE (v2.11.1.tar.gz) = 718073
> +SHA256 (requests-2.11.1.tar.gz) =
> 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> +SIZE (requests-2.11.1.tar.gz) = 718073
>
--
"If you try a few times and give up, you'll never get there. But if
you keep at it... There's a lot of problems in the world which can
really be solved by applying two or three times the persistence that
other people will."
-- Stewart Nelson
Re: W^X issues running valgrind
On Thu, Oct 6, 2016 at 12:50 PM, Andreas Kusalananda Kähäri wrote: > Hi, > > Let me know if this should be on ports rather than here. > > I'm following OpenBSD current on amd64, updating the system a couple of > times a week, and I'm using valgrind from ports to check a C program for > memory leaks. However, since recently (sorry, can't specify closer, > within the last couple of months) I get a W^X violation when I try it. devel/valgrind is missing the USE_WXNEEDED=Yes marker. Ciao! David
Re: Update: wpa_supplicant 2.6
On Wed, Oct 5, 2016 at 4:52 PM, Pascal Stumpf wrote: > On Wed, 5 Oct 2016 16:30:15 +0200, David Coppa wrote: >> On Tue, 04 Oct 2016, Laurence Tratt wrote: >> >> > On Tue, Oct 04, 2016 at 02:09:30PM +0200, David Coppa wrote: >> > >> > Hello David, >> > >> > I'll give this a try on Thursday (which is the next time I'm around such a >> > network) and let you know. >> > >> > >> > Laurie >> >> Please try the following diff: > > Works for me on eduroam. Thanks for testing. David
Re: Update: wpa_supplicant 2.6
On Tue, 04 Oct 2016, Laurence Tratt wrote:
> On Tue, Oct 04, 2016 at 02:09:30PM +0200, David Coppa wrote:
>
> Hello David,
>
> I'll give this a try on Thursday (which is the next time I'm around such a
> network) and let you know.
>
>
> Laurie
Please try the following diff:
Index: Makefile
===
RCS file: /cvs/ports/security/wpa_supplicant/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile17 May 2016 08:29:27 - 1.33
+++ Makefile5 Oct 2016 14:22:05 -
@@ -2,9 +2,8 @@
COMMENT= IEEE 802.1X supplicant
-DISTNAME= wpa_supplicant-2.5
+DISTNAME= wpa_supplicant-2.6
CATEGORIES=security net
-REVISION= 1
HOMEPAGE= http://w1.fi/wpa_supplicant/
Index: distinfo
===
RCS file: /cvs/ports/security/wpa_supplicant/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo29 Sep 2015 11:57:54 - 1.8
+++ distinfo5 Oct 2016 14:22:05 -
@@ -1,2 +1,2 @@
-SHA256 (wpa_supplicant-2.5.tar.gz) =
zOVbrkg7Nk6uVcNbpWfCeb5ELti6tbgKPH+w0Fe5sxY=
-SIZE (wpa_supplicant-2.5.tar.gz) = 2607336
+SHA256 (wpa_supplicant-2.6.tar.gz) =
tJNtNMTmzdRJVL66dCltlkvCyWaOyqUlXkmWNv4rFFA=
+SIZE (wpa_supplicant-2.6.tar.gz) = 2753524
Index: patches/patch-src_crypto_crypto_openssl_c
===
RCS file: patches/patch-src_crypto_crypto_openssl_c
diff -N patches/patch-src_crypto_crypto_openssl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_crypto_crypto_openssl_c 5 Oct 2016 14:22:05 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Compatibility fixes for LibreSSL
+
+--- src/crypto/crypto_openssl.c.orig Mon Oct 3 11:17:18 2016
src/crypto/crypto_openssl.cMon Oct 3 11:19:25 2016
+@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
+
+ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+ struct wpabuf *pubkey = NULL, *privkey = NULL;
+ size_t publen, privlen;
+@@ -712,7 +712,7 @@ err:
+
+ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+
+ dh = DH_new();
Index: patches/patch-src_crypto_tls_openssl_c
===
RCS file:
/cvs/ports/security/wpa_supplicant/patches/patch-src_crypto_tls_openssl_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_crypto_tls_openssl_c
--- patches/patch-src_crypto_tls_openssl_c 29 Sep 2015 11:57:54 -
1.3
+++ patches/patch-src_crypto_tls_openssl_c 5 Oct 2016 14:22:05 -
@@ -4,66 +4,30 @@ Compatibility fixes for LibreSSL
--- src/crypto/tls_openssl.c.orig Sun Sep 27 21:02:05 2015
+++ src/crypto/tls_openssl.c Mon Sep 28 13:43:46 2015
-@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- }
-
- if (certs) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_clear_chain_certs(ssl);
- while ((cert = sk_X509_pop(certs)) != NULL) {
- X509_NAME_oneline(X509_get_subject_name(cert), buf,
-@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- /* Try to continue anyway */
+@@ -919,7 +919,7 @@ void * tls_init(const struct tls_config *conf)
}
- sk_X509_free(certs);
--#ifndef OPENSSL_IS_BORINGSSL
-+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- res = SSL_build_cert_chain(ssl,
- SSL_BUILD_CHAIN_FLAG_CHECK |
- SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
-@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- if (conn == NULL || keys == NULL)
- return -1;
- ssl = conn->ssl;
+ #endif /* OPENSSL_FIPS */
+ #endif /* CONFIG_FIPS */
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
- return -1;
+ SSL_load_error_strings();
+ SSL_library_init();
+ #ifndef OPENSSL_NO_SHA256
+@@ -1043,7 +1043,7 @@ void tls_deinit(void *ssl_ctx)
-@@ -2841,7 +2841,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- #ifndef CONFIG_FIPS
- static int openssl_get_keyblock_size(SSL *ssl)
- {
--#if OPENSSL_VERSION_NUMBER <
Re: Question for LibreSSL hackers (was: Update: wpa_supplicant 2.6)
On Wed, 05 Oct 2016, Stuart Henderson wrote:
> On 2016/10/05 15:30, David Coppa wrote:
> > On Wed, Oct 5, 2016 at 3:13 PM, Stuart Henderson
> > wrote:
> >
> > > This is a workaround for an OpenSSL bug affecting EAP-FAST.
> > >
> > > https://mta.openssl.org/pipermail/openssl-dev/2015-July/002191.html
> >
> > So it's not needed, I suppose.
> >
> > Thanks!
> > David
> >
>
> I think it probably is needed - the fork pre-dates that fix, and while
> some of ssl23_client_hello() was rewritten it does still wait until the
> serverhello before creating the session.
Here's the updated diff, then.
Index: Makefile
===
RCS file: /cvs/ports/security/wpa_supplicant/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile17 May 2016 08:29:27 - 1.33
+++ Makefile5 Oct 2016 14:22:05 -
@@ -2,9 +2,8 @@
COMMENT= IEEE 802.1X supplicant
-DISTNAME= wpa_supplicant-2.5
+DISTNAME= wpa_supplicant-2.6
CATEGORIES=security net
-REVISION= 1
HOMEPAGE= http://w1.fi/wpa_supplicant/
Index: distinfo
===
RCS file: /cvs/ports/security/wpa_supplicant/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo29 Sep 2015 11:57:54 - 1.8
+++ distinfo5 Oct 2016 14:22:05 -
@@ -1,2 +1,2 @@
-SHA256 (wpa_supplicant-2.5.tar.gz) =
zOVbrkg7Nk6uVcNbpWfCeb5ELti6tbgKPH+w0Fe5sxY=
-SIZE (wpa_supplicant-2.5.tar.gz) = 2607336
+SHA256 (wpa_supplicant-2.6.tar.gz) =
tJNtNMTmzdRJVL66dCltlkvCyWaOyqUlXkmWNv4rFFA=
+SIZE (wpa_supplicant-2.6.tar.gz) = 2753524
Index: patches/patch-src_crypto_crypto_openssl_c
===
RCS file: patches/patch-src_crypto_crypto_openssl_c
diff -N patches/patch-src_crypto_crypto_openssl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_crypto_crypto_openssl_c 5 Oct 2016 14:22:05 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Compatibility fixes for LibreSSL
+
+--- src/crypto/crypto_openssl.c.orig Mon Oct 3 11:17:18 2016
src/crypto/crypto_openssl.cMon Oct 3 11:19:25 2016
+@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
+
+ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+ struct wpabuf *pubkey = NULL, *privkey = NULL;
+ size_t publen, privlen;
+@@ -712,7 +712,7 @@ err:
+
+ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+
+ dh = DH_new();
Index: patches/patch-src_crypto_tls_openssl_c
===
RCS file:
/cvs/ports/security/wpa_supplicant/patches/patch-src_crypto_tls_openssl_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_crypto_tls_openssl_c
--- patches/patch-src_crypto_tls_openssl_c 29 Sep 2015 11:57:54 -
1.3
+++ patches/patch-src_crypto_tls_openssl_c 5 Oct 2016 14:22:05 -
@@ -4,66 +4,30 @@ Compatibility fixes for LibreSSL
--- src/crypto/tls_openssl.c.orig Sun Sep 27 21:02:05 2015
+++ src/crypto/tls_openssl.c Mon Sep 28 13:43:46 2015
-@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- }
-
- if (certs) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_clear_chain_certs(ssl);
- while ((cert = sk_X509_pop(certs)) != NULL) {
- X509_NAME_oneline(X509_get_subject_name(cert), buf,
-@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- /* Try to continue anyway */
+@@ -919,7 +919,7 @@ void * tls_init(const struct tls_config *conf)
}
- sk_X509_free(certs);
--#ifndef OPENSSL_IS_BORINGSSL
-+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- res = SSL_build_cert_chain(ssl,
- SSL_BUILD_CHAIN_FLAG_CHECK |
- SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
-@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- if (conn == NULL || keys == NULL)
- return -1;
- ssl = conn->ssl;
+ #endif /* OPENSSL_FIPS */
+ #endif /* CONFIG_FIPS */
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- if (ssl == NULL || ssl->s3 == NULL || ssl->session == NUL
Re: Question for LibreSSL hackers (was: Update: wpa_supplicant 2.6)
On Wed, Oct 5, 2016 at 3:13 PM, Stuart Henderson wrote: > This is a workaround for an OpenSSL bug affecting EAP-FAST. > > https://mta.openssl.org/pipermail/openssl-dev/2015-July/002191.html So it's not needed, I suppose. Thanks! David
Question for LibreSSL hackers (was: Update: wpa_supplicant 2.6)
On Mon, Oct 3, 2016 at 1:22 PM, Edd Barrett wrote:
> Testing against eduroam:
>
> ---8<---
> $ doas wpa_supplicant -i iwn0 -c /etc/wpa_supplicant.conf
> Successfully initialized wpa_supplicant
> SSL: Failed to initialize TLS context.
> Failed to initialize EAPOL state machines.
> --->8---
>
On Tue, 04 Oct 2016, Laurence Tratt wrote:
> On Tue, Oct 04, 2016 at 02:09:30PM +0200, David Coppa wrote:
>
> Hello David,
>
> I'll give this a try on Thursday (which is the next time I'm around such a
> network) and let you know.
>
>
> Laurie
Hi again,
I finally got access to a proper 802.1x LAN and I was able to
reproduce and fix this issue.
New diff below.
But now I have a question for the LibreSSL hackers...
I suspect all the
#if OPENSSL_VERSION_NUMBER < 0x1010L
conditionals should be:
#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
Is this true?
Changing two of these #if statements fixed the problem reported by
Edd and Laurie, but I could find them quite easily by diffing between
wpa_supplicant-2.5 and wpa_supplicant-2.6.
Can you have a look at the attached tls_openssl.c file and tell me
if my analysis is correct and which
"#if OPENSSL_VERSION_NUMBER < 0x1010L"
conditional should be changed?
I'm particularly interested in this one (line 3979 of 4333):
---8<---
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
#if OPENSSL_VERSION_NUMBER < 0x1010L
if (params->flags & TLS_CONN_EAP_FAST) {
wpa_printf(MSG_DEBUG,
"OpenSSL: Use TLSv1_method() for EAP-FAST");
if (SSL_set_ssl_method(conn->ssl, TLSv1_method()) != 1) {
tls_show_errors(MSG_INFO, __func__,
"Failed to set TLSv1_method() for EAP-FAST");
return -1;
}
}
#endif
#endif /* EAP_FAST || EAP_FAST_DYNAMIC || EAP_SERVER_FAST */
---8<---
Because it was the same even in wpa_supplicant-2.5, and I cannot
fully understand this chunk of code.
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/security/wpa_supplicant/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile17 May 2016 08:29:27 - 1.33
+++ Makefile5 Oct 2016 12:17:46 -
@@ -2,9 +2,8 @@
COMMENT= IEEE 802.1X supplicant
-DISTNAME= wpa_supplicant-2.5
+DISTNAME= wpa_supplicant-2.6
CATEGORIES=security net
-REVISION= 1
HOMEPAGE= http://w1.fi/wpa_supplicant/
Index: distinfo
===
RCS file: /cvs/ports/security/wpa_supplicant/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo29 Sep 2015 11:57:54 - 1.8
+++ distinfo5 Oct 2016 12:17:46 -
@@ -1,2 +1,2 @@
-SHA256 (wpa_supplicant-2.5.tar.gz) =
zOVbrkg7Nk6uVcNbpWfCeb5ELti6tbgKPH+w0Fe5sxY=
-SIZE (wpa_supplicant-2.5.tar.gz) = 2607336
+SHA256 (wpa_supplicant-2.6.tar.gz) =
tJNtNMTmzdRJVL66dCltlkvCyWaOyqUlXkmWNv4rFFA=
+SIZE (wpa_supplicant-2.6.tar.gz) = 2753524
Index: patches/patch-src_crypto_crypto_openssl_c
===
RCS file: patches/patch-src_crypto_crypto_openssl_c
diff -N patches/patch-src_crypto_crypto_openssl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_crypto_crypto_openssl_c 5 Oct 2016 12:17:46 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Compatibility fixes for LibreSSL
+
+--- src/crypto/crypto_openssl.c.orig Mon Oct 3 11:17:18 2016
src/crypto/crypto_openssl.cMon Oct 3 11:19:25 2016
+@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
+
+ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+ struct wpabuf *pubkey = NULL, *privkey = NULL;
+ size_t publen, privlen;
+@@ -712,7 +712,7 @@ err:
+
+ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+
+ dh = DH_new();
Index: patches/patch-src_crypto_tls_openssl_c
===
RCS file:
/cvs/ports/security/wpa_supplicant/patches/patch-src_crypto_tls_openssl_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_crypto_tls_openssl_c
--- patches/patch-src_crypto_tls_openssl_c 29 Sep 2015 11:57:54 -
1.3
+++ patches/patch-src_crypto_tls_openssl_c 5 Oct 2016 12:17:46 -
@@ -4,66 +4,21 @@ Compatibility fixes for LibreSSL
--- src/crypto/tls_openssl.c.orig Sun Sep 2
Re: Update: wpa_supplicant 2.6
On Mon, Oct 3, 2016 at 1:22 PM, Edd Barrett wrote:
> Hi David,
>
> On Mon, Oct 03, 2016 at 11:36:22AM +0200, David Coppa wrote:
>> New release for wpa_supplicant.
>>
>> As usual, please test it with your setup.
>
> Testing against eduroam:
>
> ---8<---
> $ doas wpa_supplicant -i iwn0 -c /etc/wpa_supplicant.conf
> Successfully initialized wpa_supplicant
> SSL: Failed to initialize TLS context.
> Failed to initialize EAPOL state machines.
> --->8---
>
> My config file looks like this:
>
> ---8<---
> ctrl_interface=/var/run/wpa_supplicant
> ctrl_interface_group=wheel
> ap_scan=0
>
> network={
> ssid="eduroam"
> key_mgmt=WPA-EAP
> eap=PEAP
> phase1="peaplabel=0"
> phase2="auth=MSCHAPV2"
> identity="xxx"
> password="xxx"
> }
> --->8---
>
> (The in-tree version works fine)
Can you try again with:
$ doas wpa_supplicant -dd -i iwn0 -c /etc/wpa_supplicant.conf
And send me the output?
Thanks,
David
Update: wpa_supplicant 2.6
New release for wpa_supplicant.
As usual, please test it with your setup.
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/security/wpa_supplicant/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile17 May 2016 08:29:27 - 1.33
+++ Makefile3 Oct 2016 09:35:58 -
@@ -2,9 +2,8 @@
COMMENT= IEEE 802.1X supplicant
-DISTNAME= wpa_supplicant-2.5
+DISTNAME= wpa_supplicant-2.6
CATEGORIES=security net
-REVISION= 1
HOMEPAGE= http://w1.fi/wpa_supplicant/
Index: distinfo
===
RCS file: /cvs/ports/security/wpa_supplicant/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo29 Sep 2015 11:57:54 - 1.8
+++ distinfo3 Oct 2016 09:35:58 -
@@ -1,2 +1,2 @@
-SHA256 (wpa_supplicant-2.5.tar.gz) =
zOVbrkg7Nk6uVcNbpWfCeb5ELti6tbgKPH+w0Fe5sxY=
-SIZE (wpa_supplicant-2.5.tar.gz) = 2607336
+SHA256 (wpa_supplicant-2.6.tar.gz) =
tJNtNMTmzdRJVL66dCltlkvCyWaOyqUlXkmWNv4rFFA=
+SIZE (wpa_supplicant-2.6.tar.gz) = 2753524
Index: patches/patch-src_crypto_crypto_openssl_c
===
RCS file: patches/patch-src_crypto_crypto_openssl_c
diff -N patches/patch-src_crypto_crypto_openssl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_crypto_crypto_openssl_c 3 Oct 2016 09:35:58 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Compatibility fixes for LibreSSL
+
+--- src/crypto/crypto_openssl.c.orig Mon Oct 3 11:17:18 2016
src/crypto/crypto_openssl.cMon Oct 3 11:19:25 2016
+@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
+
+ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+ struct wpabuf *pubkey = NULL, *privkey = NULL;
+ size_t publen, privlen;
+@@ -712,7 +712,7 @@ err:
+
+ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ DH *dh;
+
+ dh = DH_new();
Index: patches/patch-src_crypto_tls_openssl_c
===
RCS file: patches/patch-src_crypto_tls_openssl_c
diff -N patches/patch-src_crypto_tls_openssl_c
--- patches/patch-src_crypto_tls_openssl_c 29 Sep 2015 11:57:54 -
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,69 +0,0 @@
-$OpenBSD: patch-src_crypto_tls_openssl_c,v 1.3 2015/09/29 11:57:54 dcoppa Exp $
-
-Compatibility fixes for LibreSSL
-
src/crypto/tls_openssl.c.orig Sun Sep 27 21:02:05 2015
-+++ src/crypto/tls_openssl.c Mon Sep 28 13:43:46 2015
-@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- }
-
- if (certs) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_clear_chain_certs(ssl);
- while ((cert = sk_X509_pop(certs)) != NULL) {
- X509_NAME_oneline(X509_get_subject_name(cert), buf,
-@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- /* Try to continue anyway */
- }
- sk_X509_free(certs);
--#ifndef OPENSSL_IS_BORINGSSL
-+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- res = SSL_build_cert_chain(ssl,
- SSL_BUILD_CHAIN_FLAG_CHECK |
- SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
-@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- if (conn == NULL || keys == NULL)
- return -1;
- ssl = conn->ssl;
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
- return -1;
-
-@@ -2841,7 +2841,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- #ifndef CONFIG_FIPS
- static int openssl_get_keyblock_size(SSL *ssl)
- {
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- const EVP_CIPHER *c;
- const EVP_MD *h;
- int md_size;
-@@ -2911,7 +2911,7 @@ static int openssl_tls_prf(struct tls_connection *conn
- "mode");
- return -1;
- #else /* CONFIG_FIPS */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- SSL *ssl;
- u8 *rnd;
- int ret = -1;
-@@ -3394,7 +3394,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, stru
-
- wp
