CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/01/08 00:34:37 Modified files: cad/ngspice: Makefile distinfo cad/ngspice/pkg: PLIST Log message: Update to ngspice-30. Release notes: http://ngspice.sourceforge.net/news.html
Re: update openldap to use modules
On Mon, Jan 07, 2019 at 11:27:52PM +, Stuart Henderson wrote:
> Thought I'd give an update on this since I just updated openldap.
> Sorry not what you wanted but worth writing a few words:
>
> On 2018/05/22 12:46, Paul B. Henson wrote:
> > Okay, how about:
> >
> > "The openldap port has been updated to use dynamically loaded modules
> > rather than compile everything statically into a monolithic binary. To
> > accommodate this change, you will need to update your configuration to
> > include "modulepath /usr/local/libexec/openldap" as well as a moduleload
> > for each module your configuration avails of. For example, if your
> > configuration includes "database mdb", you will need to add a "moduleload
> > back_mdb.so", or "moduleload back_bdb.so" for "database bdb", etc. if you
> > are using replication, you will need "moduleload syncprov.so" and possibly
> > "moduleload accesslog.so". Please see the documentation at
> > http://www.openldap.org/doc/admin24/for additional details on configuring
> > openldap."
> >
> > > The file is installed to ${PREFIX}/share/examples/openldap/slapd.conf,
> > > that's the file where I'd add as an example.
> >
> > Actually, that file already includes:
> >
> > # Load dynamic backend modules:
> > # modulepath/usr/local/libexec/openldap
> > # moduleloadback_mdb.la
> > # moduleloadback_ldap.la
> >
> > which the current port wouldn't even work with… Do you think that's
> > sufficient, or that it needs a tuneup?
> >
> > > It might be worth @sample'ing
> > > this file into ${SYSCONFDIR}/openldap as well, I think it was just an
> > > oversight that this wasn't done before..
>
> I remembered what this was about; it wasn't an oversight, rather upstream
> strongly hinted that people should use OLC so it was deliberately removed to
> nudge people in that direction.
>
> However...updating an OLC-based config when the daemon won't start is
> quite the pain.
>
> I looked at switching the less used / less useful features into loadable
> modules (and leaving the most common parts in the main binary), but even
> then I didn't manage to get my production server starting up successfully
> with the modular config.
>
> So I think at this point I will drop the diff unless a future update
> means people will have to dump and redo config anyway - I think the amount
> of pain for users to get through the update is sufficient that there would
> have to be big advantages for it to be worthwhile, and I don't see that
> there really are.
Iirc there were procedures to migrate from a slapd.conf to cn=config,
i'll try to dig out what i had to do for $work. Migrating to modules has
its advantages (not running unused code, etc..)
Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/01/07 23:35:43 Modified files: books/progit : Makefile distinfo books/progit/pkg: PLIST Log message: Update to progit-2.1.101. In addition: update homepage, mark PKG_ARCH = *, and drop the HTML, as upstream no longer provides it.
Re: NEW: books/oeb
Hi Ingo, Ingo Schwarze writes: > "something is > a book and at least one developer wants to read it" does not look > like a good enough reason to add something to ports/books. My criteria aren't nearly so broad as that... rather, community developed (version control, etc), freely licensed, and having periodic versioned releases. Despite actively looking for such books, I've only ever found three, all of which I submitted ports for: books/progit, books/utp, and this one. Uploading books from Project Gutenberg or the Internet Archive would be obviously quite excessive. But I doubt importing this one would trigger a firehose of book submissions to ports. -- Anthony J. Bentley
Re: [UPDATE] www/p5-HTML-Tree 5.06 -> 5.07
I had this update from nearly 1yr ago...
$ cvs -R -q diff -uNp
Index: Makefile
===
RCS file: /home/cvs/ports/www/p5-HTML-Tree/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile1 May 2017 19:54:18 - 1.28
+++ Makefile11 Feb 2018 22:55:22 -
@@ -4,7 +4,7 @@ COMMENT=perl parser that builds an HTML
MODULES= cpan
PKG_ARCH= *
-DISTNAME = HTML-Tree-5.06
+DISTNAME = HTML-Tree-5.07
CATEGORIES=www
# Perl
Index: distinfo
===
RCS file: /home/cvs/ports/www/p5-HTML-Tree/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo1 May 2017 19:54:18 - 1.11
+++ distinfo11 Feb 2018 22:49:21 -
@@ -1,2 +1,2 @@
-SHA256 (HTML-Tree-5.06.tar.gz) =
nDbrGcvfmlkGyFiUjKUcNb11YfUswYxDKBrL5XMnU24=
-SIZE (HTML-Tree-5.06.tar.gz) = 150067
+SHA256 (HTML-Tree-5.07.tar.gz) =
8DdNuEcxwgS4bB1bkJdf7w0wqGvZ3vkZND5VTjGp278=
+SIZE (HTML-Tree-5.07.tar.gz) = 150477
The tests passed here on amd64 using the above.
You shouldn't add p5-libwww without changing the BUILD/RUN_DEPENDS to
only include p5-libwww for runtime, this stops p5-libwww and all it's
run time dependencies having to be built first on build machines, it has
a lot of dependencies.
Additionally it also promotes some bad habits of not including the
dependencies starting to rely on p5-HTML-Tree rather than including
p5-libwww as a dependency, and also if include p5-libwww alone you don't
get https support you need to add p5-LWP-Protocol-https not p5-libwww
p5-libwww used to include https support but was split into a number of
separate modules.
Something being in the ports tree doesn't make it a reason to include if
it's only recommended. Your taking away the option from the end user of
the ports of deciding if something is actually needed.
On 01/07/19 22:34, Charlene Wendling wrote:
>
> I'm proposing here an update for HTML::Tree. The only change is a fix
> that allow building with newer Perl versions [1].
>
> What's new in port:
>
> - make use of TEST_POD instead of using TEST_DEPENDS
> - added www/p5-libwww, that was already present in 5.06. It's only a
> recommended module, but we have it in the tree anyway. Not sure if
> we want it, but it allows fetching a HTML document directly from
> an URL, which is quite handy for such a module ;)
>
> The recommended HTML::Formatter is not in the port tree, it's the
> successor of of the now "dead" devel/p5-HTML-Format [2]. Sure we'll
> have to update the whole stack around it sooner or later, but there
> has been no issue with 5.06 that recommended it already.
>
> Testing:
>
> - 'make test' passes
> - There are consumers, i've found no new failures [3], but please note
> that KDE4's extras haven't been firmly tested. It should go without
> issues anyway, because the only changes are really in Build.PL and
> distribution files [4].
>
> Charlène.
>
> [1] https://metacpan.org/source/KENTNL/HTML-Tree-5.07/Changes
> [2]
> https://github.com/nigelm/html-formatter/commit/f72de441df4e2159db255bb147bebdbff3273309
> [3] https://transfer.sh/oMGfA/p5-HTML-Tree.tgz
> [4] https://github.com/kentfredric/HTML-Tree/commits/master
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/p5-HTML-Tree/Makefile,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 Makefile
> --- Makefile 1 May 2017 19:54:18 - 1.28
> +++ Makefile 7 Jan 2019 21:24:20 -
> @@ -4,21 +4,23 @@ COMMENT=perl parser that builds an HTML
>
> MODULES= cpan
> PKG_ARCH=*
> -DISTNAME = HTML-Tree-5.06
> +DISTNAME = HTML-Tree-5.07
> CATEGORIES= www
>
> # Perl
> PERMIT_PACKAGE_CDROM=Yes
>
> RUN_DEPENDS= www/p5-HTML-Parser>=3.46 \
> - www/p5-HTML-Tagset>=3.02
> + www/p5-HTML-Tagset>=3.02 \
> + www/p5-libwww
> BUILD_DEPENDS= ${RUN_DEPENDS} \
> devel/p5-Test-Fatal
>
> CONFIGURE_STYLE =modbuild
>
> -TEST_DEPENDS=devel/p5-Test-Pod \
> - devel/p5-Test-LeakTrace \
> - devel/p5-Try-Tiny
> +TEST_DEPENDS=devel/p5-Test-LeakTrace \
> + devel/p5-Try-Tiny
> +
> +MAKE_ENV += TEST_POD=Yes
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/p5-HTML-Tree/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo 1 May 2017 19:54:18 - 1.11
> +++ distinfo 7 Jan 2019 21:24:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (HTML-Tree-5.06.tar.gz) = nDbrGcvfmlkGyFiUjKUcNb11YfUswYxDKBrL5XMnU24=
> -SIZE (HTML-Tree-5.06.tar.gz) = 150067
> +SHA256 (HTML-Tree-5.07.tar.gz) = 8DdNuEcxwgS4bB1bkJdf7w0wqGvZ3vkZND5VTjGp278=
> +SIZE (HTML-Tree-5.07.tar.gz) = 150477
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/01/07 19:34:50 Log message: import amdgpu firmware for recent amd gpus ok sthen@ Status: Vendor Tag: jsg Release Tags: jsg_20190108 N ports/sysutils/firmware/amdgpu/Makefile N ports/sysutils/firmware/amdgpu/distinfo N ports/sysutils/firmware/amdgpu/pkg/DESCR N ports/sysutils/firmware/amdgpu/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 17:12:12 Modified files: sysutils/bacula: Makefile distinfo sysutils/bacula/pkg: PLIST-main Removed files: sysutils/bacula/patches: patch-src_lib_crypto_c patch-src_lib_openssl-compat_h patch-src_lib_openssl_c Log message: update to bacula-9.4.1
[NEW] devel/p5-Mock-Config 0.03
Here is a proposal for a new port, devel/p5-Mock-Config. It will be needed to update devel/p5-Devel-CheckLib to 0.13 [1], which in turn is needed to update databases/p5-DBD-mysql [2] to 4.049, the current version of (4.042) we're shipping can't be built with Perl 5.28 [3] (that's why i'm CC'ing you Giovanni). It has been made with portgen(1), i've just improved DESCR, and added Pod testing. 'make test' passes, only the manifest test is skipped, because it can only be run from a git checkout. Package infos: Comment: temporarily set Config or XSConfig values Description: This module temporarily sets Config or XSConfig, as a workaround to XSConfig being readonly. The importer works only dynamically, not lexically yet. WWW: http://search.cpan.org/dist/Mock-Config/ Any comments or feedback? Charlène. [1] https://metacpan.org/source/MATTN/Devel-CheckLib-1.13/META.json#L29 [2] https://metacpan.org/changes/distribution/DBD-mysql#L34 [3] https://github.com/perl5-dbi/DBD-mysql/commit/5480266b35f8dcf8f3fd6b303823158038cdcfd7 p5-Mock-Config.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/01/07 16:40:38 Modified files: print/poppler : Makefile Log message: Add a comment for myself about the ld.bfd link errors on poppler-glib.
Re: update openldap to use modules
Thought I'd give an update on this since I just updated openldap.
Sorry not what you wanted but worth writing a few words:
On 2018/05/22 12:46, Paul B. Henson wrote:
> Okay, how about:
>
> "The openldap port has been updated to use dynamically loaded modules rather
> than compile everything statically into a monolithic binary. To accommodate
> this change, you will need to update your configuration to include
> "modulepath /usr/local/libexec/openldap" as well as a moduleload for each
> module your configuration avails of. For example, if your configuration
> includes "database mdb", you will need to add a "moduleload back_mdb.so", or
> "moduleload back_bdb.so" for "database bdb", etc. if you are using
> replication, you will need "moduleload syncprov.so" and possibly "moduleload
> accesslog.so". Please see the documentation at
> http://www.openldap.org/doc/admin24/for additional details on configuring
> openldap."
>
> > The file is installed to ${PREFIX}/share/examples/openldap/slapd.conf,
> > that's the file where I'd add as an example.
>
> Actually, that file already includes:
>
> # Load dynamic backend modules:
> # modulepath/usr/local/libexec/openldap
> # moduleloadback_mdb.la
> # moduleloadback_ldap.la
>
> which the current port wouldn't even work with… Do you think that's
> sufficient, or that it needs a tuneup?
>
> > It might be worth @sample'ing
> > this file into ${SYSCONFDIR}/openldap as well, I think it was just an
> > oversight that this wasn't done before..
I remembered what this was about; it wasn't an oversight, rather upstream
strongly hinted that people should use OLC so it was deliberately removed to
nudge people in that direction.
However...updating an OLC-based config when the daemon won't start is
quite the pain.
I looked at switching the less used / less useful features into loadable
modules (and leaving the most common parts in the main binary), but even
then I didn't manage to get my production server starting up successfully
with the modular config.
So I think at this point I will drop the diff unless a future update
means people will have to dump and redo config anyway - I think the amount
of pain for users to get through the update is sufficient that there would
have to be big advantages for it to be worthwhile, and I don't see that
there really are.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 16:10:13 Modified files: databases/openldap: Makefile distinfo databases/openldap/patches: patch-build_top_mk patch-libraries_libldap_tls_o_c patch-servers_slapd_back-mdb_init_c patch-servers_slapd_slapd_conf databases/openldap/pkg: PLIST-server Log message: update to openldap-2.4.47 - adjust the MDB writemap patch, inspired by databases/mdb, to force writemap to be enabled (as required on OpenBSD) if not already set. simpler to use and this allows the patches for the test suite to be removed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2019/01/07 15:58:05 Modified files: net/tor: Makefile distinfo net/tor/patches: patch-configure_ac patch-src_config_torrc_sample_in net/tor/pkg: PLIST Log message: Update to tor 0.3.5.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/01/07 15:52:47 Modified files: print/fontforge: Makefile Log message: Update HOMEPAGE. Noticed and ok by danj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 15:49:14 Modified files: security/clamav: Makefile distinfo security/clamav/patches: patch-clamd_Makefile_in patch-database_Makefile_in patch-libclamav_Makefile_in patch-libclamav_clamav_h patch-libclamav_ole2_extract_c patch-libclamav_str_c patch-unit_tests_Makefile_in security/clamav/pkg: PLIST Log message: update to clamav-0.101.1
UPDATE: audio/hydrogen and make it actually usable again
The version of hydrogen in ports is quite old, and when you startup the GUI,
it is totally broken and unusable.
So the patch below updates to 0.9.5 (still quite old), but with
0.9.6 the build infrastructure was changed from scons to cmake, so
updating to something newer is an excercise left for another day ;)
I also tested the MIDI input, seems the midi device names changed since 2010
from
rmidi:X to rmidi/X so updated that, as well as using MIO_PORTANY as default
when passing the device to mio_open.
So MIDI input kind of works with my umidi keyboard now, either setting
MIDIDEVICE
env var, or configuring it in the preferences.
any comments, or even OK?
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/audio/hydrogen/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile24 Oct 2018 14:27:57 - 1.24
+++ Makefile7 Jan 2019 22:26:55 -
@@ -2,8 +2,7 @@
COMMENT= software drum machine
-DISTNAME= hydrogen-0.9.4
-REVISION= 7
+DISTNAME= hydrogen-0.9.5
CATEGORIES=audio
HOMEPAGE= http://www.hydrogen-music.org/
Index: distinfo
===
RCS file: /cvs/ports/audio/hydrogen/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo18 Jan 2015 03:12:42 - 1.4
+++ distinfo7 Jan 2019 22:26:55 -
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-0.9.4.tar.gz) = mCt2i0joQCEElJxk+sTXTYBPQbarG5BFdxGEDamWhdc=
-SIZE (hydrogen-0.9.4.tar.gz) = 3808532
+SHA256 (hydrogen-0.9.5.tar.gz) = ljxz75EeyedYnlAtF987eU3QJ9fpmja1EVoLtROJ2cM=
+SIZE (hydrogen-0.9.5.tar.gz) = 5239702
Index: files/sndio_midi_driver.cpp
===
RCS file: /cvs/ports/audio/hydrogen/files/sndio_midi_driver.cpp,v
retrieving revision 1.1
diff -u -r1.1 sndio_midi_driver.cpp
--- files/sndio_midi_driver.cpp 11 Jan 2010 05:11:32 - 1.1
+++ files/sndio_midi_driver.cpp 7 Jan 2019 22:26:55 -
@@ -34,7 +34,7 @@
MidiMessage msg;
struct pollfd pfd;
nfds_t nfds;
- char buf[1], sysex_data[256], status = 0;
+ unsigned char buf[1], sysex_data[256], status = 0;
int i, msglen, count = 0, sysex_len = 0;
_INFOLOG("SndioMidiDriver_thread starting");
@@ -181,7 +181,7 @@
}
SndioMidiDriver::SndioMidiDriver()
- : MidiInput("SndioMidiDriver")
+ : MidiInput("SndioMidiDriver"), Object( "SndioMidiDriver" )
, m_bRunning(false)
{
hdl = NULL;
@@ -205,7 +205,7 @@
if (strncmp(midiDevice, "", 1) == 0 ||
strncmp(midiDevice, "None", 5) == 0 ||
strncmp(midiDevice, "default", 8) == 0)
- hdl = mio_open(NULL, MIO_IN, 0);
+ hdl = mio_open(MIO_PORTANY, MIO_IN, 0);
else
hdl = mio_open(midiDevice, MIO_IN, 0);
@@ -240,15 +240,15 @@
QString name;
int i;
- /* midithru:* */
+ /* midithru/* */
for (i = 0; i < 4; i++) {
- name = "midithru:" + QString::number(i);
+ name = "midithru/" + QString::number(i);
portList.push_back(name);
}
- /* rmidi:* */
+ /* rmidi/* */
for (i = 0; i < 8; i++) {
- name = "rmidi:" + QString::number(i);
+ name = "rmidi/" + QString::number(i);
QFileInfo di("/dev/rmidi" + QString::number(i));
if (di.exists())
portList.push_back(name);
Index: patches/patch-Sconstruct
===
RCS file: /cvs/ports/audio/hydrogen/patches/patch-Sconstruct,v
retrieving revision 1.2
diff -u -r1.2 patch-Sconstruct
--- patches/patch-Sconstruct20 Jul 2011 12:08:24 - 1.2
+++ patches/patch-Sconstruct7 Jan 2019 22:26:55 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Sconstruct,v 1.2 2011/07/20 12:08:24 sthen Exp $
Sconstruct.origMon Sep 7 22:31:13 2009
-+++ Sconstruct Wed Jul 20 12:45:04 2011
-@@ -47,20 +47,21 @@ def get_platform_flags( opts ):
+Index: Sconstruct
+--- Sconstruct.orig
Sconstruct
+@@ -47,19 +47,20 @@ def get_platform_flags( opts ):
env = Environment( options = opts )
@@ -18,16 +19,15 @@
#cppflags += " %s" % get_optimized_flags( target_cpu )
for flag in env["optflags"].split(" "):
cppflags.append(flag)
-
-
+
if str(env['oss']) == "1": cppflags.append('-DOSS_SUPPORT')
+ if str(env['sndio']) == "1": cppflags.append('-DSNDIO_SUPPORT')
if str(env['alsa']) == "1": cppflags.append('-DALSA_SUPPORT')
if str(env['jack']) == "1": cppflags.append('-DJACK_SUPPORT')
if str(env['lash']) == "1": cppflags.append('-DLASH_SUPPORT')
-@@ -87,6 +88,12 @@ def
[UPDATE] www/p5-HTML-Tree 5.06 -> 5.07
I'm proposing here an update for HTML::Tree. The only change is a fix
that allow building with newer Perl versions [1].
What's new in port:
- make use of TEST_POD instead of using TEST_DEPENDS
- added www/p5-libwww, that was already present in 5.06. It's only a
recommended module, but we have it in the tree anyway. Not sure if
we want it, but it allows fetching a HTML document directly from
an URL, which is quite handy for such a module ;)
The recommended HTML::Formatter is not in the port tree, it's the
successor of of the now "dead" devel/p5-HTML-Format [2]. Sure we'll
have to update the whole stack around it sooner or later, but there
has been no issue with 5.06 that recommended it already.
Testing:
- 'make test' passes
- There are consumers, i've found no new failures [3], but please note
that KDE4's extras haven't been firmly tested. It should go without
issues anyway, because the only changes are really in Build.PL and
distribution files [4].
Charlène.
[1] https://metacpan.org/source/KENTNL/HTML-Tree-5.07/Changes
[2]
https://github.com/nigelm/html-formatter/commit/f72de441df4e2159db255bb147bebdbff3273309
[3] https://transfer.sh/oMGfA/p5-HTML-Tree.tgz
[4] https://github.com/kentfredric/HTML-Tree/commits/master
Index: Makefile
===
RCS file: /cvs/ports/www/p5-HTML-Tree/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- Makefile1 May 2017 19:54:18 - 1.28
+++ Makefile7 Jan 2019 21:24:20 -
@@ -4,21 +4,23 @@ COMMENT= perl parser that builds an HTML
MODULES= cpan
PKG_ARCH= *
-DISTNAME = HTML-Tree-5.06
+DISTNAME = HTML-Tree-5.07
CATEGORIES=www
# Perl
PERMIT_PACKAGE_CDROM= Yes
RUN_DEPENDS= www/p5-HTML-Parser>=3.46 \
- www/p5-HTML-Tagset>=3.02
+ www/p5-HTML-Tagset>=3.02 \
+ www/p5-libwww
BUILD_DEPENDS= ${RUN_DEPENDS} \
devel/p5-Test-Fatal
CONFIGURE_STYLE = modbuild
-TEST_DEPENDS= devel/p5-Test-Pod \
- devel/p5-Test-LeakTrace \
- devel/p5-Try-Tiny
+TEST_DEPENDS= devel/p5-Test-LeakTrace \
+ devel/p5-Try-Tiny
+
+MAKE_ENV +=TEST_POD=Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/www/p5-HTML-Tree/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo1 May 2017 19:54:18 - 1.11
+++ distinfo7 Jan 2019 21:24:20 -
@@ -1,2 +1,2 @@
-SHA256 (HTML-Tree-5.06.tar.gz) = nDbrGcvfmlkGyFiUjKUcNb11YfUswYxDKBrL5XMnU24=
-SIZE (HTML-Tree-5.06.tar.gz) = 150067
+SHA256 (HTML-Tree-5.07.tar.gz) = 8DdNuEcxwgS4bB1bkJdf7w0wqGvZ3vkZND5VTjGp278=
+SIZE (HTML-Tree-5.07.tar.gz) = 150477
please help fixing php-fpm on armv7
I would like to get php-fpm working again on arm. The last time I had a working version was Aug. I can build the port, run debug and report crash dumps but do not have the expertise to analyse the code. Any and all help is appreciated. I will do what I can under guidance. First, I would like to know if anyone else has experienced this problem, or am I the only one. My system is an orangepi one (Allwinner H3). The build I am testing with is a snapshot kernel of Dec 28 and ports of Jan 1. The problem I reported with building libffi on the Dec 28 ports did not reoccur on the Jan 1 ports. I configured php with as much debug as I could and ran it non-daemon for a console debug log and then as a daemon to get a core. Attached is the console log and core backtrace. op1bsdsnap1228# gdb /usr/local/sbin/php-fpm-7.2 /root/php-fpm-7.2.core GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "arm-unknown-openbsd6.4"...(no debugging symbols found) Core was generated by `php-fpm-7.2'. Program terminated with signal 11, Segmentation fault. (no debugging symbols found) Loaded symbols for /usr/local/sbin/php-fpm-7.2 Reading symbols from /usr/local/lib/libsodium.so.9.1...done. Loaded symbols for /usr/local/lib/libsodium.so.9.1 Reading symbols from /usr/lib/libreadline.so.4.0...done. Loaded symbols for /usr/lib/libreadline.so.4.0 Reading symbols from /usr/lib/libcurses.so.14.0...done. Loaded symbols for /usr/lib/libcurses.so.14.0 Reading symbols from /usr/local/lib/libonig.so.5.0...done. Loaded symbols for /usr/local/lib/libonig.so.5.0 Reading symbols from /usr/local/lib/libiconv.so.6.0...done. Loaded symbols for /usr/local/lib/libiconv.so.6.0 Reading symbols from /usr/local/lib/libintl.so.6.0...done. Loaded symbols for /usr/local/lib/libintl.so.6.0 Reading symbols from /usr/lib/libz.so.5.0...done. Loaded symbols for /usr/lib/libz.so.5.0 Reading symbols from /usr/lib/libm.so.10.1...done. Loaded symbols for /usr/lib/libm.so.10.1 Reading symbols from /usr/local/lib/libxml2.so.16.1...done. Loaded symbols for /usr/local/lib/libxml2.so.16.1 Reading symbols from /usr/local/lib/liblzma.so.2.1...done. Loaded symbols for /usr/local/lib/liblzma.so.2.1 Reading symbols from /usr/lib/libssl.so.47.1...done. Loaded symbols for /usr/lib/libssl.so.47.1 Reading symbols from /usr/lib/libcrypto.so.45.1...done. Loaded symbols for /usr/lib/libcrypto.so.45.1 Reading symbols from /usr/lib/libpthread.so.25.1...done. Loaded symbols for /usr/lib/libpthread.so.25.1 Reading symbols from /usr/lib/libc.so.93.0...done. Loaded symbols for /usr/lib/libc.so.93.0 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so #0 0xdfdfdfdc in ?? () (gdb) op1bsdsnap1228# LD_DEBUG=1 php-fpm-7.2 -F ld.so loading: 'php-fpm-7.2' exe load offset: 0x19362000 flags php-fpm-7.2 = 0x0 head php-fpm-7.2 obj php-fpm-7.2 has php-fpm-7.2 as head examining: 'php-fpm-7.2' loading: libc.so.93.0 required by php-fpm-7.2 flags /usr/lib/libc.so.93.0 = 0x0 obj /usr/lib/libc.so.93.0 has php-fpm-7.2 as head loading: libm.so.10.1 required by php-fpm-7.2 flags /usr/lib/libm.so.10.1 = 0x0 obj /usr/lib/libm.so.10.1 has php-fpm-7.2 as head loading: libssl.so.47.1 required by php-fpm-7.2 flags /usr/lib/libssl.so.47.1 = 0x0 obj /usr/lib/libssl.so.47.1 has php-fpm-7.2 as head loading: libreadline.so.4.0 required by php-fpm-7.2 flags /usr/lib/libreadline.so.4.0 = 0x0 obj /usr/lib/libreadline.so.4.0 has php-fpm-7.2 as head loading: libonig.so.5.0 required by php-fpm-7.2 flags /usr/local/lib/libonig.so.5.0 = 0x0 obj /usr/local/lib/libonig.so.5.0 has php-fpm-7.2 as head loading: libcurses.so.14.0 required by php-fpm-7.2 flags /usr/lib/libcurses.so.14.0 = 0x0 obj /usr/lib/libcurses.so.14.0 has php-fpm-7.2 as head loading: libcrypto.so.45.1 required by php-fpm-7.2 flags /usr/lib/libcrypto.so.45.1 = 0x0 obj /usr/lib/libcrypto.so.45.1 has php-fpm-7.2 as head loading: libiconv.so.6.0 required by php-fpm-7.2 flags /usr/local/lib/libiconv.so.6.0 = 0x0 obj /usr/local/lib/libiconv.so.6.0 has php-fpm-7.2 as head loading: libxml2.so.16.1 required by php-fpm-7.2 flags /usr/local/lib/libxml2.so.16.1 = 0x0 obj /usr/local/lib/libxml2.so.16.1 has php-fpm-7.2 as head loading: libz.so.5.0 required by php-fpm-7.2 flags /usr/lib/libz.so.5.0 = 0x0 obj /usr/lib/libz.so.5.0 has php-fpm-7.2 as head loading: libintl.so.6.0 required by php-fpm-7.2 flags /usr/local/lib/libintl.so.6.0 = 0x0 obj /usr/local/lib/libintl.so.6.0 has php-fpm-7.2 as head loading: liblzma.so.2.1 required by php-fpm-7.2 flags /usr/local/lib/liblzma.so.2.1 = 0x0 obj /usr/local/lib/liblzma.so.2.1 has php-fpm-7.2 as head loading: libpthread.so.25.1 required by php-fpm-7.2 flags /usr/lib/libpthread.so.25.1
Re: NEW: books/oeb
Hi, Anthony J. Bentley wrote on Mon, Jan 07, 2019 at 06:47:04AM -0700: > The Open English Bible I think adding this as a port is a bad idea. While "something is software that can be run on OpenBSD and that at least one developer or at least some users want to run on OpenBSD" may be a good enough reason to add something to ports (even though there are exceptions even to that, like certain kinds of web applications, or libraries used by no other ports), "something is a book and at least one developer wants to read it" does not look like a good enough reason to add something to ports/books. I think anything under ports/books ought to have at least some kind of a relation to OpenBSD, UNIX, or to major programming languages that can be used under OpenBSD. I don't see why ports/books should become a library of random books with no relation whatsoever to the project. Besides, i think Solene is right that installing mere PDF files provides relatively little benefit compared to having the user simply store them somewhere below /home/. A books port mostly makes sense when the contained files can be used in non-trivial ways with software. The best example probably being that man-pages-posix can be used with the man(1) -M option. Though i admit even that case is not fully convincing yet because mandoc(1) is still unable to properly format the POSIX standards documents, with the consequence that they have to be installed preformatted and support for semantic searching is unavailable. But you get the idea: the man-pages-posix port is potentially more useful than merely downloading a big PDF file. Yours, Ingo
Re: CVS: cvs.openbsd.org: ports
On 2019/01/07 20:43, Antoine Jacoutot wrote:
> On January 7, 2019 5:38:19 PM GMT+01:00, Stuart Henderson
> wrote:
> >CVSROOT: /cvs
> >Module name: ports
> >Changes by: st...@cvs.openbsd.org 2019/01/07 09:38:19
> >
> >Modified files:
> > graphics/tesseract/tesseract: Makefile
> >Added files:
> > graphics/tesseract/tesseract/patches: patch-tesseract_pc_in
> >
> >Log message:
> >Add -I/usr/local/include to include path in tesseract's pkg-config
> >file.
> >Previously it had -I/usr/local/include/tesseract but not the above,
> >which
> >doesn't work directly with typical users which include headers with
> >"#include ".
> >
> >From Raphael Graf.
>
> No bump ?
> --
> Antoine
>
It's there.
-
PatchSet 18
Date: 2019/01/07 16:38:19
Author: sthen
Branch: HEAD
Tag: (none)
Log:
Add -I/usr/local/include to include path in tesseract's pkg-config file.
Previously it had -I/usr/local/include/tesseract but not the above, which
doesn't work directly with typical users which include headers with
"#include ".
>From Raphael Graf.
Members:
Makefile:1.16->1.17
patches/patch-tesseract_pc_in:INITIAL->1.1
Index: ports/graphics/tesseract/tesseract/Makefile
===
RCS file: /cvs/ports/graphics/tesseract/tesseract/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ports/graphics/tesseract/tesseract/Makefile 4 Sep 2018 12:46:14 -
1.16
+++ ports/graphics/tesseract/tesseract/Makefile 7 Jan 2019 16:38:19 -
1.17
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2018/09/04 12:46:14 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2019/01/07 16:38:19 sthen Exp $
COMMENT= OCR Engine developed at HP Labs
GH_PROJECT=tesseract
GH_TAGNAME=3.05.02
-REVISION= 1
+REVISION= 2
SHARED_LIBS += tesseract3.2 # 3.5
--- /dev/null Mon Jan 7 20:27:49 2019
+++ ports/graphics/tesseract/tesseract/patches/patch-tesseract_pc_inMon Jan
7 20:27:49 2019
@@ -0,0 +1,24 @@
+$OpenBSD: patch-tesseract_pc_in,v 1.1 2019/01/07 16:38:19 sthen Exp $
+
+Add -I/usr/local/include to include path. Typical users include headers
+with "#include ". Patch should be removed for 4.0.0 as fixed
+upstream by changing @includedir@ definition.
+
+Index: tesseract.pc.in
+--- tesseract.pc.in.orig
tesseract.pc.in
+@@ -4,7 +4,7 @@ bindir=@bindir@
+ datarootdir = @datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@prefix@/include
+
+ Name: @PACKAGE_NAME@
+ Description: An OCR Engine that was developed at HP Labs between 1985 and
1995... and now at Google.
+@@ -13,4 +13,4 @@ Version: @VERSION@
+ Requires.private: lept
+ Libs: -L${libdir} -ltesseract
+ Libs.private: -lpthread @OPENCL_LDFLAGS@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/tesseract
bump p5-Devel-CheckLib to newer version ?
Index: Makefile === RCS file: /cvs/ports/devel/p5-Devel-CheckLib/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile29 Dec 2017 07:24:49 - 1.3 +++ Makefile7 Jan 2019 19:48:13 - @@ -3,7 +3,7 @@ COMMENT = module to check for C library availablity MODULES = cpan -DISTNAME = Devel-CheckLib-1.02 +DISTNAME = Devel-CheckLib-1.12 CATEGORIES = devel REVISION = 0 Index: distinfo === RCS file: /cvs/ports/devel/p5-Devel-CheckLib/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo2 Jan 2015 14:23:29 - 1.1.1.1 +++ distinfo7 Jan 2019 19:48:13 - @@ -1,2 +1,2 @@ -SHA256 (Devel-CheckLib-1.02.tar.gz) = 72/Ef77zbIOeM4V4iKfO2BY4IwW4C/NH/1upvw9d7EM= -SIZE (Devel-CheckLib-1.02.tar.gz) = 13277 +SHA256 (Devel-CheckLib-1.12.tar.gz) = qQq+a1RC3AoxtM9SMcYTh3ZYivwUbQrW6Nmoq8u9lVE= +SIZE (Devel-CheckLib-1.12.tar.gz) = 15222 cvs server: Diffing pkg -- -- - Knowing is not enough; we must apply. Willing is not enough; we must do
Re: CVS: cvs.openbsd.org: ports
On January 7, 2019 5:38:19 PM GMT+01:00, Stuart Henderson wrote: >CVSROOT: /cvs >Module name: ports >Changes by:st...@cvs.openbsd.org 2019/01/07 09:38:19 > >Modified files: > graphics/tesseract/tesseract: Makefile >Added files: > graphics/tesseract/tesseract/patches: patch-tesseract_pc_in > >Log message: >Add -I/usr/local/include to include path in tesseract's pkg-config >file. >Previously it had -I/usr/local/include/tesseract but not the above, >which >doesn't work directly with typical users which include headers with >"#include ". > >From Raphael Graf. No bump ? -- Antoine
Re: NEW: books/oeb
Hi Solene, Solene Rapenne writes: > "Anthony J. Bentley" wrote: > > The Open English Bible is a completely free modern English translation > > of the Bible, under a Creative Commons Zero license. It provides a > > complete New Testament, Psalms, and some Old Testament books. > > I'm not sure of the usefullness of a package with 2 subpackages for 2 > PDF files One third of the ports under books/ consist of a single PDF file. books/wndw has a single PDF file in each of its per-language MULTI_PACKAGES. I could have done the same here but if each package comes from its own distfile, I personally find bsd.port.subdir.mk easier to maintain. -- Anthony J. Bentley
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2019/01/07 12:29:30 Modified files: devel/py-cheetah: Makefile Log message: Move py-markdown from rdep to tdep To quote 70f1e43 from upstream: "Remove Markdown dependency Cheetah can use an additional module Markdown but it's not strictly required. It's required for tests."
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/01/07 12:03:30 Modified files: textproc/pdfpc : Makefile distinfo textproc/pdfpc/pkg: PLIST Log message: update to pdfpc-4.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 11:37:22 Modified files: net/ntopng : Makefile distinfo net/ntopng/patches: patch-Makefile_in patch-configure_seed patch-include_ntop_defines_h patch-include_ntop_includes_h patch-src_HTTPserver_cpp patch-src_LuaEngine_cpp net/ntopng/pkg : PLIST Added files: net/ntopng/patches: patch-nDPI_src_lib_Makefile_in patch-src_CommunityIdFlowHash_cpp patch-src_NetworkInterface_cpp patch-src_TimeseriesExporter_cpp Removed files: net/ntopng/patches: patch-third-party_LuaJIT-2_1_0-git_src_Makefile patch-third-party_LuaJIT-2_1_0-git_src_lj_obj_h Log message: update to ntopng-3.8. remove the BROKEN marker, it is now able to run for at least an hour without crashing and burning which is a big improvement over the last version.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/01/07 11:36:44 Modified files: net/mosquitto : Makefile distinfo net/mosquitto/patches: patch-lib_CMakeLists_txt patch-src_CMakeLists_txt patch-test_broker_c_Makefile Log message: update to mosquitto-1.5.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2019/01/07 11:13:00 Modified files: archivers/lzip/lziprecover: Makefile distinfo Log message: Update to lziprecover 1.21. From Sascha Paunovic.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/01/07 10:50:55 Modified files: devel/autoconf-archive: Makefile distinfo devel/autoconf-archive/pkg: PLIST Log message: update to autoconf-archive-2019.01.06
Re: NEW: books/oeb
"Anthony J. Bentley" wrote: > Hi, > > The Open English Bible is a completely free modern English translation > of the Bible, under a Creative Commons Zero license. It provides a > complete New Testament, Psalms, and some Old Testament books. > > The New Testament of the OEB is being formed on the base of the "Twentieth > Century New Testament", in particular the revised edition published in 1904. > The Old Testament books which have been completed at this stage lean heavily > on the work of John Edgar McFadyen and Charles Foster Kent, both of whom > were very respected turn of the century Old Testament scholars. > > The normative text for the OEB New Testament is the Westcott & Hort > critical text. The normative text for the OEB Old Testament is the Codex > Leningradensis, specifically the electronic version of the Westminster > Leningrad Codex. > > > Upstream provides two distfiles, the US English and Commonwealth English > versions, which I put in separate packages. > > ok? I'm not sure of the usefullness of a package with 2 subpackages for 2 PDF files
Re: graphics/tesseract pkg-config --cflags
On 2019/01/07 17:29, Raphael Graf wrote:
> Ok, I have successfully compile-tested those four ports.
> Here is an updated diff:
Thanks, committed.
>
> Index: tesseract/Makefile
> ===
> RCS file: /cvs/ports/graphics/tesseract/tesseract/Makefile,v
> retrieving revision 1.16
> diff -u -p -u -p -r1.16 Makefile
> --- tesseract/Makefile4 Sep 2018 12:46:14 - 1.16
> +++ tesseract/Makefile7 Jan 2019 16:07:34 -
> @@ -4,7 +4,7 @@ COMMENT= OCR Engine developed at HP Labs
>
> GH_PROJECT= tesseract
> GH_TAGNAME= 3.05.02
> -REVISION=1
> +REVISION=2
>
> SHARED_LIBS += tesseract3.2 # 3.5
>
> Index: tesseract/patches/patch-tesseract_pc_in
> ===
> RCS file: tesseract/patches/patch-tesseract_pc_in
> diff -N tesseract/patches/patch-tesseract_pc_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ tesseract/patches/patch-tesseract_pc_in 7 Jan 2019 16:07:34 -
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +Add -I/usr/local/include to include path. Typical users include headers
> +with "#include ". Patch should be removed for 4.0.0 as fixed
> +upstream by changing @includedir@ definition.
> +
> +Index: tesseract.pc.in
> +--- tesseract.pc.in.orig
> tesseract.pc.in
> +@@ -4,7 +4,7 @@ bindir=@bindir@
> + datarootdir = @datarootdir@
> + datadir=@datadir@
> + libdir=@libdir@
> +-includedir=@includedir@
> ++includedir=@prefix@/include
> +
> + Name: @PACKAGE_NAME@
> + Description: An OCR Engine that was developed at HP Labs between 1985 and
> 1995... and now at Google.
> +@@ -13,4 +13,4 @@ Version: @VERSION@
> + Requires.private: lept
> + Libs: -L${libdir} -ltesseract
> + Libs.private: -lpthread @OPENCL_LDFLAGS@
> +-Cflags: -I${includedir}
> ++Cflags: -I${includedir} -I${includedir}/tesseract
>
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 09:38:19 Modified files: graphics/tesseract/tesseract: Makefile Added files: graphics/tesseract/tesseract/patches: patch-tesseract_pc_in Log message: Add -I/usr/local/include to include path in tesseract's pkg-config file. Previously it had -I/usr/local/include/tesseract but not the above, which doesn't work directly with typical users which include headers with "#include ". >From Raphael Graf.
Re: graphics/tesseract pkg-config --cflags
On Mon, January 7, 2019 4:16 pm, Stuart Henderson wrote:
> On 2019/01/07 16:06, Raphael Graf wrote:
>> On 1/7/19 3:46 PM, Stuart Henderson wrote:
>> > On 2019/01/07 15:29, Raphael Graf wrote:
>> > > The diff below fixes the pkg-config file installed by tesseract.
>> > >
>> > > Before:
>> > > x1$ pkg-config --cflags tesseract
>> > > -I/usr/local/include/tesseract -I/usr/local/include/leptonica
>> > >
>> > > After:
>> > > x1$ pkg-config --cflags tesseract
>> > > -I/usr/local/include -I/usr/local/include/tesseract
>> > > -I/usr/local/include/leptonica
>> > >
>> > > The fix is inspired by tesseract.pc.cmake (which we do not use):
>> > > https://github.com/tesseract-ocr/tesseract/blob/3.05/tesseract.pc.cmake
>> > >
>> > > (The issue is already fixed in upstream version 4.0.0)
>> >
>> > Could you explain the problem please? I don't see anything different in
>> > git master for this file, and don't see why -I/usr/local/include is needed
>> > when the files are all in the subdirectory?
>>
>> The tesseract headers are normally included like this:
>> #include
>>
>> For example in one of the opencv_contrib modules:
>> https://github.com/opencv/opencv_contrib/blob/master/modules/text/src/precomp.hpp
>>
>> The git master version uses '-I/usr/local/include' only.
>> (It is not obvious if you are looking at tesseract.pc.in, the value of
>> @includedir@ is in fact '/usr/local/include' now).
>
> Ah I see, thanks. Then the patch makes sense, but also needs a REVISION
> bump since it changes the files in the package, and a quick build test
> with the existing dependencies just to make sure it doesn't add a problem:
>
> graphics/pdfsandwich
> mail/p5-FuzzyOcr
> multimedia/ogmrip
> x11/gnome/ocrfeeder
>
> Could you add a quick comment to the patch (under the CVS line) too e.g.
>
>Add -I/usr/local/include to include path. Typical users include headers
>with "#include ". Patch should be removed for 4.0.0 as
> fixed
>upstream by changing @includedir@ definition.
>
>
Ok, I have successfully compile-tested those four ports.
Here is an updated diff:
Index: tesseract/Makefile
===
RCS file: /cvs/ports/graphics/tesseract/tesseract/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- tesseract/Makefile 4 Sep 2018 12:46:14 - 1.16
+++ tesseract/Makefile 7 Jan 2019 16:07:34 -
@@ -4,7 +4,7 @@ COMMENT=OCR Engine developed at HP Labs
GH_PROJECT=tesseract
GH_TAGNAME=3.05.02
-REVISION= 1
+REVISION= 2
SHARED_LIBS += tesseract3.2 # 3.5
Index: tesseract/patches/patch-tesseract_pc_in
===
RCS file: tesseract/patches/patch-tesseract_pc_in
diff -N tesseract/patches/patch-tesseract_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ tesseract/patches/patch-tesseract_pc_in 7 Jan 2019 16:07:34 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Add -I/usr/local/include to include path. Typical users include headers
+with "#include ". Patch should be removed for 4.0.0 as fixed
+upstream by changing @includedir@ definition.
+
+Index: tesseract.pc.in
+--- tesseract.pc.in.orig
tesseract.pc.in
+@@ -4,7 +4,7 @@ bindir=@bindir@
+ datarootdir = @datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@prefix@/include
+
+ Name: @PACKAGE_NAME@
+ Description: An OCR Engine that was developed at HP Labs between 1985 and
1995... and now at Google.
+@@ -13,4 +13,4 @@ Version: @VERSION@
+ Requires.private: lept
+ Libs: -L${libdir} -ltesseract
+ Libs.private: -lpthread @OPENCL_LDFLAGS@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/tesseract
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/01/07 09:29:26 Modified files: security/sqlmap: Makefile distinfo security/sqlmap/pkg: PLIST Log message: update for SQLMap to 1.3 OK rpointel@
Re: glib 2.58.2 broken on powerpc (missing atomic ops ?)
On Mon, Jan 07, 2019 at 03:49:47PM +, Stuart Henderson wrote:
> On 2019/01/07 16:42, Antoine Jacoutot wrote:
> > On Mon, Jan 07, 2019 at 04:35:51PM +0100, Matthieu Herrb wrote:
> > > Hi,
> > >
> > > Trying to build some ports on macppc, glib2 is now broken:
> > >
> > > FAILED: glib/4430778@@glib-2.0@sha/gatomic.c.o
> > > cc -Iglib/4430778@@glib-2.0@sha -Iglib -I../glib-2.58.2/glib -I.
> > > -I../glib-2.58.2/ -I/usr/local/include -pipe -D_FILE_OFFSET_BITS=64
> > > -std=gnu89 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wstrict-prototypes
> > > -Wunused -Wno-bad-function-cast -Werror=declaration-after-statement
> > > -Werror=format=2 -Werror=implicit-function-declaration -Werror=init-self
> > > -Werror=missing-include-dirs -Werror=missing-prototypes
> > > -Werror=pointer-arith -O2 -g -fPIC -pthread '-DG_LOG_DOMAIN="GLib"'
> > > -DGLIB_COMPILATION -fvisibility=hidden -MD -MQ
> > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -MF
> > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o.d' -o
> > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -c ../glib-2.58.2/glib/gatomic.c
> > > ../glib-2.58.2/glib/gatomic.c:675:2: error: #error G_ATOMIC_LOCK_FREE
> > > defined, but incapable of lock-free atomics.
> > > ninja: build stopped: subcommand failed.
> >
> > Probably a broken test at configure time?
> >
> > --
> > Antoine
> >
>
> This is the one landry ran into the other day I think?
Yes that's the one.
https://gitlab.gnome.org/GNOME/glib/blob/master/glib/gatomic.c#L675 is
where it barfs.
https://gitlab.gnome.org/GNOME/glib/blob/master/meson.build#L1578
might have to be tested for OpenBSD. from what i understood reading
https://gitlab.gnome.org/GNOME/glib/blob/master/meson.build#L1562 meson links
int main() {
volatile int atomic = 2;
__sync_bool_compare_and_swap (, 2, 3);
return 0;
}
to check that atomic ops are supported but later on
__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 isnt defined for some reason and the
#ifdef explodes in gatomic.c.
note that it also affects sparc64, and probably all non-clang archs.
on the bright side the current sparc64 & macppc bulks will have a fast
turnaround, as not having glib2 cuts a good chunk of the tree.
Landry
Re: glib 2.58.2 broken on powerpc (missing atomic ops ?)
On 2019/01/07 16:57, Matthieu Herrb wrote:
> On Mon, Jan 07, 2019 at 04:42:26PM +0100, Antoine Jacoutot wrote:
> > On Mon, Jan 07, 2019 at 04:35:51PM +0100, Matthieu Herrb wrote:
> > > Hi,
> > >
> > > Trying to build some ports on macppc, glib2 is now broken:
> > >
> > > FAILED: glib/4430778@@glib-2.0@sha/gatomic.c.o
> > > cc -Iglib/4430778@@glib-2.0@sha -Iglib -I../glib-2.58.2/glib -I.
> > > -I../glib-2.58.2/ -I/usr/local/include -pipe -D_FILE_OFFSET_BITS=64
> > > -std=gnu89 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wstrict-prototypes
> > > -Wunused -Wno-bad-function-cast -Werror=declaration-after-statement
> > > -Werror=format=2 -Werror=implicit-function-declaration -Werror=init-self
> > > -Werror=missing-include-dirs -Werror=missing-prototypes
> > > -Werror=pointer-arith -O2 -g -fPIC -pthread '-DG_LOG_DOMAIN="GLib"'
> > > -DGLIB_COMPILATION -fvisibility=hidden -MD -MQ
> > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -MF
> > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o.d' -o
> > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -c ../glib-2.58.2/glib/gatomic.c
> > > ../glib-2.58.2/glib/gatomic.c:675:2: error: #error G_ATOMIC_LOCK_FREE
> > > defined, but incapable of lock-free atomics.
> > > ninja: build stopped: subcommand failed.
> >
> > Probably a broken test at configure time?
>
> The full log is here : http://herrb.eu/glib2-2.58.2p0.log
>
> Intesting lines:
>
> meson.build:1534: WARNING: Unknown host cpu: macppc
> Checking if "atomic ops" links: YES
>
> --
> Matthieu Herrb
>
You should have ${WRKDIR}/build-*/meson-logs/meson-log.txt with the results
of the compiler tests, which may give a clue ..
Re: glib 2.58.2 broken on powerpc (missing atomic ops ?)
On Mon, Jan 07, 2019 at 04:42:26PM +0100, Antoine Jacoutot wrote: > On Mon, Jan 07, 2019 at 04:35:51PM +0100, Matthieu Herrb wrote: > > Hi, > > > > Trying to build some ports on macppc, glib2 is now broken: > > > > FAILED: glib/4430778@@glib-2.0@sha/gatomic.c.o > > cc -Iglib/4430778@@glib-2.0@sha -Iglib -I../glib-2.58.2/glib -I. > > -I../glib-2.58.2/ -I/usr/local/include -pipe -D_FILE_OFFSET_BITS=64 > > -std=gnu89 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wstrict-prototypes > > -Wunused -Wno-bad-function-cast -Werror=declaration-after-statement > > -Werror=format=2 -Werror=implicit-function-declaration -Werror=init-self > > -Werror=missing-include-dirs -Werror=missing-prototypes > > -Werror=pointer-arith -O2 -g -fPIC -pthread '-DG_LOG_DOMAIN="GLib"' > > -DGLIB_COMPILATION -fvisibility=hidden -MD -MQ > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -MF > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o.d' -o > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -c ../glib-2.58.2/glib/gatomic.c > > ../glib-2.58.2/glib/gatomic.c:675:2: error: #error G_ATOMIC_LOCK_FREE > > defined, but incapable of lock-free atomics. > > ninja: build stopped: subcommand failed. > > Probably a broken test at configure time? The full log is here : http://herrb.eu/glib2-2.58.2p0.log Intesting lines: meson.build:1534: WARNING: Unknown host cpu: macppc Checking if "atomic ops" links: YES -- Matthieu Herrb
Re: glib 2.58.2 broken on powerpc (missing atomic ops ?)
On 2019/01/07 16:42, Antoine Jacoutot wrote: > On Mon, Jan 07, 2019 at 04:35:51PM +0100, Matthieu Herrb wrote: > > Hi, > > > > Trying to build some ports on macppc, glib2 is now broken: > > > > FAILED: glib/4430778@@glib-2.0@sha/gatomic.c.o > > cc -Iglib/4430778@@glib-2.0@sha -Iglib -I../glib-2.58.2/glib -I. > > -I../glib-2.58.2/ -I/usr/local/include -pipe -D_FILE_OFFSET_BITS=64 > > -std=gnu89 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wstrict-prototypes > > -Wunused -Wno-bad-function-cast -Werror=declaration-after-statement > > -Werror=format=2 -Werror=implicit-function-declaration -Werror=init-self > > -Werror=missing-include-dirs -Werror=missing-prototypes > > -Werror=pointer-arith -O2 -g -fPIC -pthread '-DG_LOG_DOMAIN="GLib"' > > -DGLIB_COMPILATION -fvisibility=hidden -MD -MQ > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -MF > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o.d' -o > > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -c ../glib-2.58.2/glib/gatomic.c > > ../glib-2.58.2/glib/gatomic.c:675:2: error: #error G_ATOMIC_LOCK_FREE > > defined, but incapable of lock-free atomics. > > ninja: build stopped: subcommand failed. > > Probably a broken test at configure time? > > -- > Antoine > This is the one landry ran into the other day I think? I've seen similar before where an autoconf script does a test compile (to a .o) but doesn't try linking and/or running it so the error doesn't show up.
UPDATE: SQLmap 1.3
Hello, Update for SQLMap to 1.3: https://github.com/sqlmapproject/sqlmap/compare/1.3...master OK? Comments? Cheers.- -- Sending from my toaster. Index: Makefile === RCS file: /cvs/ports/security/sqlmap/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile21 Nov 2018 11:23:02 - 1.13 +++ Makefile7 Jan 2019 15:45:49 - @@ -4,7 +4,7 @@ COMMENT = penetration testing tool to d GH_ACCOUNT = sqlmapproject GH_PROJECT = sqlmap -GH_TAGNAME = 1.2.11 +GH_TAGNAME = 1.3 CATEGORIES = security Index: distinfo === RCS file: /cvs/ports/security/sqlmap/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo21 Nov 2018 11:23:02 - 1.11 +++ distinfo7 Jan 2019 15:45:49 - @@ -1,2 +1,2 @@ -SHA256 (sqlmap-1.2.11.tar.gz) = qde/qvkvGcHtYLlaCGBVh9fImKTUF6+T3OU67zexSuA= -SIZE (sqlmap-1.2.11.tar.gz) = 7426205 +SHA256 (sqlmap-1.3.tar.gz) = fqRoTgGVbkEZYKX9im1bdLP1lywqPGVT+9HnKYGRkP8= +SIZE (sqlmap-1.3.tar.gz) = 7431942 Index: pkg/PLIST === RCS file: /cvs/ports/security/sqlmap/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- pkg/PLIST 21 Nov 2018 11:23:02 - 1.11 +++ pkg/PLIST 7 Jan 2019 15:45:49 - @@ -558,6 +558,7 @@ share/sqlmap/sqlmap.py share/sqlmap/sqlmap.pyc share/sqlmap/sqlmapapi.py share/sqlmap/sqlmapapi.pyc +share/sqlmap/swagger.yaml share/sqlmap/tamper/ share/sqlmap/tamper/0x2char.py share/sqlmap/tamper/0x2char.pyc @@ -934,6 +935,8 @@ share/sqlmap/waf/airlock.py share/sqlmap/waf/airlock.pyc share/sqlmap/waf/anquanbao.py share/sqlmap/waf/anquanbao.pyc +share/sqlmap/waf/approach.py +share/sqlmap/waf/approach.pyc share/sqlmap/waf/armor.py share/sqlmap/waf/armor.pyc share/sqlmap/waf/asm.py @@ -950,6 +953,8 @@ share/sqlmap/waf/binarysec.py share/sqlmap/waf/binarysec.pyc share/sqlmap/waf/blockdos.py share/sqlmap/waf/blockdos.pyc +share/sqlmap/waf/bluedon.py +share/sqlmap/waf/bluedon.pyc share/sqlmap/waf/chinacache.py share/sqlmap/waf/chinacache.pyc share/sqlmap/waf/ciscoacexml.py
Re: glib 2.58.2 broken on powerpc (missing atomic ops ?)
On Mon, Jan 07, 2019 at 04:35:51PM +0100, Matthieu Herrb wrote: > Hi, > > Trying to build some ports on macppc, glib2 is now broken: > > FAILED: glib/4430778@@glib-2.0@sha/gatomic.c.o > cc -Iglib/4430778@@glib-2.0@sha -Iglib -I../glib-2.58.2/glib -I. > -I../glib-2.58.2/ -I/usr/local/include -pipe -D_FILE_OFFSET_BITS=64 > -std=gnu89 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wstrict-prototypes > -Wunused -Wno-bad-function-cast -Werror=declaration-after-statement > -Werror=format=2 -Werror=implicit-function-declaration -Werror=init-self > -Werror=missing-include-dirs -Werror=missing-prototypes -Werror=pointer-arith > -O2 -g -fPIC -pthread '-DG_LOG_DOMAIN="GLib"' -DGLIB_COMPILATION > -fvisibility=hidden -MD -MQ 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -MF > 'glib/4430778@@glib-2.0@sha/gatomic.c.o.d' -o > 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -c ../glib-2.58.2/glib/gatomic.c > ../glib-2.58.2/glib/gatomic.c:675:2: error: #error G_ATOMIC_LOCK_FREE > defined, but incapable of lock-free atomics. > ninja: build stopped: subcommand failed. Probably a broken test at configure time? -- Antoine
glib 2.58.2 broken on powerpc (missing atomic ops ?)
Hi, Trying to build some ports on macppc, glib2 is now broken: FAILED: glib/4430778@@glib-2.0@sha/gatomic.c.o cc -Iglib/4430778@@glib-2.0@sha -Iglib -I../glib-2.58.2/glib -I. -I../glib-2.58.2/ -I/usr/local/include -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wstrict-prototypes -Wunused -Wno-bad-function-cast -Werror=declaration-after-statement -Werror=format=2 -Werror=implicit-function-declaration -Werror=init-self -Werror=missing-include-dirs -Werror=missing-prototypes -Werror=pointer-arith -O2 -g -fPIC -pthread '-DG_LOG_DOMAIN="GLib"' -DGLIB_COMPILATION -fvisibility=hidden -MD -MQ 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -MF 'glib/4430778@@glib-2.0@sha/gatomic.c.o.d' -o 'glib/4430778@@glib-2.0@sha/gatomic.c.o' -c ../glib-2.58.2/glib/gatomic.c ../glib-2.58.2/glib/gatomic.c:675:2: error: #error G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics. ninja: build stopped: subcommand failed. -- Matthieu Herrb
Re: graphics/tesseract pkg-config --cflags
On 2019/01/07 16:06, Raphael Graf wrote: > On 1/7/19 3:46 PM, Stuart Henderson wrote: > > On 2019/01/07 15:29, Raphael Graf wrote: > > > The diff below fixes the pkg-config file installed by tesseract. > > > > > > Before: > > > x1$ pkg-config --cflags tesseract > > > -I/usr/local/include/tesseract -I/usr/local/include/leptonica > > > > > > After: > > > x1$ pkg-config --cflags tesseract > > > -I/usr/local/include -I/usr/local/include/tesseract > > > -I/usr/local/include/leptonica > > > > > > The fix is inspired by tesseract.pc.cmake (which we do not use): > > > https://github.com/tesseract-ocr/tesseract/blob/3.05/tesseract.pc.cmake > > > > > > (The issue is already fixed in upstream version 4.0.0) > > > > Could you explain the problem please? I don't see anything different in > > git master for this file, and don't see why -I/usr/local/include is needed > > when the files are all in the subdirectory? > > The tesseract headers are normally included like this: > #include > > For example in one of the opencv_contrib modules: > https://github.com/opencv/opencv_contrib/blob/master/modules/text/src/precomp.hpp > > The git master version uses '-I/usr/local/include' only. > (It is not obvious if you are looking at tesseract.pc.in, the value of > @includedir@ is in fact '/usr/local/include' now). Ah I see, thanks. Then the patch makes sense, but also needs a REVISION bump since it changes the files in the package, and a quick build test with the existing dependencies just to make sure it doesn't add a problem: graphics/pdfsandwich mail/p5-FuzzyOcr multimedia/ogmrip x11/gnome/ocrfeeder Could you add a quick comment to the patch (under the CVS line) too e.g. Add -I/usr/local/include to include path. Typical users include headers with "#include ". Patch should be removed for 4.0.0 as fixed upstream by changing @includedir@ definition.
Re: graphics/tesseract pkg-config --cflags
On 1/7/19 3:46 PM, Stuart Henderson wrote:
On 2019/01/07 15:29, Raphael Graf wrote:
The diff below fixes the pkg-config file installed by tesseract.
Before:
x1$ pkg-config --cflags tesseract
-I/usr/local/include/tesseract -I/usr/local/include/leptonica
After:
x1$ pkg-config --cflags tesseract
-I/usr/local/include -I/usr/local/include/tesseract
-I/usr/local/include/leptonica
The fix is inspired by tesseract.pc.cmake (which we do not use):
https://github.com/tesseract-ocr/tesseract/blob/3.05/tesseract.pc.cmake
(The issue is already fixed in upstream version 4.0.0)
Could you explain the problem please? I don't see anything different in
git master for this file, and don't see why -I/usr/local/include is needed
when the files are all in the subdirectory?
The tesseract headers are normally included like this:
#include
For example in one of the opencv_contrib modules:
https://github.com/opencv/opencv_contrib/blob/master/modules/text/src/precomp.hpp
The git master version uses '-I/usr/local/include' only.
(It is not obvious if you are looking at tesseract.pc.in, the value of
@includedir@ is in fact '/usr/local/include' now).
Index: tesseract/patches/patch-tesseract_pc_in
===
RCS file: tesseract/patches/patch-tesseract_pc_in
diff -N tesseract/patches/patch-tesseract_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ tesseract/patches/patch-tesseract_pc_in 7 Jan 2019 13:56:00 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: tesseract.pc.in
+--- tesseract.pc.in.orig
tesseract.pc.in
+@@ -4,7 +4,7 @@ bindir=@bindir@
+ datarootdir = @datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@prefix@/include
+
+ Name: @PACKAGE_NAME@
+ Description: An OCR Engine that was developed at HP Labs between 1985 and
1995... and now at Google.
+@@ -13,4 +13,4 @@ Version: @VERSION@
+ Requires.private: lept
+ Libs: -L${libdir} -ltesseract
+ Libs.private: -lpthread @OPENCL_LDFLAGS@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/tesseract
kde4 and kde5 conflicts
Hi. This failed in my last bulk because libksane-4.14.3p3 conflicts with libksane-kf5-18.12.0. >>> Building on exopi-4 under x11/tellico BDEPENDS = [devel/gettext-tools;audio/taglib;net/yaz;devel/kf5/kjobwidgets;devel/kf5/kitemviews;lang/python/2.7;audio/libcdio;x11/qt5/qttools,-main;devel/kf5/kwallet;devel/kf5/solid;devel/kf5/kwidgetsaddons;devel/kf5/kxmlgui;devel/kf5/kitemmodels;devel/kf5/kdoctools;devel/kf5/kcoreaddons;devel/kf5/kio;devel/kf5/knewstuff;devel/kf5/karchive;print/poppler,,-qt5;textproc/libxml;textproc/libxslt;devel/cmake;devel/kf5/kiconthemes;devel/kf5/extra-cmake-modules;devel/kf5/sonnet;devel/kf5/khtml;devel/kf5/kcompletion;x11/qt5/qtbase,-main;devel/kf5/attica;devel/kf5/kwindowsystem;devel/kf5/kjs;x11/kde-applications/libksane;devel/kf5/kparts;devel/kf5/kguiaddons;devel/kf5/ki18n;textproc/exempi;devel/ninja;devel/kf5/kbookmarks;archivers/xz;devel/kf5/kfilemetadata;devel/kf5/kcodecs;devel/kf5/kcrash;devel/kf5/kconfigwidgets;devel/kf5/kservice;devel/kf5/kconfig] DIST = [x11/tellico:tellico-3.1.4.tar.xz] FULLPKGNAME = tellico-3.1.4 RDEPENDS = [audio/taglib;misc/shared-mime-info;devel/kf5/kjobwidgets;net/yaz;devel/kf5/kitemviews;lang/python/2.7;audio/libcdio;devel/kf5/kwallet;devel/kf5/solid;devel/kf5/kwidgetsaddons;devel/kf5/kxmlgui;devel/kf5/kitemmodels;devel/kf5/kdoctools;devel/kf5/kcoreaddons;devel/kf5/knewstuff;devel/kf5/kio;devel/kf5/karchive;print/poppler,,-qt5;textproc/libxml;textproc/libxslt;devel/kf5/kiconthemes;devel/kf5/sonnet;devel/kf5/khtml;devel/kf5/kcompletion;devel/kf5/attica;x11/qt5/qtbase,-main;devel/kf5/kwindowsystem;x11/gtk+3,-guic;devel/kf5/kjs;x11/kde-applications/libksane;devel/kf5/kparts;devel/kf5/kguiaddons;devel/kf5/ki18n;textproc/exempi;devel/kf5/kbookmarks;devel/kf5/kfilemetadata;devel/desktop-file-utils;devel/kf5/kcodecs;devel/kf5/kcrash;devel/kf5/kconfigwidgets;devel/kf5/kservice;devel/kf5/kconfig] (Junk lock obtained for exopi-4 at 1546870858) >>> Running depends in x11/tellico at 1546870858 last junk was in x11/kde-applications/libkgeomap /usr/sbin/pkg_add -aI -Drepair exempi-2.2.1p2 extra-cmake-modules-5.51.0 karchive-5.51.0 kbookmarks-5.51.0 kcodecs-5.51.0 kcompletion-5.51.0 kconfig-5.51.0 kconfigwidgets-5.51.0 kcoreaddons-5.51.0 kcrash-5.51.0 kdoctools-5.51.0 kf5-attica-5.51.0 kf5-kfilemetadata-5.51.0 kf5-kwallet-5.51.0 kguiaddons-5.51.0 khtml-5.51.0 ki18n-5.51.0 kiconthemes-5.51.0 kio-5.51.0 kitemmodels-5.51.0 kitemviews-5.51.0 kjobwidgets-5.51.0 kjs-5.51.0 knewstuff-5.51.0 kparts-5.51.0 kservice-5.51.0 kwidgetsaddons-5.51.0 kwindowsystem-5.51.0 kxmlgui-5.51.0 libcdio-0.80p10 libksane-kf5-18.12.0 libxml-2.9.8p0 libxslt-1.1.32 poppler-qt5-0.72.0 qttools-5.9.7 solid-5.51.0p0 sonnet-5.51.0 taglib-1.11.1p1 xz-5.2.4 yaz-3.0.49p9 was: /usr/sbin/pkg_add -aI -Drepair cmake-3.10.2p1v0 exempi-2.2.1p2 extra-cmake-modules-5.51.0 gettext-tools-0.19.8.1 karchive-5.51.0 kbookmarks-5.51.0 kcodecs-5.51.0 kcompletion-5.51.0 kconfig-5.51.0 kconfigwidgets-5.51.0 kcoreaddons-5.51.0 kcrash-5.51.0 kdoctools-5.51.0 kf5-attica-5.51.0 kf5-kfilemetadata-5.51.0 kf5-kwallet-5.51.0 kguiaddons-5.51.0 khtml-5.51.0 ki18n-5.51.0 kiconthemes-5.51.0 kio-5.51.0 kitemmodels-5.51.0 kitemviews-5.51.0 kjobwidgets-5.51.0 kjs-5.51.0 knewstuff-5.51.0 kparts-5.51.0 kservice-5.51.0 kwidgetsaddons-5.51.0 kwindowsystem-5.51.0 kxmlgui-5.51.0 libcdio-0.80p10 libksane-kf5-18.12.0 libxml-2.9.8p0 libxslt-1.1.32 ninja-1.8.2p0 poppler-qt5-0.72.0 python-2.7.15p1 qtbase-5.9.7p1 qttools-5.9.7 solid-5.51.0p0 sonnet-5.51.0 taglib-1.11.1p1 xz-5.2.4 yaz-3.0.49p9 /usr/sbin/pkg_add -aI -Drepair exempi-2.2.1p2 extra-cmake-modules-5.51.0 karchive-5.51.0 kbookmarks-5.51.0 kcodecs-5.51.0 kcompletion-5.51.0 kconfig-5.51.0 kconfigwidgets-5.51.0 kcoreaddons-5.51.0 kcrash-5.51.0 kdoctools-5.51.0 kf5-attica-5.51.0 kf5-kfilemetadata-5.51.0 kf5-kwallet-5.51.0 kguiaddons-5.51.0 khtml-5.51.0 ki18n-5.51.0 kiconthemes-5.51.0 kio-5.51.0 kitemmodels-5.51.0 kitemviews-5.51.0 kjobwidgets-5.51.0 kjs-5.51.0 knewstuff-5.51.0 kparts-5.51.0 kservice-5.51.0 kwidgetsaddons-5.51.0 kwindowsystem-5.51.0 kxmlgui-5.51.0 libcdio-0.80p10 libksane-kf5-18.12.0 libxml-2.9.8p0 libxslt-1.1.32 poppler-qt5-0.72.0 qttools-5.9.7 solid-5.51.0p0 sonnet-5.51.0 taglib-1.11.1p1 xz-5.2.4 yaz-3.0.49p9 Collision in libksane-kf5-18.12.0: the following files already exist /usr/local/share/icons/hicolor/16x16/actions/black-white.png (libksane-4.14.3p3 and libksane-kf5-18.12.0) /usr/local/share/icons/hicolor/16x16/actions/color.png (libksane-4.14.3p3 and libksane-kf5-18.12.0) /usr/local/share/icons/hicolor/16x16/actions/gray-scale.png (libksane-4.14.3p3 and libksane-kf5-18.12.0) Couldn't install libksane-kf5-18.12.0 >>> Running show-prepare-results in x11/tellico at 1546870877 ===> x11/tellico ===> tellico-3.1.4 depends on: gettext-tools-* -> gettext-tools-0.19.8.1 ===> tellico-3.1.4 depends on: kdoctools-* -> kdoctools-5.51.0 ===> tellico-3.1.4 depends on:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 08:04:47 Modified files: x11/gnome/gvfs : Makefile Log message: move the -Db_asneeded=false block down below the previous .include , ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/07 08:03:21 Modified files: x11/gnome/music: Makefile Log message: Also needs x11/gnome/online-accounts...
[UPDATE] textproc/p5-Text-CSV 1.33 -> 1.99
Hi ports, Here is an update for Text::CSV that unbreaks tests with Perl 5.28. What's new upstream (partial, see [1]): - Sync pure Perl code with Text::CSV_XS - Fix tests with Perl without '.' in @INC Port-wise it's a simple version bump. Testing: - 'make test' passes - There are consumers, and i've found no new failures due to that update [2]. Charlène. [1] https://metacpan.org/source/ISHIGAKI/Text-CSV-1.99/Changes [2] https://transfer.sh/J4PAb/p5-Text-CSV.tgz Index: Makefile === RCS file: /cvs/ports/textproc/p5-Text-CSV/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile20 Mar 2016 19:57:09 - 1.14 +++ Makefile7 Jan 2019 14:20:18 - @@ -4,7 +4,7 @@ COMMENT = comma-separated values manipul MODULES = cpan PKG_ARCH = * -DISTNAME = Text-CSV-1.33 +DISTNAME = Text-CSV-1.99 CATEGORIES = textproc MAINTAINER = Andrew Fresh Index: distinfo === RCS file: /cvs/ports/textproc/p5-Text-CSV/distinfo,v retrieving revision 1.8 diff -u -p -u -p -r1.8 distinfo --- distinfo6 May 2015 00:40:25 - 1.8 +++ distinfo7 Jan 2019 14:20:18 - @@ -1,2 +1,2 @@ -SHA256 (Text-CSV-1.33.tar.gz) = nFuPubr/1Y8C7Ss/C22aZFQZjxioDn86BJaA3b2yQRU= -SIZE (Text-CSV-1.33.tar.gz) = 64771 +SHA256 (Text-CSV-1.99.tar.gz) = 507AObEsxR00a/HYFK99uKBcsKmDQOdUeiFkbahmjNI= +SIZE (Text-CSV-1.99.tar.gz) = 126231
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/07 07:52:50 Modified files: mail/evolution : Makefile distinfo Log message: Update to evolution-3.30.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/07 07:51:46 Modified files: databases/evolution-data-server: Makefile distinfo databases/evolution-data-server/pkg: PLIST Log message: Update to evolution-data-server-3.30.4.
Re: graphics/tesseract pkg-config --cflags
On 2019/01/07 15:29, Raphael Graf wrote:
> The diff below fixes the pkg-config file installed by tesseract.
>
> Before:
> x1$ pkg-config --cflags tesseract
> -I/usr/local/include/tesseract -I/usr/local/include/leptonica
>
> After:
> x1$ pkg-config --cflags tesseract
> -I/usr/local/include -I/usr/local/include/tesseract
> -I/usr/local/include/leptonica
>
> The fix is inspired by tesseract.pc.cmake (which we do not use):
> https://github.com/tesseract-ocr/tesseract/blob/3.05/tesseract.pc.cmake
>
> (The issue is already fixed in upstream version 4.0.0)
Could you explain the problem please? I don't see anything different in
git master for this file, and don't see why -I/usr/local/include is needed
when the files are all in the subdirectory?
>
> Index: tesseract/patches/patch-tesseract_pc_in
> ===
> RCS file: tesseract/patches/patch-tesseract_pc_in
> diff -N tesseract/patches/patch-tesseract_pc_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ tesseract/patches/patch-tesseract_pc_in 7 Jan 2019 13:56:00 -
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Index: tesseract.pc.in
> +--- tesseract.pc.in.orig
> tesseract.pc.in
> +@@ -4,7 +4,7 @@ bindir=@bindir@
> + datarootdir = @datarootdir@
> + datadir=@datadir@
> + libdir=@libdir@
> +-includedir=@includedir@
> ++includedir=@prefix@/include
> +
> + Name: @PACKAGE_NAME@
> + Description: An OCR Engine that was developed at HP Labs between 1985 and
> 1995... and now at Google.
> +@@ -13,4 +13,4 @@ Version: @VERSION@
> + Requires.private: lept
> + Libs: -L${libdir} -ltesseract
> + Libs.private: -lpthread @OPENCL_LDFLAGS@
> +-Cflags: -I${includedir}
> ++Cflags: -I${includedir} -I${includedir}/tesseract
>
>
[UPDATE] textproc/p5-String-CamelCase 0.02 -> 0.04
Hi ports! I'm proposing here an update for String::CamelCase. What's new upstream [1]: - Unbreak build with newer Perl versions - Fix metafile generation Port-wise it's a version bump with Pod testing added. Testing: - 'make test' passes - There are consumers, and this update introduces no new failures [2] Charlène. [1] https://metacpan.org/changes/distribution/String-CamelCase [2] https://transfer.sh/La5eR/p5-String-CamelCase.tgz Index: Makefile === RCS file: /cvs/ports/textproc/p5-String-CamelCase/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile20 Mar 2016 19:57:08 - 1.4 +++ Makefile7 Jan 2019 13:05:41 - @@ -4,13 +4,14 @@ COMMENT= camelcase, de-camelcase MODULES= cpan PKG_ARCH= * -DISTNAME= String-CamelCase-0.02 -REVISION= 0 +DISTNAME= String-CamelCase-0.04 CATEGORIES=textproc MAINTAINER=Andrew Fresh # Same as Perl PERMIT_PACKAGE_CDROM= Yes + +MAKE_ENV +=TEST_POD=Yes .include Index: distinfo === RCS file: /cvs/ports/textproc/p5-String-CamelCase/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo18 Jan 2015 03:15:25 - 1.2 +++ distinfo7 Jan 2019 13:05:41 - @@ -1,2 +1,2 @@ -SHA256 (String-CamelCase-0.02.tar.gz) = gmiNmsLwH4Eo4mlQBeDJ/ES1dj0V8M1wLq98cZVFcJ4= -SIZE (String-CamelCase-0.02.tar.gz) = 8250 +SHA256 (String-CamelCase-0.04.tar.gz) = icPevO7Orodk9F10Aj+Pvu4tiDma9nVB29qgsr8nEak= +SIZE (String-CamelCase-0.04.tar.gz) = 7877
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 07:32:28 Modified files: security/libsodium: Makefile distinfo Log message: update to libsodium-1.0.17
graphics/tesseract pkg-config --cflags
The diff below fixes the pkg-config file installed by tesseract.
Before:
x1$ pkg-config --cflags tesseract
-I/usr/local/include/tesseract -I/usr/local/include/leptonica
After:
x1$ pkg-config --cflags tesseract
-I/usr/local/include -I/usr/local/include/tesseract
-I/usr/local/include/leptonica
The fix is inspired by tesseract.pc.cmake (which we do not use):
https://github.com/tesseract-ocr/tesseract/blob/3.05/tesseract.pc.cmake
(The issue is already fixed in upstream version 4.0.0)
Index: tesseract/patches/patch-tesseract_pc_in
===
RCS file: tesseract/patches/patch-tesseract_pc_in
diff -N tesseract/patches/patch-tesseract_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ tesseract/patches/patch-tesseract_pc_in 7 Jan 2019 13:56:00 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: tesseract.pc.in
+--- tesseract.pc.in.orig
tesseract.pc.in
+@@ -4,7 +4,7 @@ bindir=@bindir@
+ datarootdir = @datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@prefix@/include
+
+ Name: @PACKAGE_NAME@
+ Description: An OCR Engine that was developed at HP Labs between 1985 and
1995... and now at Google.
+@@ -13,4 +13,4 @@ Version: @VERSION@
+ Requires.private: lept
+ Libs: -L${libdir} -ltesseract
+ Libs.private: -lpthread @OPENCL_LDFLAGS@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/tesseract
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 07:29:42 Modified files: x11/x11vnc : Makefile distinfo Log message: minor update to x11vnc-0.9.16
Re: UPDATE: cool-retro-term 1.0.1 -> 1.1.0
On 2019/01/07 13:13, Stuart Henderson wrote:
> On 2019/01/07 13:17, Sascha Paunovic wrote:
> > On Mon, 7 Jan 2019 12:03:49 +
> > Stuart Henderson wrote:
> >
> > > Not new with the update, but that's a bad filename for a distfile.
> > > It would be better to use this:
> > >
> > > DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> > > qmltermwidget-{}${QMLTERMWIDGET}.tar.gz:0
> > >
> > > and regenerate distinfo.
> >
> > Yep, it's pretty unelegant. Quick question; would
> >
> > DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> > qmltermwidget-${QMLTERMWIDGET}.tar.gz:0
> >
> > also be OK? I tried it, seems to work just fine.
> > --
> > Sascha Paunovic
> >
>
> It doesn't work like that:
>
> $ make makesum
> ===> Checking files for cool-retro-term-1.1.0
> >> Fetch
> >> https://github.com/Swordfish90/cool-retro-term/archive/1.1.0/cool-retro-term-1.1.0.tar.gz
> >> Fetch
> >> https://github.com/Swordfish90/qmltermwidget/archive/qmltermwidget-48274c75660e28d44af7c195e79accdf1bd44963.tar.gz
> ftp: Error retrieving file: 404 Not Found
>
> The github autogenerated tar.gz URL needs to just be
> archive/$commithash.tar.gz
> without the prefix.
>
> Maybe it's worth pointing out to upstream that the tar.gz available at
> https://github.com/Swordfish90/cool-retro-term/releases is unusable because
> it doesn't include the qtermwidget submodule, it would be convenient for
> users if they were to provide a standard tar.gz as a binary asset (similar
> to how they've included the dmg for 1.0.1 and the AppImage files for the
> continuous build, and similar to https://github.com/irssi/irssi/releases
> and https://github.com/darktable-org/darktable/releases/), it would be
> much preferable if there was just a single file to download.
>
I've committed the update + the distfile name change, also regenerated
PLIST because yours had a bunch of extra directories.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 06:58:44 Modified files: x11/cool-retro-term: Makefile distinfo x11/cool-retro-term/pkg: PLIST Log message: update to cool-retro-term-1.10, from Sascha Paunovic plus tweaks: - rename secondary distfile to a more descriptive filename - regen plist (remove extra directories)
Re: amavisd-new stuck: computer doesn't shutdown
El 07/01/2019 14:03, Stuart Henderson escribió: Moving to ports@ because ports-bugs@ isn't listed on the mailing lists page so isn't likely to be very widely read. On 2019/01/07 13:48, syyexr...@cajaume.org wrote: El 07/01/2019 08:21, Giovanni Bechis escribió: > On Sat, Jan 05, 2019 at 11:00:00PM +0100, syyexr...@cajaume.org wrote: > > Hello, > > > > When turning off the computer by pressing the power button it never > > shuts down because > > the amavisd daemon doesn't stop. > > > > pkg_info: > > > > amavisd-new-2.11.0p3 > > amavisd-new-utils-2.11.0p2 > > > can you provide your rc.conf.local(8) ? > Cheers > Giovanni Hi, Here it is: apmd_flags= cron_flags= ntpd_flags= smtpd_flags=NO sshd_flags= unbound_flags= xenodm_flags=NO pkg_scripts=vnstatd clamd freshclam amavisd spamassassin mysqld courier_authdaemond dovecot postfix apache2 squid Other computers i've used as mail servers have the same problem. Anything in logs? This is all i get (/var/log/maillog) Jan 7 14:34:44 router postfix/postfix-script[20510]: stopping the Postfix mail system Jan 7 14:34:44 router postfix/master[51997]: terminating on signal 15 Jan 7 14:34:44 router dovecot: master: Warning: Killed with signal 15 (by pid=0 uid=0 code=kill) Jan 7 14:34:45 router authdaemond: stopping authdaemond children Jan 07 14:34:48 router spamd[22160]: spamd: server killed by SIGTERM, shutting down Jan 7 14:34:55 router amavis[68340]: logging initialized, log level 2, syslog: amavis.mail Jan 7 14:34:55 router amavis[68340]: sd_notify (no socket): STATUS=Config files have been read, modules loaded. Jan 7 14:34:55 router amavis[68340]: Valid PID file /var/amavisd/amavisd.pid (younger than sys uptime 0 7:49:00) Jan 7 14:34:55 router amavis[28355]: sd_notify (no socket): STOPPING=1\\nSTATUS=Server rundown, notifying child processes. Jan 7 14:34:55 router amavis[28355]: Net::Server: 2019/01/07-14:34:55 Server closing! Jan 7 14:34:55 router amavis[28355]: sd_notify (no socket): STATUS=Child processes have been stopped. Jan 7 14:34:56 router amavis[68340]: Waiting for the process [28355] to terminate Jan 7 14:35:11 router last message repeated 3 times What do you see if you run "rcctl -d stop amavisd" from the shell? rcctl -d stop amavisd doing _rc_parse_conf doing _rc_quirks amavisd_flags empty, using default >< doing _rc_parse_conf /var/run/rc.d/amavisd doing _rc_quirks doing rc_check amavisd doing rc_stop Waiting for the process [54915] to terminate Daemon [54915] terminated by SIGTERM doing _rc_wait stop doing rc_check doing _rc_rm_runfile (ok) When you run "shutdown" or reboot the computer there is no problem. [Perhaps rc_stop() needs the same 'alarm clock' mechanism as rc_start() ...] Not aware of that.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/07 06:54:01 Modified files: audio/ncmpc: Makefile x11/gnome/gvfs : Makefile Log message: Pass -Db_asneeded=false on ld.bfd arches. ok sthen@
NEW: books/oeb
Hi, The Open English Bible is a completely free modern English translation of the Bible, under a Creative Commons Zero license. It provides a complete New Testament, Psalms, and some Old Testament books. The New Testament of the OEB is being formed on the base of the "Twentieth Century New Testament", in particular the revised edition published in 1904. The Old Testament books which have been completed at this stage lean heavily on the work of John Edgar McFadyen and Charles Foster Kent, both of whom were very respected turn of the century Old Testament scholars. The normative text for the OEB New Testament is the Westcott & Hort critical text. The normative text for the OEB Old Testament is the Codex Leningradensis, specifically the electronic version of the Westminster Leningrad Codex. Upstream provides two distfiles, the US English and Commonwealth English versions, which I put in separate packages. ok? -- Anthony J. Bentley oeb.tar.gz Description: oeb.tar.gz
[update] py-Pillow 5.4.1
Hi,
here's an update to py-Pillow 5.4.1, and enable openjp2 support while
here. Will put it in a bulk, but feedback from consumers welcome.
Landry
Index: Makefile
===
RCS file: /cvs/ports/graphics/py-Pillow/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile4 May 2018 09:54:41 - 1.24
+++ Makefile7 Jan 2019 13:25:59 -
@@ -2,7 +2,7 @@
COMMENT= Python Imaging Library (maintained fork of PIL)
-MODPY_EGG_VERSION= 5.1.0
+MODPY_EGG_VERSION= 5.4.1
DISTNAME= Pillow-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES=graphics
@@ -18,7 +18,7 @@
MODPY_PI = Yes
-WANTLIB= freetype jpeg lcms2 pthread tiff webp z \
+WANTLIB= freetype openjp2 jpeg lcms2 pthread tiff webp z \
webpdemux webpmux \
${MODPY_WANTLIB}
@@ -29,14 +29,13 @@
RUN_DEPENDS= ${MODPY_RUN_DEPENDS}
LIB_DEPENDS= graphics/lcms2 \
+ graphics/openjp2 \
graphics/libwebp
MODPY_SETUPTOOLS= Yes
SUBST_VARS+= INCL_DIR MODPY_FLAVOR
INCL_DIR= ${MODPY_INCDIR:S/${LOCALBASE}\///}
-
-MODPY_DISTUTILS_BUILD= build_ext --disable-jpeg2000
post-install:
${INSTALL_DATA_DIR} ${WRKINST}${MODPY_INCDIR}
Index: distinfo
===
RCS file: /cvs/ports/graphics/py-Pillow/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo4 May 2018 09:54:41 - 1.13
+++ distinfo7 Jan 2019 13:25:59 -
@@ -1,2 +1,2 @@
-SHA256 (Pillow-5.1.0.tar.gz) = zum8db/0VdMXtpRwgd8IJKjxGN4nhtw9dKNQP9Yx9O8=
-SIZE (Pillow-5.1.0.tar.gz) = 14286366
+SHA256 (Pillow-5.4.1.tar.gz) = UjNmTq36NCxjm5uZdxkNZK16yk7cUalmOU1+COfzip8=
+SIZE (Pillow-5.4.1.tar.gz) = 16016153
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-setup_py 7 Jan 2019 13:25:59 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+find our graphics/openjp2 install
+
+Index: setup.py
+--- setup.py.orig
setup.py
+@@ -503,18 +503,18 @@ class pil_build_ext(build_ext):
+
+ # Find the best version
+ for directory in self.compiler.include_dirs:
+-_dbg('Checking for openjpeg-#.# in %s', directory)
++_dbg('Checking for openjp2 in %s', directory)
+ try:
+ listdir = os.listdir(directory)
+ except Exception:
+ # WindowsError, FileNotFoundError
+ continue
+ for name in listdir:
+-if name.startswith('openjpeg-') and \
++if name.startswith('openjp2') and \
+ os.path.isfile(os.path.join(directory, name,
+ 'openjpeg.h')):
+ _dbg('Found openjpeg.h in %s/%s', (directory, name))
+-version = tuple(int(x) for x in name[9:].split('.'))
++version = "2"
+ if best_version is None or version > best_version:
+ best_version = version
+ best_path = os.path.join(directory, name)
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/py-Pillow/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST 4 May 2018 09:54:41 - 1.8
+++ pkg/PLIST 7 Jan 2019 13:25:59 -
@@ -186,8 +186,8 @@
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_binary.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_tkinter_finder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}features.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/_binary.py
lib/python${MODPY_VERSION}/site-packages/PIL/_imaging.so
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingcms.so
@@ -197,9 +197,9 @@
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingtk.so
lib/python${MODPY_VERSION}/site-packages/PIL/_tkinter_finder.py
lib/python${MODPY_VERSION}/site-packages/PIL/_util.py
+lib/python${MODPY_VERSION}/site-packages/PIL/_version.py
lib/python${MODPY_VERSION}/site-packages/PIL/_webp.so
lib/python${MODPY_VERSION}/site-packages/PIL/features.py
Re: CVS: cvs.openbsd.org: ports
On 2019/01/07 09:02, Antoine Jacoutot wrote:
> On Mon, Jan 07, 2019 at 08:50:55AM +0100, Antoine Jacoutot wrote:
> > On Sun, Jan 06, 2019 at 10:13:15PM +, Stuart Henderson wrote:
> > > On 2019/01/06 23:06, Antoine Jacoutot wrote:
> > > > If we want to go in that direction, this patch is the way (with a bump
> > > > :-)).
> > >
> > > bleh, that would 90-odd bumps :/
> >
> > With portbump it's not that hard :-)
>
> Could we do this for the time being?
Yes let's do that for now. OK with me. Even if we change it later,
at least then I will be able to upload an i386 bulk again :-)
> Index: audio/ncmpc/Makefile
> ===
> RCS file: /cvs/ports/audio/ncmpc/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- audio/ncmpc/Makefile 6 Jan 2019 20:15:51 - 1.41
> +++ audio/ncmpc/Makefile 7 Jan 2019 08:02:07 -
> @@ -6,7 +6,7 @@ VER= 0.33
> DISTNAME=ncmpc-${VER}
> EPOCH= 0
> CATEGORIES= audio
> -REVISION=0
> +REVISION=1
>
> HOMEPAGE=https://www.musicpd.org/clients/ncmpc/
>
> @@ -36,8 +36,15 @@ LIB_DEPENDS= devel/gettext \
> CONFIGURE_ARGS= -Dlirc=disabled \
> -Dhtml_manual=false \
> -Dlocale=enabled \
> - -Dmouse=enabled \
> - -Db_asneeded=false
> + -Dmouse=enabled
> +
> +# disable meson's default of using "-Wl,--as-needed" on ld.bfd arches;
> +# build failures due to undefined references are often seen.
> +.include
> +.if !${PROPERTIES:Mlld}
> +CONFIGURE_ARGS +=-Db_asneeded=false
> +.endif
> +
> CONFIGURE_ENV= CPP=${CPP} \
> CPPFLAGS="-D_GNU_SOURCE \
> -D_DEFAULT_SOURCE \
> Index: x11/gnome/gvfs/Makefile
> ===
> RCS file: /cvs/ports/x11/gnome/gvfs/Makefile,v
> retrieving revision 1.183
> diff -u -p -r1.183 Makefile
> --- x11/gnome/gvfs/Makefile 3 Jan 2019 13:36:23 - 1.183
> +++ x11/gnome/gvfs/Makefile 7 Jan 2019 08:02:07 -
> @@ -15,6 +15,12 @@ PKGNAME-goa= ${GNOME_PROJECT}-goa-${GNO
> PKGNAME-nfs= ${GNOME_PROJECT}-nfs-${GNOME_VERSION}
> PKGNAME-google= ${GNOME_PROJECT}-google-${GNOME_VERSION}
>
> +REVISION-main= 0
> +REVISION-smb=0
> +REVISION-goa=0
> +REVISION-nfs=0
> +REVISION-google= 0
> +
> # LGPLv2
> PERMIT_PACKAGE_CDROM=Yes
>
> @@ -77,6 +83,13 @@ CONFIGURE_ARGS += -Dafc=false \
> -Dlogind=false \
> -Dsystemduserunitdir=no \
> -Dtmpfilesdir=no
> +
> +# disable meson's default of using "-Wl,--as-needed" on ld.bfd arches;
> +# build failures due to undefined references are often seen.
> +.include
> +.if !${PROPERTIES:Mlld}
> +CONFIGURE_ARGS +=-Db_asneeded=false
> +.endif
>
^^
stray tabs here :)
> # needs libcap
> CONFIGURE_ARGS +=-Dadmin=false
>
>
>
> --
> Antoine
>
Re: UPDATE: cool-retro-term 1.0.1 -> 1.1.0
On 2019/01/07 13:17, Sascha Paunovic wrote:
> On Mon, 7 Jan 2019 12:03:49 +
> Stuart Henderson wrote:
>
> > Not new with the update, but that's a bad filename for a distfile.
> > It would be better to use this:
> >
> > DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> > qmltermwidget-{}${QMLTERMWIDGET}.tar.gz:0
> >
> > and regenerate distinfo.
>
> Yep, it's pretty unelegant. Quick question; would
>
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> qmltermwidget-${QMLTERMWIDGET}.tar.gz:0
>
> also be OK? I tried it, seems to work just fine.
> --
> Sascha Paunovic
>
It doesn't work like that:
$ make makesum
===> Checking files for cool-retro-term-1.1.0
>> Fetch
>> https://github.com/Swordfish90/cool-retro-term/archive/1.1.0/cool-retro-term-1.1.0.tar.gz
>> Fetch
>> https://github.com/Swordfish90/qmltermwidget/archive/qmltermwidget-48274c75660e28d44af7c195e79accdf1bd44963.tar.gz
ftp: Error retrieving file: 404 Not Found
The github autogenerated tar.gz URL needs to just be archive/$commithash.tar.gz
without the prefix.
Maybe it's worth pointing out to upstream that the tar.gz available at
https://github.com/Swordfish90/cool-retro-term/releases is unusable because
it doesn't include the qtermwidget submodule, it would be convenient for
users if they were to provide a standard tar.gz as a binary asset (similar
to how they've included the dmg for 1.0.1 and the AppImage files for the
continuous build, and similar to https://github.com/irssi/irssi/releases
and https://github.com/darktable-org/darktable/releases/), it would be
much preferable if there was just a single file to download.
Re: amavisd-new stuck: computer doesn't shutdown
Moving to ports@ because ports-bugs@ isn't listed on the mailing lists page so isn't likely to be very widely read. On 2019/01/07 13:48, syyexr...@cajaume.org wrote: > El 07/01/2019 08:21, Giovanni Bechis escribió: > > On Sat, Jan 05, 2019 at 11:00:00PM +0100, syyexr...@cajaume.org wrote: > > > Hello, > > > > > > When turning off the computer by pressing the power button it never > > > shuts down because > > > the amavisd daemon doesn't stop. > > > > > > pkg_info: > > > > > > amavisd-new-2.11.0p3 > > > amavisd-new-utils-2.11.0p2 > > > > > can you provide your rc.conf.local(8) ? > > Cheers > > Giovanni > > Hi, > > Here it is: > > apmd_flags= > cron_flags= > ntpd_flags= > smtpd_flags=NO > sshd_flags= > unbound_flags= > xenodm_flags=NO > pkg_scripts=vnstatd clamd freshclam amavisd spamassassin mysqld > courier_authdaemond dovecot postfix apache2 squid > > Other computers i've used as mail servers have the same problem. Anything in logs? What do you see if you run "rcctl -d stop amavisd" from the shell? [Perhaps rc_stop() needs the same 'alarm clock' mechanism as rc_start() ...]
Re: UPDATE: cool-retro-term 1.0.1 -> 1.1.0
On Mon, 7 Jan 2019 12:03:49 +
Stuart Henderson wrote:
> Not new with the update, but that's a bad filename for a distfile.
> It would be better to use this:
>
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> qmltermwidget-{}${QMLTERMWIDGET}.tar.gz:0
>
> and regenerate distinfo.
Yep, it's pretty unelegant. Quick question; would
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
qmltermwidget-${QMLTERMWIDGET}.tar.gz:0
also be OK? I tried it, seems to work just fine.
--
Sascha Paunovic
Re: amavisd-new stuck: computer doesn't shutdown
El 07/01/2019 08:21, Giovanni Bechis escribió:
On Sat, Jan 05, 2019 at 11:00:00PM +0100, syyexr...@cajaume.org wrote:
Hello,
When turning off the computer by pressing the power button it never
shuts down because
the amavisd daemon doesn't stop.
pkg_info:
amavisd-new-2.11.0p3
amavisd-new-utils-2.11.0p2
can you provide your rc.conf.local(8) ?
Cheers
Giovanni
Hi,
Here it is:
apmd_flags=
cron_flags=
ntpd_flags=
smtpd_flags=NO
sshd_flags=
unbound_flags=
xenodm_flags=NO
pkg_scripts=vnstatd clamd freshclam amavisd spamassassin mysqld
courier_authdaemond dovecot postfix apache2 squid
Other computers i've used as mail servers have the same problem.
dmesg:
OpenBSD 6.4 (GENERIC.MP) #3: Thu Dec 20 18:20:58 CET 2018
r...@syspatch-64-i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP
real mem = 1064730624 (1015MB)
avail mem = 1030184960 (982MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: date 06/16/04, BIOS32 rev. 0 @ 0xeb560, SMBIOS rev.
2.3 @ 0xeeae0 (63 entries)
bios0: vendor Hewlett-Packard version "786C1 v01.05" date 06/16/2004
bios0: Hewlett-Packard HP Compaq dc7100 SFF(DX878AV)
acpi0 at bios0: rev 0
acpi0: sleep states S0 S1 S3 S4 S5
acpi0: tables DSDT FACP SSDT APIC ASF! MCFG
acpi0: wakeup devices PCI0(S4) PEG1(S4) PCX1(S4) PCX2(S4) PCX4(S4)
HUB_(S4) COM1(S4) COM2(S4) USB1(S3) USB2(S3) USB3(S3) USB4(S3)
EUSB(S3)
PBTN(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Pentium(R) 4 CPU 2.80GHz ("GenuineIntel" 686-class)
2.80
GHz, 0f-04-01
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,DTES64,MWAIT,DS-CPL,CNXT-ID,xTPR,PERF,MELTDOWN
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 199MHz
cpu0: mwait min=64, max=64
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Pentium(R) 4 CPU 2.80GHz ("GenuineIntel" 686-class)
2.80
GHz, 0f-04-01
cpu1:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,DTES64,MWAIT,DS-CPL,CNXT-ID,xTPR,PERF,MELTDOWN
ioapic0 at mainbus0: apid 1 pa 0xfec0, version 20, 24 pins,
remapped
acpimcfg0 at acpi0
acpimcfg0: addr 0xd000, bus 0-255
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 32 (PCX1)
acpiprt2 at acpi0: bus 64 (PCX2)
acpiprt3 at acpi0: bus -1 (PCX4)
acpiprt4 at acpi0: bus 5 (HUB_)
acpicpu0 at acpi0: C1(@1 halt!)
acpicpu1 at acpi0: C1(@1 halt!)
acpicmos0 at acpi0
"PNP0003" at acpi0 not configured
acpibtn0 at acpi0: PBTN
UPDATE: cool-retro-term 1.0.1 -> 1.1.0
Hi,
here an update of x11/cool-retro-term to 1.1.0.
Tested briefly on amd64, starts up and allows me to execute commands ok.
Note: "cool-retro-term --version" outputs 1.0.1, that's a bug. solene@ helped
me find
where it happens in the code:
https://github.com/Swordfish90/cool-retro-term/blob/54a6a7f5906c482db5ec1158433722dca197acd2/app/main.cpp#L74
Changes in 1.1.0 (from GitHub):
* Two years of upstream qtermwidget fixes
* Shiny (literally) new frame
* System fonts support
* Lowered GPU and Memory usage
* Faster and burn in effect
* Improved colors support
* Improved RGB shift effect
* Improved colors support
* Many other small tweaks and fixes
Index: Makefile
===
RCS file: /cvs/ports/x11/cool-retro-term/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile29 Jun 2018 22:16:22 - 1.15
+++ Makefile7 Jan 2019 11:06:21 -
@@ -6,10 +6,9 @@ CATEGORIES = x11
GH_ACCOUNT = Swordfish90
GH_PROJECT = cool-retro-term
-GH_TAGNAME = 1.0.1
-REVISION = 1
+GH_TAGNAME = 1.1.0
-QMLTERMWIDGET =08958f7c83a7d05627f623b8904f3e79a0b7366b
+QMLTERMWIDGET =48274c75660e28d44af7c195e79accdf1bd44963
MASTER_SITES0 =https://github.com/Swordfish90/qmltermwidget/archive/
DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
${QMLTERMWIDGET}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/x11/cool-retro-term/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo6 Jan 2018 04:46:12 - 1.2
+++ distinfo7 Jan 2019 11:06:21 -
@@ -1,4 +1,4 @@
-SHA256 (08958f7c83a7d05627f623b8904f3e79a0b7366b.tar.gz) =
Xx/Q8f9kLkC+6wSeOOYKF5pSeXCxKv3Q0uPjRUzWX8A=
-SHA256 (cool-retro-term-1.0.1.tar.gz) =
Rc11bGG7buOud5byIdqNKxN+R/AMPSSDnQrAHtGaa0I=
-SIZE (08958f7c83a7d05627f623b8904f3e79a0b7366b.tar.gz) = 209653
-SIZE (cool-retro-term-1.0.1.tar.gz) = 7735425
+SHA256 (48274c75660e28d44af7c195e79accdf1bd44963.tar.gz) =
oU1pZMHuvpKELoJK+GBr4ilbYbsmCUWl1eh2lDxGjiY=
+SHA256 (cool-retro-term-1.1.0.tar.gz) =
9XNK79/C6TQ7aiTuKX9UOjai4N8NoPmslLANkwAYX4o=
+SIZE (48274c75660e28d44af7c195e79accdf1bd44963.tar.gz) = 219645
+SIZE (cool-retro-term-1.1.0.tar.gz) = 1973348
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/cool-retro-term/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 29 Jun 2018 22:16:22 - 1.4
+++ pkg/PLIST 7 Jan 2019 11:06:21 -
@@ -1,16 +1,22 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/29 22:16:22 espie Exp $
@bin bin/cool-retro-term
+lib/qt5/
+lib/qt5/qml/
lib/qt5/qml/QMLTermWidget/
lib/qt5/qml/QMLTermWidget/QMLTermScrollbar.qml
lib/qt5/qml/QMLTermWidget/color-schemes/
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.schema
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.schema
+lib/qt5/qml/QMLTermWidget/color-schemes/BreezeModified.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/DarkPastels.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/Linux.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/Solarized.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/SolarizedLight.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/Tango.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/Ubuntu.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.schema
-lib/qt5/qml/QMLTermWidget/color-schemes/color-schemes.qrc
lib/qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.schema
lib/qt5/qml/QMLTermWidget/color-schemes/historic/
lib/qt5/qml/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema
@@ -36,17 +42,27 @@ lib/qt5/qml/QMLTermWidget/kb-layouts/def
lib/qt5/qml/QMLTermWidget/kb-layouts/historic/
lib/qt5/qml/QMLTermWidget/kb-layouts/historic/vt100.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/historic/x11r5.keytab
-lib/qt5/qml/QMLTermWidget/kb-layouts/kb-layouts.qrc
lib/qt5/qml/QMLTermWidget/kb-layouts/linux.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/macbook.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/solaris.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/vt420pc.keytab
lib/qt5/qml/QMLTermWidget/libqmltermwidget.so
lib/qt5/qml/QMLTermWidget/qmldir
+share/applications/
share/applications/cool-retro-term.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/cool-retro-term.png
+share/icons/hicolor/256x256/
+share/icons/hicolor/256x256/apps/
share/icons/hicolor/256x256/apps/cool-retro-term.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/cool-retro-term.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/cool-retro-term.png
@tag
Re: UPDATE: cool-retro-term 1.0.1 -> 1.1.0
On 2019/01/07 12:20, Sascha Paunovic wrote:
> Hi,
>
> here an update of x11/cool-retro-term to 1.1.0.
>
> Tested briefly on amd64, starts up and allows me to execute commands ok.
>
> Note: "cool-retro-term --version" outputs 1.0.1, that's a bug. solene@
> helped me find
> where it happens in the code:
>
> https://github.com/Swordfish90/cool-retro-term/blob/54a6a7f5906c482db5ec1158433722dca197acd2/app/main.cpp#L74
>
> Changes in 1.1.0 (from GitHub):
>
> * Two years of upstream qtermwidget fixes
> * Shiny (literally) new frame
> * System fonts support
> * Lowered GPU and Memory usage
> * Faster and burn in effect
> * Improved colors support
> * Improved RGB shift effect
> * Improved colors support
> * Many other small tweaks and fixes
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/cool-retro-term/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 29 Jun 2018 22:16:22 - 1.15
> +++ Makefile 7 Jan 2019 11:06:21 -
> @@ -6,10 +6,9 @@ CATEGORIES = x11
>
> GH_ACCOUNT = Swordfish90
> GH_PROJECT = cool-retro-term
> -GH_TAGNAME = 1.0.1
> -REVISION = 1
> +GH_TAGNAME = 1.1.0
>
> -QMLTERMWIDGET = 08958f7c83a7d05627f623b8904f3e79a0b7366b
> +QMLTERMWIDGET = 48274c75660e28d44af7c195e79accdf1bd44963
> MASTER_SITES0 = https://github.com/Swordfish90/qmltermwidget/archive/
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> ${QMLTERMWIDGET}.tar.gz:0
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/cool-retro-term/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 6 Jan 2018 04:46:12 - 1.2
> +++ distinfo 7 Jan 2019 11:06:21 -
> @@ -1,4 +1,4 @@
> -SHA256 (08958f7c83a7d05627f623b8904f3e79a0b7366b.tar.gz) =
> Xx/Q8f9kLkC+6wSeOOYKF5pSeXCxKv3Q0uPjRUzWX8A=
Not new with the update, but that's a bad filename for a distfile.
It would be better to use this:
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
qmltermwidget-{}${QMLTERMWIDGET}.tar.gz:0
and regenerate distinfo.
UPDATE: cool-retro-term 1.0.1 -> 1.1.0
Hi,
here an update of x11/cool-retro-term to 1.1.0.
Tested briefly on amd64, starts up and allows me to execute commands ok.
Note: "cool-retro-term --version" outputs 1.0.1, that's a bug. solene@
helped me find
where it happens in the code:
https://github.com/Swordfish90/cool-retro-term/blob/54a6a7f5906c482db5ec1158433722dca197acd2/app/main.cpp#L74
Changes in 1.1.0 (from GitHub):
* Two years of upstream qtermwidget fixes
* Shiny (literally) new frame
* System fonts support
* Lowered GPU and Memory usage
* Faster and burn in effect
* Improved colors support
* Improved RGB shift effect
* Improved colors support
* Many other small tweaks and fixes
Index: Makefile
===
RCS file: /cvs/ports/x11/cool-retro-term/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile29 Jun 2018 22:16:22 - 1.15
+++ Makefile7 Jan 2019 11:06:21 -
@@ -6,10 +6,9 @@ CATEGORIES = x11
GH_ACCOUNT = Swordfish90
GH_PROJECT = cool-retro-term
-GH_TAGNAME = 1.0.1
-REVISION = 1
+GH_TAGNAME = 1.1.0
-QMLTERMWIDGET =08958f7c83a7d05627f623b8904f3e79a0b7366b
+QMLTERMWIDGET =48274c75660e28d44af7c195e79accdf1bd44963
MASTER_SITES0 =https://github.com/Swordfish90/qmltermwidget/archive/
DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
${QMLTERMWIDGET}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/x11/cool-retro-term/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo6 Jan 2018 04:46:12 - 1.2
+++ distinfo7 Jan 2019 11:06:21 -
@@ -1,4 +1,4 @@
-SHA256 (08958f7c83a7d05627f623b8904f3e79a0b7366b.tar.gz) =
Xx/Q8f9kLkC+6wSeOOYKF5pSeXCxKv3Q0uPjRUzWX8A=
-SHA256 (cool-retro-term-1.0.1.tar.gz) =
Rc11bGG7buOud5byIdqNKxN+R/AMPSSDnQrAHtGaa0I=
-SIZE (08958f7c83a7d05627f623b8904f3e79a0b7366b.tar.gz) = 209653
-SIZE (cool-retro-term-1.0.1.tar.gz) = 7735425
+SHA256 (48274c75660e28d44af7c195e79accdf1bd44963.tar.gz) =
oU1pZMHuvpKELoJK+GBr4ilbYbsmCUWl1eh2lDxGjiY=
+SHA256 (cool-retro-term-1.1.0.tar.gz) =
9XNK79/C6TQ7aiTuKX9UOjai4N8NoPmslLANkwAYX4o=
+SIZE (48274c75660e28d44af7c195e79accdf1bd44963.tar.gz) = 219645
+SIZE (cool-retro-term-1.1.0.tar.gz) = 1973348
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/cool-retro-term/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 29 Jun 2018 22:16:22 - 1.4
+++ pkg/PLIST 7 Jan 2019 11:06:21 -
@@ -1,16 +1,22 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/29 22:16:22 espie Exp $
@bin bin/cool-retro-term
+lib/qt5/
+lib/qt5/qml/
lib/qt5/qml/QMLTermWidget/
lib/qt5/qml/QMLTermWidget/QMLTermScrollbar.qml
lib/qt5/qml/QMLTermWidget/color-schemes/
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.schema
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.schema
+lib/qt5/qml/QMLTermWidget/color-schemes/BreezeModified.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/DarkPastels.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/Linux.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/Solarized.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/SolarizedLight.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/Tango.colorscheme
+lib/qt5/qml/QMLTermWidget/color-schemes/Ubuntu.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.schema
-lib/qt5/qml/QMLTermWidget/color-schemes/color-schemes.qrc
lib/qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.schema
lib/qt5/qml/QMLTermWidget/color-schemes/historic/
lib/qt5/qml/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema
@@ -36,17 +42,27 @@ lib/qt5/qml/QMLTermWidget/kb-layouts/def
lib/qt5/qml/QMLTermWidget/kb-layouts/historic/
lib/qt5/qml/QMLTermWidget/kb-layouts/historic/vt100.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/historic/x11r5.keytab
-lib/qt5/qml/QMLTermWidget/kb-layouts/kb-layouts.qrc
lib/qt5/qml/QMLTermWidget/kb-layouts/linux.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/macbook.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/solaris.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/vt420pc.keytab
lib/qt5/qml/QMLTermWidget/libqmltermwidget.so
lib/qt5/qml/QMLTermWidget/qmldir
+share/applications/
share/applications/cool-retro-term.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/cool-retro-term.png
+share/icons/hicolor/256x256/
+share/icons/hicolor/256x256/apps/
share/icons/hicolor/256x256/apps/cool-retro-term.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/cool-retro-term.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/cool-retro-term.png
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 04:27:11 Modified files: sysutils/firmware: Makefile Log message: link inteldrm to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/07 03:56:38 Modified files: sysutils/terraform/provider-alicloud: Makefile distinfo sysutils/terraform/provider-aws: Makefile distinfo sysutils/terraform/provider-cloudstack: Makefile distinfo Log message: Update terraform providers.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/07 03:49:50 Modified files: security/vault : Makefile distinfo Log message: Update to vault-1.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/07 03:18:33 Modified files: www/midori : Makefile Log message: needs intltool
Re: NEW: dav1d
On 2018/12/26 01:09, Brad Smith wrote: > Here is a port for dav1d. > > Tested on amd64 and i386. > > > dav1d is a new AV1 cross-platform decoder, open-source, and focused on > speed and correctness. s/Small/small/ in COMMENT, otherwise OK with me, or I can import if I get an OK.
UPDATE: lziprecover 1.20 -> 1.21
Hi,
here an upgrade of archivers/lzip/lziprecover to 1.21.
Tested on amd64, works ok for me.
Changes in 1.21:
* The options '--dump', '--remove' and '--strip' have been added,
mainly as support for the tarlz archive format:
http://www.nongnu.org/lzip/tarlz.html
These options replace '--dump-tdata', '--remove-tdata' and
'--strip-tdata', which are now aliases and will be removed in
version 1.22.
'--dump=[][:damaged][:tdata]' dumps the members listed,
the damaged members (if any), or the trailing data (if any) of one or
more regular multimember files to standard output.
'--remove=[][:damaged][:tdata]' removes the members
listed, the damaged members (if any), or the trailing data (if any)
from regular multimember files in place.
'--strip=[][:damaged][:tdata]' copies one or more regular
multimember files to standard output, stripping the members listed,
the damaged members (if any), or the trailing data (if any) from
each file.
* Detection of forbidden combinations of characters in trailing data
has been improved.
* '--split' can now detect trailing data and gaps between members, and
save each gap in its own file. Trailing data (if any) are saved alone
in the last file. (Gaps may contain garbage or may be members with
corrupt headers or trailers).
* '--ignore-errors' now makes '--list' show gaps between members,
ignoring format errors.
* '--ignore-errors' now makes '--range-decompress' ignore a truncated
last member.
* Errors are now also checked when closing the input file in
decompression mode.
* Some diagnostic messages have been improved.
* '\n' is now printed instead of '\r' when showing progress of merge or
repair if stdout is not a terminal.
* Lziprecover now compiles on DOS with DJGPP. (Patch from Robert
Riebisch).
* The new chapter 'Tarlz', explaining the ways in which lziprecover can
recover and process multimember tar.lz archives, has been added to the
manual.
* The configure script now accepts appending options to CXXFLAGS using
the
syntax 'CXXFLAGS+=OPTIONS'.
* It has been documented in INSTALL the use of
CXXFLAGS+='-D __USE_MINGW_ANSI_STDIO' when compiling on MinGW.
Index: Makefile
===
RCS file: /cvs/ports/archivers/lzip/lziprecover/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile24 Oct 2018 14:27:57 - 1.14
+++ Makefile7 Jan 2019 08:48:16 -
@@ -2,8 +2,7 @@
COMMENT = data recovery tool and decompressor for lzip files
-DISTNAME = lziprecover-1.20
-REVISION = 1
+DISTNAME = lziprecover-1.21
HOMEPAGE = http://lzip.nongnu.org/lziprecover.html
MASTER_SITES = ${MASTER_SITE_SAVANNAH:=lzip/lziprecover/}
Index: distinfo
===
RCS file: /cvs/ports/archivers/lzip/lziprecover/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 Feb 2018 17:28:53 - 1.7
+++ distinfo7 Jan 2019 08:48:16 -
@@ -1,2 +1,2 @@
-SHA256 (lzip/lziprecover-1.20.tar.lz) =
xGc9mY+TAvjRUzshOT/WRXmJ18n0+2LrnVsKOVVo06w=
-SIZE (lzip/lziprecover-1.20.tar.lz) = 71095
+SHA256 (lzip/lziprecover-1.21.tar.lz) =
FiJEAzZhS+5zVC3gRh2ZFB6hsb8BL8B71Q2U5DSqNN8=
+SIZE (lzip/lziprecover-1.21.tar.lz) = 78509
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2019/01/07 01:46:56 Modified files: www/py-django/lts: Makefile distinfo www/py-django/lts/pkg: PLIST www/py-django/stable: Makefile distinfo www/py-django/stable/pkg: PLIST Log message: update django to 1.11.18 and 2.1.5. from wen hepping, added inputs.
Re: [Security Update] www/py-django: stable update to 2.1.5 and lts update to 1.11.18
Le 07-01-2019 03:33, wen heping a écrit : Hi, ports@ : Here is a patch for www/py-django: stable update to 2.1.5 and lts update to 1.11.18. It include a security fix : CVE-2019-3498. It build and run well on my amd64 system. Any comments ? Hi, thank you, don't forget to "make plist" :). It's commited. Cheers, Remi.
Re: CVS: cvs.openbsd.org: ports
On Sun, Jan 06, 2019 at 11:06:27PM +0100, Antoine Jacoutot wrote: > On Sun, Jan 06, 2019 at 09:49:00PM +, Stuart Henderson wrote: > > On 2019/01/06 22:27, Antoine Jacoutot wrote: > > > On Sun, Jan 06, 2019 at 08:45:00PM +, Stuart Henderson wrote: > > > > On 2019/01/06 21:28, Antoine Jacoutot wrote: > > > > > On Sun, Jan 06, 2019 at 01:15:51PM -0700, Landry Breuil wrote: > > > > > > CVSROOT:/cvs > > > > > > Module name:ports > > > > > > Changes by: lan...@cvs.openbsd.org 2019/01/06 13:15:51 > > > > > > > > > > > > Modified files: > > > > > > audio/ncmpc: Makefile > > > > > > > > > > > > Log message: > > > > > > Pass -Db_asneeded=false to meson so that it doesn't add > > > > > > -Wl,--as-needed. > > > > > > > > > > > > Fixes the build on i386/ld.bfd archs which was failing with missing > > > > > > refs > > > > > > to pthread functions, as reported by sthen@ > > > > > > > > > > Why not contain this to ld.bfd archs then? > > > > > > > > Makes sense, but also why constrain it to ncmpc? meson itself seems > > > > the obvious place, here's one way to do it (using patch+sed to avoid > > > > a conditional patch file because I know what fun port updates are > > > > when you use them :) > > > > > > > > As a bonus this fixes gvfs. > > > > > > I like this better. > > > *But*, can't it have an effect on WANTLIB? > > > > Ugh, yes. > > > > gvfs-1.38.1(x11/gnome/gvfs,-main): > > Missing: gck-1.2 from gcr-3.28.0p3 (/usr/local/lib/gvfs/libgvfsdaemon.so) > > Missing: gpg-error.3 from libgpg-error-1.33 > > (/usr/local/libexec/gvfsd-afp-browse) > > Missing: p11-kit.2 from p11-kit-0.23.2p1 > > (/usr/local/lib/gvfs/libgvfsdaemon.so) > > Missing: pthread.25 (/usr/local/libexec/gvfsd-dnssd) (system lib) > > WANTLIB += gck-1 gpg-error p11-kit pthread > > Scanning: ok > > > > I don't see what we can really do about it though. At least they would > > have a path via LIB_DEPENDS already so it shouldn't result in completely > > missing dependencies, and if I understand as-needed correctly then e.g. > > in the case of say gvfs and p11-kit, it shouldn't be gvfs directly > > depending on p11-kit's ABI but rather gvfs depends on $some_other_port's > > ABI, and it's only $some_other_port that needs updating if p11-kit changes.. > > So I don't think this would cause a real problem. But it is messy, > > especially if someone does a WANTLIB sweep across the tree on i386 :/ > > Indeed, not a real problem, but messy :-/ Well it *is* a problem. I often do port-lib-depends-check on amd64 and/or i386, without really checking on which arch i am, and fix WANTLIB accordingly. Now if all meson ports have a different WANTLIB between ld.lld and ld.bfd archs, it is imo an issue. If we decide from now on that 'WANTLIB should be correct on amd64 and we dont care about others' it has to be clearly marked somewhere as a policy... Why not disabling --as-needed for all archs ? I've often had funny issues with it. Landry
Re: CVS: cvs.openbsd.org: ports
On Mon, Jan 07, 2019 at 08:50:55AM +0100, Antoine Jacoutot wrote:
> On Sun, Jan 06, 2019 at 10:13:15PM +, Stuart Henderson wrote:
> > On 2019/01/06 23:06, Antoine Jacoutot wrote:
> > > If we want to go in that direction, this patch is the way (with a bump
> > > :-)).
> >
> > bleh, that would 90-odd bumps :/
>
> With portbump it's not that hard :-)
Could we do this for the time being?
Index: audio/ncmpc/Makefile
===
RCS file: /cvs/ports/audio/ncmpc/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- audio/ncmpc/Makefile6 Jan 2019 20:15:51 - 1.41
+++ audio/ncmpc/Makefile7 Jan 2019 08:02:07 -
@@ -6,7 +6,7 @@ VER=0.33
DISTNAME= ncmpc-${VER}
EPOCH= 0
CATEGORIES=audio
-REVISION= 0
+REVISION= 1
HOMEPAGE= https://www.musicpd.org/clients/ncmpc/
@@ -36,8 +36,15 @@ LIB_DEPENDS= devel/gettext \
CONFIGURE_ARGS=-Dlirc=disabled \
-Dhtml_manual=false \
-Dlocale=enabled \
- -Dmouse=enabled \
- -Db_asneeded=false
+ -Dmouse=enabled
+
+# disable meson's default of using "-Wl,--as-needed" on ld.bfd arches;
+# build failures due to undefined references are often seen.
+.include
+.if !${PROPERTIES:Mlld}
+CONFIGURE_ARGS += -Db_asneeded=false
+.endif
+
CONFIGURE_ENV= CPP=${CPP} \
CPPFLAGS="-D_GNU_SOURCE \
-D_DEFAULT_SOURCE \
Index: x11/gnome/gvfs/Makefile
===
RCS file: /cvs/ports/x11/gnome/gvfs/Makefile,v
retrieving revision 1.183
diff -u -p -r1.183 Makefile
--- x11/gnome/gvfs/Makefile 3 Jan 2019 13:36:23 - 1.183
+++ x11/gnome/gvfs/Makefile 7 Jan 2019 08:02:07 -
@@ -15,6 +15,12 @@ PKGNAME-goa= ${GNOME_PROJECT}-goa-${GNO
PKGNAME-nfs= ${GNOME_PROJECT}-nfs-${GNOME_VERSION}
PKGNAME-google=${GNOME_PROJECT}-google-${GNOME_VERSION}
+REVISION-main= 0
+REVISION-smb= 0
+REVISION-goa= 0
+REVISION-nfs= 0
+REVISION-google= 0
+
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -77,6 +83,13 @@ CONFIGURE_ARGS +=-Dafc=false \
-Dlogind=false \
-Dsystemduserunitdir=no \
-Dtmpfilesdir=no
+
+# disable meson's default of using "-Wl,--as-needed" on ld.bfd arches;
+# build failures due to undefined references are often seen.
+.include
+.if !${PROPERTIES:Mlld}
+CONFIGURE_ARGS += -Db_asneeded=false
+.endif
# needs libcap
CONFIGURE_ARGS += -Dadmin=false
--
Antoine
