> suricata documents this option as "Do not optimize the binary for the hardware it is built on."
>
> I think it is appropriate for the amd64 build since not every machine is the ports build machine.
amusingly, different builds will generate different results since the
machines in the cluster aren't identical
obviously, the ports build cluster is build out of scraps. scraps
with good drives, that is....
Saturday, March 31, 2018
suricata portable binary
suricata documents this option as "Do not optimize the binary for the hardware it is built on."
I think it is appropriate for the amd64 build since not every machine is the ports build machine.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile 17 Mar 2018 13:03:14 -0000 1.4
+++ Makefile 1 Apr 2018 05:42:47 -0000
@@ -38,6 +38,8 @@ CONFIGURE_STYLE = gnu
CONFIGURE_ENV = ac_cv_path_HAVE_PDFLATEX= \
ac_cv_path_HAVE_GIT_CMD=
+CONFIGURE_ARGS = --disable-gccmarch-native
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/suricata/rules
${INSTALL_DATA} ${WRKSRC}/*.config ${PREFIX}/share/examples/suricata
I think it is appropriate for the amd64 build since not every machine is the ports build machine.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile 17 Mar 2018 13:03:14 -0000 1.4
+++ Makefile 1 Apr 2018 05:42:47 -0000
@@ -38,6 +38,8 @@ CONFIGURE_STYLE = gnu
CONFIGURE_ENV = ac_cv_path_HAVE_PDFLATEX= \
ac_cv_path_HAVE_GIT_CMD=
+CONFIGURE_ARGS = --disable-gccmarch-native
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/suricata/rules
${INSTALL_DATA} ${WRKSRC}/*.config ${PREFIX}/share/examples/suricata
Re: [new] sysutils/signing - make targets to verify upstream signatures
On Sat, Mar 31, 2018 at 05:22:46PM -0600, Aaron Bieber wrote:
> Hi,
>
> Here is a mostly functional set of make targets that verify gnupg
> signatures with ease.
>
> To use it, you can simple add the following to your /etc/mk.conf:
>
> .if exists(/usr/local/share/signing/signing.mk)
> .include "/usr/local/share/signing/signing.mk"
> .endif
The mk fragment is 100% bogus.
There are lots of things to fix.
First, all your targets are phony, none of them is declared as such.
Second, there is obviously two set of checkers depending on the
signature type, but the way you're doing things muddles them up...
never such a good thing where security is concerned.
Third, you've got phony targets depending on targets, which is a no-no.
Finally, you're only dealing with one DISTFILE, thus ensuring you can't
check signatures for ports with multiple distfiles.
And you don't do what DISTFILES actually do, namely have support for
MASTER_SITES* and all sorts of similar thingies.
This needs some major rethinking before it can hit the tree... you might
have to figure out how bsd.port.mk actually does fetch.
Namely, look around the part that defines _FULL_FETCH_LIST and friends.
(don't worry if you end up using internal variables, we'll figure it out
if the design is clean enough)
You definitely want to depend on the actual files you're fetching.
You may have to rename files to get some consistent naming.
Don't use gratuitous subshells () where nested tests will do.
> Hi,
>
> Here is a mostly functional set of make targets that verify gnupg
> signatures with ease.
>
> To use it, you can simple add the following to your /etc/mk.conf:
>
> .if exists(/usr/local/share/signing/signing.mk)
> .include "/usr/local/share/signing/signing.mk"
> .endif
The mk fragment is 100% bogus.
There are lots of things to fix.
First, all your targets are phony, none of them is declared as such.
Second, there is obviously two set of checkers depending on the
signature type, but the way you're doing things muddles them up...
never such a good thing where security is concerned.
Third, you've got phony targets depending on targets, which is a no-no.
Finally, you're only dealing with one DISTFILE, thus ensuring you can't
check signatures for ports with multiple distfiles.
And you don't do what DISTFILES actually do, namely have support for
MASTER_SITES* and all sorts of similar thingies.
This needs some major rethinking before it can hit the tree... you might
have to figure out how bsd.port.mk actually does fetch.
Namely, look around the part that defines _FULL_FETCH_LIST and friends.
(don't worry if you end up using internal variables, we'll figure it out
if the design is clean enough)
You definitely want to depend on the actual files you're fetching.
You may have to rename files to get some consistent naming.
Don't use gratuitous subshells () where nested tests will do.
[new] sysutils/signing - make targets to verify upstream signatures
Hi,
Here is a mostly functional set of make targets that verify gnupg
signatures with ease.
To use it, you can simple add the following to your /etc/mk.conf:
.if exists(/usr/local/share/signing/signing.mk)
.include "/usr/local/share/signing/signing.mk"
.endif
(The above is taken from the readme which uses PREFIX, so might be
different if you are using weird setups. Weirdo.)
Once that is in place, you can verify distfiles for almost everything
that supports .sig or .asc extensions to ${DISTFILE}.
For example, security/gnupg2:
qbit@slip[0]:gnupg2λ make verify
===> Checking files for gnupg-2.2.4
>> Fetch https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2
gnupg-2.2.4.tar.bz2 100% |*********************************************| 6417 KB 00:18
===> Checking signature files for gnupg-2.2.4
ftp: Error retrieving file: 404 Not Found
ftp: Error retrieving file: 404 Not Found
gnupg-2.2.4.tar.bz2.sig 100% |*****************************************| 620 00:00
gpg: WARNING: unsafe ownership on homedir '/usr/local/share/signing/gnupg'
gpg: assuming signed data in '/usr/ports/distfiles/gnupg-2.2.4.tar.bz2'
gpg: Signature made Wed Dec 20 02:07:51 2017 MST
gpg: using RSA key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
gpg: Note: trustdb not writable
gpg: Good signature from "Werner Koch (dist sig)" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
gpg: Signature made Wed Dec 20 02:41:03 2017 MST
gpg: using RSA key 031EC2536E580D8EA286A9F22071B08A33BD3F06
gpg: Good signature from "NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 031E C253 6E58 0D8E A286 A9F2 2071 B08A 33BD 3F06
Signature OK
qbit@slip[0]:gnupg2
I'd like to flesh out more of the process before getting it committed,
but if anyone has any suggestions, I am all ears!
Cheers,
Aaron
P.S. I would really dig it if someone could cross reference the keys I
imported into the keychain. Maybe the man is after me more than he is
you!
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Here is a mostly functional set of make targets that verify gnupg
signatures with ease.
To use it, you can simple add the following to your /etc/mk.conf:
.if exists(/usr/local/share/signing/signing.mk)
.include "/usr/local/share/signing/signing.mk"
.endif
(The above is taken from the readme which uses PREFIX, so might be
different if you are using weird setups. Weirdo.)
Once that is in place, you can verify distfiles for almost everything
that supports .sig or .asc extensions to ${DISTFILE}.
For example, security/gnupg2:
qbit@slip[0]:gnupg2λ make verify
===> Checking files for gnupg-2.2.4
>> Fetch https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2
gnupg-2.2.4.tar.bz2 100% |*********************************************| 6417 KB 00:18
===> Checking signature files for gnupg-2.2.4
ftp: Error retrieving file: 404 Not Found
ftp: Error retrieving file: 404 Not Found
gnupg-2.2.4.tar.bz2.sig 100% |*****************************************| 620 00:00
gpg: WARNING: unsafe ownership on homedir '/usr/local/share/signing/gnupg'
gpg: assuming signed data in '/usr/ports/distfiles/gnupg-2.2.4.tar.bz2'
gpg: Signature made Wed Dec 20 02:07:51 2017 MST
gpg: using RSA key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
gpg: Note: trustdb not writable
gpg: Good signature from "Werner Koch (dist sig)" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
gpg: Signature made Wed Dec 20 02:41:03 2017 MST
gpg: using RSA key 031EC2536E580D8EA286A9F22071B08A33BD3F06
gpg: Good signature from "NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 031E C253 6E58 0D8E A286 A9F2 2071 B08A 33BD 3F06
Signature OK
qbit@slip[0]:gnupg2
I'd like to flesh out more of the process before getting it committed,
but if anyone has any suggestions, I am all ears!
Cheers,
Aaron
P.S. I would really dig it if someone could cross reference the keys I
imported into the keychain. Maybe the man is after me more than he is
you!
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Re: RAID controller
On Sat, Mar 31, 2018 at 11:38:52AM -0300, Friedrich Locke wrote:
> Hi folks.
>
> Does OBSD 6.2 support DELL H840 and DELL H740p raid controllers ?
No, but 6.3 will.
> Hi folks.
>
> Does OBSD 6.2 support DELL H840 and DELL H740p raid controllers ?
No, but 6.3 will.
Re: print usb printer by [ Google Cloud Print for Chromium ]
using [ Google Cloud Print for Chromium ] ,
i also print text files besides pdf files .
for example
1) chrome test.txt
2) right click , then the print menu appears .
(cups is not installed)
i also print text files besides pdf files .
for example
1) chrome test.txt
2) right click , then the print menu appears .
(cups is not installed)
Re: [update] www/wp-cli to 1.5.0
On Sat, Mar 31, 2018 at 02:33:06PM -0600, Aaron Bieber wrote:
> Hi,
>
> Here is an update to bring wp-cli to the latest.
>
> Changelog here:
> https://make.wordpress.org/cli/2018/01/31/version-1-5-0-released/
>
> Also removes the GH_* stuff to avoid confusion (it wasn't impacted
> before).
Hhemmm
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/wp-cli/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 10 Dec 2017 16:44:01 -0000 1.1.1.1
+++ Makefile 31 Mar 2018 20:16:49 -0000
@@ -2,14 +2,13 @@
COMMENT = command line tool for wordpress
-GH_ACCOUNT = wp-cli
-GH_PROJECT = wp-cli
-GH_TAGNAME = v1.4.1
+V = 1.5.0
+DISTNAME = wp-cli-${V}
EXTRACT_ONLY =
EXTRACT_SUFX = .phar
-MASTER_SITES = https://github.com/wp-cli/wp-cli/releases/download/${GH_TAGNAME}/
+MASTER_SITES = https://github.com/wp-cli/wp-cli/releases/download/v${V}/
CATEGORIES = www
HOMEPAGE = http://wp-cli.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/wp-cli/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 10 Dec 2017 16:44:01 -0000 1.1.1.1
+++ distinfo 31 Mar 2018 20:16:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (wp-cli-1.4.1.phar) = MlkkzxYYVvlHjyoVRXJpjstdEFTmIIQ7nEOnuvTlzjs=
-SIZE (wp-cli-1.4.1.phar) = 4409743
+SHA256 (wp-cli-1.5.0.phar) = 9hXVeVfmagn1esyESh/FQC6fpYHcs4e74a/8TRVbr50=
+SIZE (wp-cli-1.5.0.phar) = 4561899
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
> Hi,
>
> Here is an update to bring wp-cli to the latest.
>
> Changelog here:
> https://make.wordpress.org/cli/2018/01/31/version-1-5-0-released/
>
> Also removes the GH_* stuff to avoid confusion (it wasn't impacted
> before).
Hhemmm
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/wp-cli/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 10 Dec 2017 16:44:01 -0000 1.1.1.1
+++ Makefile 31 Mar 2018 20:16:49 -0000
@@ -2,14 +2,13 @@
COMMENT = command line tool for wordpress
-GH_ACCOUNT = wp-cli
-GH_PROJECT = wp-cli
-GH_TAGNAME = v1.4.1
+V = 1.5.0
+DISTNAME = wp-cli-${V}
EXTRACT_ONLY =
EXTRACT_SUFX = .phar
-MASTER_SITES = https://github.com/wp-cli/wp-cli/releases/download/${GH_TAGNAME}/
+MASTER_SITES = https://github.com/wp-cli/wp-cli/releases/download/v${V}/
CATEGORIES = www
HOMEPAGE = http://wp-cli.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/wp-cli/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 10 Dec 2017 16:44:01 -0000 1.1.1.1
+++ distinfo 31 Mar 2018 20:16:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (wp-cli-1.4.1.phar) = MlkkzxYYVvlHjyoVRXJpjstdEFTmIIQ7nEOnuvTlzjs=
-SIZE (wp-cli-1.4.1.phar) = 4409743
+SHA256 (wp-cli-1.5.0.phar) = 9hXVeVfmagn1esyESh/FQC6fpYHcs4e74a/8TRVbr50=
+SIZE (wp-cli-1.5.0.phar) = 4561899
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
[update] www/wp-cli to 1.5.0
Hi,
Here is an update to bring wp-cli to the latest.
Changelog here:
https://make.wordpress.org/cli/2018/01/31/version-1-5-0-released/
Also removes the GH_* stuff to avoid confusion (it wasn't impacted
before).
Cheers,
Aaron
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Here is an update to bring wp-cli to the latest.
Changelog here:
https://make.wordpress.org/cli/2018/01/31/version-1-5-0-released/
Also removes the GH_* stuff to avoid confusion (it wasn't impacted
before).
Cheers,
Aaron
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
[new] security/opmsg
Hi,
Here is a new port: opmsg
Description: opmsg is a replacement for gpg which can encrypt/sign/verify
your mails or create/verify detached signatures of local files. Even
though the opmsg output looks similar, the concept is entirely different.
Upstream was kind enough to create tarball releases!
OK, clue sticks?
Cheers,
Aaron
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Here is a new port: opmsg
Description: opmsg is a replacement for gpg which can encrypt/sign/verify
your mails or create/verify detached signatures of local files. Even
though the opmsg output looks similar, the concept is entirely different.
Upstream was kind enough to create tarball releases!
OK, clue sticks?
Cheers,
Aaron
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Re: bug tracking system for OpenBSD
Way to go guys, you've completely misunderstood the problem
and therefore have no solution.
and therefore have no solution.
Re: Remove x11/wm{i,ii}
On Fri, Mar 30, 2018 at 11:08:12PM +0100, Stuart Henderson wrote:
> On 2018/03/30 23:25, Jan Klemkow wrote:
> > On Fri, Mar 30, 2018 at 04:28:24PM +0100, Stuart Henderson wrote:
> > > On 2018/03/30 15:20, Klemens Nanni wrote:
> > > > Both ports have been unmaintained for over six years. One succeeded the
> > > > other until x11/dwm came around and took over.
> > > >
> > > > We'll never see updates to these again, upstream homepages and/or
> > > > documentation at suckless, googlecode and whereever else have been
> > > > purged.
> > > >
> > > > Anselm R. Garbe keeps distribution tarballs at dl.suckless.org these
> > > > projects originated from there, but he'd be happy to see the ports
> > > > removed.
> > > >
> > > > New users are encouraged to use dwm.
> > > >
> > > > Thoughts? OK to remove x11/wmi and x11/wmii?
> > > >
> > >
> > > Is there any benefit to removing them? It doesn't really matter that
> > > they don't have maintainers if there are no updates upstream anyway!
> > >
> > > Happy to host the distfiles if suckless people want to kill their copy.
> >
> > Theses projects are dead and x11/dwm is the official successor.
> >
> > IMHO: delete the port.
> >
> > bye,
> > Jan
> >
>
> We still have WMs in tree that were dead before wmi was written. The
> two aren't getting the way of anything, take a few seconds to build,
> less than a MB on mirrors, no big chain of dependencies (and you
> don't have to recompile to change configuration ;)
>
> Which WM to use is quite a personal choice. Not OK with me without a
> better reason than this.
I side with Stuart on that one...
> On 2018/03/30 23:25, Jan Klemkow wrote:
> > On Fri, Mar 30, 2018 at 04:28:24PM +0100, Stuart Henderson wrote:
> > > On 2018/03/30 15:20, Klemens Nanni wrote:
> > > > Both ports have been unmaintained for over six years. One succeeded the
> > > > other until x11/dwm came around and took over.
> > > >
> > > > We'll never see updates to these again, upstream homepages and/or
> > > > documentation at suckless, googlecode and whereever else have been
> > > > purged.
> > > >
> > > > Anselm R. Garbe keeps distribution tarballs at dl.suckless.org these
> > > > projects originated from there, but he'd be happy to see the ports
> > > > removed.
> > > >
> > > > New users are encouraged to use dwm.
> > > >
> > > > Thoughts? OK to remove x11/wmi and x11/wmii?
> > > >
> > >
> > > Is there any benefit to removing them? It doesn't really matter that
> > > they don't have maintainers if there are no updates upstream anyway!
> > >
> > > Happy to host the distfiles if suckless people want to kill their copy.
> >
> > Theses projects are dead and x11/dwm is the official successor.
> >
> > IMHO: delete the port.
> >
> > bye,
> > Jan
> >
>
> We still have WMs in tree that were dead before wmi was written. The
> two aren't getting the way of anything, take a few seconds to build,
> less than a MB on mirrors, no big chain of dependencies (and you
> don't have to recompile to change configuration ;)
>
> Which WM to use is quite a personal choice. Not OK with me without a
> better reason than this.
I side with Stuart on that one...
Re: bug tracking system for OpenBSD
On 21:17 Fri 30 Mar , Mike Burns wrote:
> On 2018-03-30 23.01.16 +0300, Sergey Bronnikov wrote:
> > I have made a first step forward in direction to OpenBSD bugtracker
> > and imported bugs@ archive to a Fossil SCM -
> > https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
>
> Ran it through curl:
>
> - Your cert is invalid.
> - Why does every ticket go to /cgi-bin/b.cgi/honeypot ?
https://www.fossil-scm.org/xfer/help?cmd=/honeypot
The "/honeypot" page:
This page is a honeypot for spiders and bots.
> > Let's discuss a next step.
>
> Are these triaged?
> On 2018-03-30 23.01.16 +0300, Sergey Bronnikov wrote:
> > I have made a first step forward in direction to OpenBSD bugtracker
> > and imported bugs@ archive to a Fossil SCM -
> > https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
>
> Ran it through curl:
>
> - Your cert is invalid.
> - Why does every ticket go to /cgi-bin/b.cgi/honeypot ?
https://www.fossil-scm.org/xfer/help?cmd=/honeypot
The "/honeypot" page:
This page is a honeypot for spiders and bots.
> > Let's discuss a next step.
>
> Are these triaged?
Re: bug tracking system for OpenBSD
On 21:04 Sat 31 Mar , Consus wrote:
> On 23:01 Fri 30 Mar, Sergey Bronnikov wrote:
> > I have made a first step forward in direction to OpenBSD bugtracker
> > and imported bugs@ archive to a Fossil SCM -
> > https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> > Let's discuss a next step.
>
> The first obvious problem: you've imported every message in the mailing
> list as a separate ticket:
It is not so. Each ticket in bugtracker is a separate mail thread. The
problem comes from mail archive on marc.info which I used as reports
archive - each mail is a separate thread. I believe it is due to broken
In-Reply-To field. Each ticket contains a link to the appropriate mail
thread and you can check it yourself with links below.
> c541065d62 ... kernel/515: Byte-order confusion in CD-ROM drivers
https://marc.info/?l=openbsd-bugs&m=90222460531616&w=2
> 4136fcdc4e ... Re: kernel/515
https://marc.info/?l=openbsd-bugs&m=90222460531621&w=2
> or
>
> 3989e0a08b ... documentation/532: man page 'curs_terminfo' does not exist
https://marc.info/?l=openbsd-bugs&m=90222460531656&w=2
> 0486b260d2 ... Re: documentation/532
https://marc.info/?l=openbsd-bugs&m=90222460531658&w=2
> So the main advantage of the bug tracking system (ability to follow the
> history of actions) is lost.
>
> Or I got something wrong, the UI is kinda strange.
Setup another bugtracker which you like, connect it to bugs@ and send a
link to this thread.
> On 23:01 Fri 30 Mar, Sergey Bronnikov wrote:
> > I have made a first step forward in direction to OpenBSD bugtracker
> > and imported bugs@ archive to a Fossil SCM -
> > https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> > Let's discuss a next step.
>
> The first obvious problem: you've imported every message in the mailing
> list as a separate ticket:
It is not so. Each ticket in bugtracker is a separate mail thread. The
problem comes from mail archive on marc.info which I used as reports
archive - each mail is a separate thread. I believe it is due to broken
In-Reply-To field. Each ticket contains a link to the appropriate mail
thread and you can check it yourself with links below.
> c541065d62 ... kernel/515: Byte-order confusion in CD-ROM drivers
https://marc.info/?l=openbsd-bugs&m=90222460531616&w=2
> 4136fcdc4e ... Re: kernel/515
https://marc.info/?l=openbsd-bugs&m=90222460531621&w=2
> or
>
> 3989e0a08b ... documentation/532: man page 'curs_terminfo' does not exist
https://marc.info/?l=openbsd-bugs&m=90222460531656&w=2
> 0486b260d2 ... Re: documentation/532
https://marc.info/?l=openbsd-bugs&m=90222460531658&w=2
> So the main advantage of the bug tracking system (ability to follow the
> history of actions) is lost.
>
> Or I got something wrong, the UI is kinda strange.
Setup another bugtracker which you like, connect it to bugs@ and send a
link to this thread.
NEW: math/gap
pkg/DESCR:
GAP is a system for computational discrete algebra, with particular
emphasis on Computational Group Theory. GAP provides a programming
language, a library of thousands of functions implementing algebraic
algorithms written in the GAP language as well as large data libraries
of algebraic objects.
Some things to note:
* The distfile, work dir, actual version string are all slightly
different: 4r8p10, 48, 4.8.10, that's why there's all this ${V}
munging.
* There is a test that apparently checks if our cwd is in the source
code, that's why I have a do-test instead of just using
TEST_TARGET. This way, the tests report no errors at all.
* I'm not an expert with autotools, I noticed that the build was using
-lreadline instead of -lereadline, so I just used sed to change it
around in some files, maybe there's a better way to do it.
* I noticed that the OpenBSD config.site has the line:
> ac_cv_func_timer_create=${ac_cv_func_timer_create=yes}
Isn't this wrong? OpenBSD doesn't have timer_create, right? gap
checks HAVE_TIMER_CREATE in some files and uses timer_create. To get
it to compile, I just changed the #if HAVE_TIMER_CREATE to #if 0,
but maybe I missed something? Is there a way to turn off using
config.site?
I was able to run the test suite on amd64 and sparc64 and got no
warnings (make test):
> #I No errors detected while testing
--
Kaashif Hymabaccus
GPG: 3E810B04
GAP is a system for computational discrete algebra, with particular
emphasis on Computational Group Theory. GAP provides a programming
language, a library of thousands of functions implementing algebraic
algorithms written in the GAP language as well as large data libraries
of algebraic objects.
Some things to note:
* The distfile, work dir, actual version string are all slightly
different: 4r8p10, 48, 4.8.10, that's why there's all this ${V}
munging.
* There is a test that apparently checks if our cwd is in the source
code, that's why I have a do-test instead of just using
TEST_TARGET. This way, the tests report no errors at all.
* I'm not an expert with autotools, I noticed that the build was using
-lreadline instead of -lereadline, so I just used sed to change it
around in some files, maybe there's a better way to do it.
* I noticed that the OpenBSD config.site has the line:
> ac_cv_func_timer_create=${ac_cv_func_timer_create=yes}
Isn't this wrong? OpenBSD doesn't have timer_create, right? gap
checks HAVE_TIMER_CREATE in some files and uses timer_create. To get
it to compile, I just changed the #if HAVE_TIMER_CREATE to #if 0,
but maybe I missed something? Is there a way to turn off using
config.site?
I was able to run the test suite on amd64 and sparc64 and got no
warnings (make test):
> #I No errors detected while testing
--
Kaashif Hymabaccus
GPG: 3E810B04
Re: bug tracking system for OpenBSD
On 21:04 Sat 31 Mar, Consus wrote:
> On 23:01 Fri 30 Mar, Sergey Bronnikov wrote:
> > I have made a first step forward in direction to OpenBSD bugtracker
> > and imported bugs@ archive to a Fossil SCM -
> > https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> > Let's discuss a next step.
>
> The first obvious problem: you've imported every message in the mailing
> list as a separate ticket:
>
> c541065d62 ... kernel/515: Byte-order confusion in CD-ROM drivers
> 4136fcdc4e ... Re: kernel/515
>
> or
>
> 3989e0a08b ... documentation/532: man page 'curs_terminfo' does not exist
> 0486b260d2 ... Re: documentation/532
>
> So the main advantage of the bug tracking system (ability to follow the
> history of actions) is lost.
>
> Or I got something wrong, the UI is kinda strange.
Oh, I got it. User comments are being added properly only if replies to
subsytem/id: subject
are in form
RE: subsystem/id: subject
which is not always the case as
RE: subsystem/id
is also frequent.
Also ALL tickets are opened.
> On 23:01 Fri 30 Mar, Sergey Bronnikov wrote:
> > I have made a first step forward in direction to OpenBSD bugtracker
> > and imported bugs@ archive to a Fossil SCM -
> > https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> > Let's discuss a next step.
>
> The first obvious problem: you've imported every message in the mailing
> list as a separate ticket:
>
> c541065d62 ... kernel/515: Byte-order confusion in CD-ROM drivers
> 4136fcdc4e ... Re: kernel/515
>
> or
>
> 3989e0a08b ... documentation/532: man page 'curs_terminfo' does not exist
> 0486b260d2 ... Re: documentation/532
>
> So the main advantage of the bug tracking system (ability to follow the
> history of actions) is lost.
>
> Or I got something wrong, the UI is kinda strange.
Oh, I got it. User comments are being added properly only if replies to
subsytem/id: subject
are in form
RE: subsystem/id: subject
which is not always the case as
RE: subsystem/id
is also frequent.
Also ALL tickets are opened.
Re: bug tracking system for OpenBSD
On 23:01 Fri 30 Mar, Sergey Bronnikov wrote:
> I have made a first step forward in direction to OpenBSD bugtracker
> and imported bugs@ archive to a Fossil SCM -
> https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> Let's discuss a next step.
The first obvious problem: you've imported every message in the mailing
list as a separate ticket:
c541065d62 ... kernel/515: Byte-order confusion in CD-ROM drivers
4136fcdc4e ... Re: kernel/515
or
3989e0a08b ... documentation/532: man page 'curs_terminfo' does not exist
0486b260d2 ... Re: documentation/532
So the main advantage of the bug tracking system (ability to follow the
history of actions) is lost.
Or I got something wrong, the UI is kinda strange.
> I have made a first step forward in direction to OpenBSD bugtracker
> and imported bugs@ archive to a Fossil SCM -
> https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> Let's discuss a next step.
The first obvious problem: you've imported every message in the mailing
list as a separate ticket:
c541065d62 ... kernel/515: Byte-order confusion in CD-ROM drivers
4136fcdc4e ... Re: kernel/515
or
3989e0a08b ... documentation/532: man page 'curs_terminfo' does not exist
0486b260d2 ... Re: documentation/532
So the main advantage of the bug tracking system (ability to follow the
history of actions) is lost.
Or I got something wrong, the UI is kinda strange.
wxMaxima Re: x11/wxWidgets 3.0.3.1 update
On Thu, 7 Sep 2017, Stuart Henderson wrote:
> On 2017/09/07 12:45, Jérôme KASPER wrote:
> > Hi ports,
> >
> > attached an update to wxWidgets 3.0.3.1 .
> >
> > improvements :
> > - Switch to github
> > - unified package instead of -main, -media
> > - dependancies upgraded to GTK+3 , SDL2 and gstreamer1
> >
> > built on AMD64. This is my first port work so there might be mistakes lasting.
> > Any comments welcome.
> >
> > Best regards,
> > Jerome KASPER
>
> You picked a bit of a challenge for first ports work, I think!
>
> A number of other ports use wxWidgets and would need testing with the
> update:
>
> $ sqlite3 /usr/local/share/sqlports
> SQLite version 3.20.0 2017-08-01 13:24:15
> Enter ".help" for usage hints.
> sqlite> select distinct fullpkgpath from depends where dependspath like 'x11/wxWidgets%';
> audio/audacity
> cad/kicad,-main
> databases/pgadmin3
> devel/codeblocks
> devel/p5-Alien-wxWidgets
> devel/poedit
> devel/rapidsvn
> games/golly
> games/megaglest/base
> games/scorched3d
> games/scummvm-tools
> geo/spatialite/gis
> geo/spatialite/gui
> geo/spatialite/librewms
> graphics/delaboratory
> graphics/discwrapper
> graphics/hugin
> lang/erlang/16,-wx
> lang/erlang/17,-wx
> lang/erlang/18,-wx
> lang/erlang/19,-wx
> math/wxMaxima
> misc/rocrail,-gui
> multimedia/dvdstyler
> net/amule,-daemon
> net/amule,-main
> net/amule,-web
> net/dysnomia
> net/filezilla
> telephony/iaxclient,-iaxcomm
> x11/nx/opennx
> x11/p5-Wx
> x11/py-wxPython
> x11/wxSVG
> x11/wxWidgets,-media
> x11/wxWidgets,-main
> x11/xchm
>
> .. there are quite a few changes compared to 2.x (see
> http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html)
> so my understanding is that it's likely to need work on the ports
> using it.
>
> (Also note we're gearing up to release now, it's definitely too late
> for a change like this, or even spending much time looking at it,
> until after 6.2 is done).
>
> wxmaxima /home/austin/mail/ports 22559
wxMaxima, mentioned above, works fine for me although it is marked broken,
both in current and in 6.2 stable.
I first reported to ports on 18 June 2017 that wxMaxima, works fine for me
in 6.0, if I remove the "broken" line in the Makefile.
More recently, upgrading 6.0 -> 6.1 -> 6.2, I found I had to delete that
package, once again remove the "broken" line, then re-make/install.
So it is still the case for me, using ports from 6.2 stable, on a
release version of 6.2, wxMaxima works great.
Studying solar power for our farm, taking an Edx.org course at xDelf, the
following script earns me a correct couple of points in the problem sets
at the end of week two...
Using 4 wxMaxima "cells", script, including comments, are entirely
mine...
/* [ Created with wxMaxima version 12.09.0 ] */
/* [wxMaxima: input start ] */
"AQ2.5.1"; /* Diffusion current for a p-n junction */
dn: n1-n2; /* Electron density variation near depletion zone over dx */
Jdiff[e]: (q*De*dn)/dx;
" AQ2.5.2 "; /* Diffusion current vs drift current at equilibrium */
Jdrift[e]: n3*q*mu[e]*E; /* Drift current of electrons due to electric field E */
eq1: Jdrift[e] = Jdiff[e]; /* If both opposing currents are at equilibrium */
solve(eq1,E); /* Solve for electric field in volts per cm */
"End cell one";
/* [wxMaxima: input end ] */
/* [wxMaxima: input start ] */
/* Calculate an example E-field at equilibrium near n side of p-n junction */
/* Majority charge carriers would be electrons, minority carriers would be holes */
/* Electron densities are per cm^3 */
/* Note: example dx is 2 micrometers */
q: 1.6e-19; /* Charge of an electron in Coulombs */
De: 36; /* Electron diffusion in cm^2/second */
n1: 2.7e+16; /* Electron density away from depletion zone */
n2: 1.0e+15; /* Electron density near depletion zone */
dx: 100.0*2e-6; /* Width of presumed linear density gradient in cm */
n3: n2; /* Highest E-field strength would be nearest low density */
mu[e]: 1350; /* Electron mobility in cm^2 per volt per second */
"End cell two";
/* [wxMaxima: input end ] */
/* [wxMaxima: input start ] */
/* Using solution for E from first Cell above */
E=-(De*n2-De*n1)/(dx*mu[e]*n3);
/* [wxMaxima: input end ] */
/* [wxMaxima: input start ] */
/* Simplifying somewhat for max E field strength -- same answer */
E = (De/mu[e])*(n1/n2-1)/dx;
/* [wxMaxima: input end ] */
/* Maxima can't load/batch files which end with a comment! */
"Created with wxMaxima"$
> On 2017/09/07 12:45, Jérôme KASPER wrote:
> > Hi ports,
> >
> > attached an update to wxWidgets 3.0.3.1 .
> >
> > improvements :
> > - Switch to github
> > - unified package instead of -main, -media
> > - dependancies upgraded to GTK+3 , SDL2 and gstreamer1
> >
> > built on AMD64. This is my first port work so there might be mistakes lasting.
> > Any comments welcome.
> >
> > Best regards,
> > Jerome KASPER
>
> You picked a bit of a challenge for first ports work, I think!
>
> A number of other ports use wxWidgets and would need testing with the
> update:
>
> $ sqlite3 /usr/local/share/sqlports
> SQLite version 3.20.0 2017-08-01 13:24:15
> Enter ".help" for usage hints.
> sqlite> select distinct fullpkgpath from depends where dependspath like 'x11/wxWidgets%';
> audio/audacity
> cad/kicad,-main
> databases/pgadmin3
> devel/codeblocks
> devel/p5-Alien-wxWidgets
> devel/poedit
> devel/rapidsvn
> games/golly
> games/megaglest/base
> games/scorched3d
> games/scummvm-tools
> geo/spatialite/gis
> geo/spatialite/gui
> geo/spatialite/librewms
> graphics/delaboratory
> graphics/discwrapper
> graphics/hugin
> lang/erlang/16,-wx
> lang/erlang/17,-wx
> lang/erlang/18,-wx
> lang/erlang/19,-wx
> math/wxMaxima
> misc/rocrail,-gui
> multimedia/dvdstyler
> net/amule,-daemon
> net/amule,-main
> net/amule,-web
> net/dysnomia
> net/filezilla
> telephony/iaxclient,-iaxcomm
> x11/nx/opennx
> x11/p5-Wx
> x11/py-wxPython
> x11/wxSVG
> x11/wxWidgets,-media
> x11/wxWidgets,-main
> x11/xchm
>
> .. there are quite a few changes compared to 2.x (see
> http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html)
> so my understanding is that it's likely to need work on the ports
> using it.
>
> (Also note we're gearing up to release now, it's definitely too late
> for a change like this, or even spending much time looking at it,
> until after 6.2 is done).
>
> wxmaxima /home/austin/mail/ports 22559
wxMaxima, mentioned above, works fine for me although it is marked broken,
both in current and in 6.2 stable.
I first reported to ports on 18 June 2017 that wxMaxima, works fine for me
in 6.0, if I remove the "broken" line in the Makefile.
More recently, upgrading 6.0 -> 6.1 -> 6.2, I found I had to delete that
package, once again remove the "broken" line, then re-make/install.
So it is still the case for me, using ports from 6.2 stable, on a
release version of 6.2, wxMaxima works great.
Studying solar power for our farm, taking an Edx.org course at xDelf, the
following script earns me a correct couple of points in the problem sets
at the end of week two...
Using 4 wxMaxima "cells", script, including comments, are entirely
mine...
/* [ Created with wxMaxima version 12.09.0 ] */
/* [wxMaxima: input start ] */
"AQ2.5.1"; /* Diffusion current for a p-n junction */
dn: n1-n2; /* Electron density variation near depletion zone over dx */
Jdiff[e]: (q*De*dn)/dx;
" AQ2.5.2 "; /* Diffusion current vs drift current at equilibrium */
Jdrift[e]: n3*q*mu[e]*E; /* Drift current of electrons due to electric field E */
eq1: Jdrift[e] = Jdiff[e]; /* If both opposing currents are at equilibrium */
solve(eq1,E); /* Solve for electric field in volts per cm */
"End cell one";
/* [wxMaxima: input end ] */
/* [wxMaxima: input start ] */
/* Calculate an example E-field at equilibrium near n side of p-n junction */
/* Majority charge carriers would be electrons, minority carriers would be holes */
/* Electron densities are per cm^3 */
/* Note: example dx is 2 micrometers */
q: 1.6e-19; /* Charge of an electron in Coulombs */
De: 36; /* Electron diffusion in cm^2/second */
n1: 2.7e+16; /* Electron density away from depletion zone */
n2: 1.0e+15; /* Electron density near depletion zone */
dx: 100.0*2e-6; /* Width of presumed linear density gradient in cm */
n3: n2; /* Highest E-field strength would be nearest low density */
mu[e]: 1350; /* Electron mobility in cm^2 per volt per second */
"End cell two";
/* [wxMaxima: input end ] */
/* [wxMaxima: input start ] */
/* Using solution for E from first Cell above */
E=-(De*n2-De*n1)/(dx*mu[e]*n3);
/* [wxMaxima: input end ] */
/* [wxMaxima: input start ] */
/* Simplifying somewhat for max E field strength -- same answer */
E = (De/mu[e])*(n1/n2-1)/dx;
/* [wxMaxima: input end ] */
/* Maxima can't load/batch files which end with a comment! */
"Created with wxMaxima"$
howto configure a virtual switch for vmd network
hi
how do i configure a virtual switch to connect the interfaces of several
vm's together.
the interfaces will have fixed addresses and i will also be bridging the
interfaces to the host.
i know how to set up the bridge and then configure it with vm.conf
but i not sure how to setup the switch and add the vio interfaces to the
switch.
shadrock
how do i configure a virtual switch to connect the interfaces of several
vm's together.
the interfaces will have fixed addresses and i will also be bridging the
interfaces to the host.
i know how to set up the bridge and then configure it with vm.conf
but i not sure how to setup the switch and add the vio interfaces to the
switch.
shadrock
Re: NEW: news/nzbget
On Sat, Mar 31, 2018 at 06:21:14PM +0200, Björn Ketelaars wrote:
> Ping...I'd really like to get this in.
>
> Tarball reattached.
>
> OK?
All previous issues have been addressed and the uid got bumped, good.
Just saw our CXXFLAGS being ignored. Propagate it (quoted) through
CONFIGURE_ARGS to make the port honor our flags, otherwise
`-O2 -pipe -g' is used regardless of *FLAGS and DEBUG.
With that OK kn.
> Ping...I'd really like to get this in.
>
> Tarball reattached.
>
> OK?
All previous issues have been addressed and the uid got bumped, good.
Just saw our CXXFLAGS being ignored. Propagate it (quoted) through
CONFIGURE_ARGS to make the port honor our flags, otherwise
`-O2 -pipe -g' is used regardless of *FLAGS and DEBUG.
With that OK kn.
Re: NEW: news/nzbget
On Wed 24/01/2018 07:48, Björn Ketelaars wrote:
> On Sat 20/01/2018 21:39, Klemens Nanni wrote:
> > On Sat, Jan 20, 2018 at 08:05:04PM +0100, Björn Ketelaars wrote:
> > > New port for NZBGet
> > >
> > > pkg/DESCR:
> > > NZBGet is a binary newsgrabber, which downloads files from usenet based on
> > > information given in nzb-files. NZBGet is written in C++ and is known for its
> > > extraordinary performance and efficiency.
> > >
> > >
> > > This port does the same thing as news/sabnzbd but is faster, lighter on
> > > resources, and has less dependencies.
> > >
> > > I used the first free id from infrastructure/db/user.list.
> > >
> > > Comments?
> > Looks good to me portwise except for:
> >
> > DISTNAME is not needed as it's generated by GH_* already. But since
> > upstream provides proper release tarballs, please use DISTNAME and
> > MASTER_SITES without GH_* here.
> >
> > HOMEPAGE has HTTPS.
> >
> > The example nzbget.conf should probably be installed under
> > share/examples/nzget/ instead of share/nzget/ as per our porting guide.
>
> Enclosed a new tarball which addresses, amongst others, the comments above.
> I only tested on amd64 as this platform is available to me. Is there someone
> interested in this port, and could give it a spin on a different platform?
Ping...I'd really like to get this in.
Tarball reattached.
OK?
> On Sat 20/01/2018 21:39, Klemens Nanni wrote:
> > On Sat, Jan 20, 2018 at 08:05:04PM +0100, Björn Ketelaars wrote:
> > > New port for NZBGet
> > >
> > > pkg/DESCR:
> > > NZBGet is a binary newsgrabber, which downloads files from usenet based on
> > > information given in nzb-files. NZBGet is written in C++ and is known for its
> > > extraordinary performance and efficiency.
> > >
> > >
> > > This port does the same thing as news/sabnzbd but is faster, lighter on
> > > resources, and has less dependencies.
> > >
> > > I used the first free id from infrastructure/db/user.list.
> > >
> > > Comments?
> > Looks good to me portwise except for:
> >
> > DISTNAME is not needed as it's generated by GH_* already. But since
> > upstream provides proper release tarballs, please use DISTNAME and
> > MASTER_SITES without GH_* here.
> >
> > HOMEPAGE has HTTPS.
> >
> > The example nzbget.conf should probably be installed under
> > share/examples/nzget/ instead of share/nzget/ as per our porting guide.
>
> Enclosed a new tarball which addresses, amongst others, the comments above.
> I only tested on amd64 as this platform is available to me. Is there someone
> interested in this port, and could give it a spin on a different platform?
Ping...I'd really like to get this in.
Tarball reattached.
OK?
RAID controller
Hi folks.
Does OBSD 6.2 support DELL H840 and DELL H740p raid controllers ?
Thanks a lot.
Does OBSD 6.2 support DELL H840 and DELL H740p raid controllers ?
Thanks a lot.
Re: NEW: devel/rgbds
Klemens Nanni writes:
> On Sat, Mar 31, 2018 at 01:18:46PM +0200, Klemens Nanni wrote:
> > I did a quick test, the toolchain seems to work and my ROM starts, but
> > that might mean nothing at all:
> >
> > $ cat > a.s
> > section "die",rom0
> This must be a banked ROM section (ROMX).
On Game Boy the program counter starts at $100, where you have four
bytes before the header starts. Typically it goes:
section "header",rom0[$100]
nop
jp Start
ds $14C
section "program",rom0[$150]
Start:
; ...
> > di ; disable interrupts
> > stop ; stop the cpu
> > $ rgbasm -o a.o a.s
> > $ rgblink -o a.gb a.o
> > $ rgbfix -v a.gb
> > $ mednafen a.gb
> >
> > Have fun!
> On Sat, Mar 31, 2018 at 01:18:46PM +0200, Klemens Nanni wrote:
> > I did a quick test, the toolchain seems to work and my ROM starts, but
> > that might mean nothing at all:
> >
> > $ cat > a.s
> > section "die",rom0
> This must be a banked ROM section (ROMX).
On Game Boy the program counter starts at $100, where you have four
bytes before the header starts. Typically it goes:
section "header",rom0[$100]
nop
jp Start
ds $14C
section "program",rom0[$150]
Start:
; ...
> > di ; disable interrupts
> > stop ; stop the cpu
> > $ rgbasm -o a.o a.s
> > $ rgblink -o a.gb a.o
> > $ rgbfix -v a.gb
> > $ mednafen a.gb
> >
> > Have fun!
Re: bug tracking system for OpenBSD
On Fri, Mar 30, 2018, at 4:01 PM, Sergey Bronnikov wrote:
> I have made a first step forward in direction to OpenBSD bugtracker
> and imported bugs@ archive to a Fossil SCM -
> https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> Let's discuss a next step.
>
You think I'm going to visit a .ru website?
> I have made a first step forward in direction to OpenBSD bugtracker
> and imported bugs@ archive to a Fossil SCM -
> https://bronevichok.ru/cgi-bin/b.cgi/rptview?rn=1
> Let's discuss a next step.
>
You think I'm going to visit a .ru website?
UPDATE: devel/qt-creator and devel/qbs
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile 15 Mar 2018 20:04:34 -0000 1.35
+++ Makefile 31 Mar 2018 12:47:18 -0000
@@ -4,7 +4,7 @@
USE_WXNEEDED = Yes
COMMENT = cross-platform IDE for use with Qt
-V = 4.5.2
+V = 4.6.0
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
@@ -40,8 +40,8 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Designer
WANTLIB += Qt5DesignerComponents Qt5Gui Qt5Help Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Sql Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml botan-1.10 c m qbscore qbsqtprofilesetup
+WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg
+WANTLIB += Qt5Widgets Qt5Xml botan-1.10 c clang m
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
@@ -50,28 +50,30 @@ MODULES = x11/qt5 \
MODQMAKE_INSTALL_ROOT = ${PREFIX}
-MODQMAKE_ARGS = USE_SYSTEM_BOTAN=1
+MODQMAKE_ARGS = USE_SYSTEM_BOTAN=1 \
+ CONFIG+=qbs_enable_project_file_updates
# qtcreator.sh is created with custom LINK?= in Makefile
MODQT5_USE_CXX11 = No
COMPILER = base-clang ports-gcc
BUILD_DEPENDS = x11/qt5/qtquickcontrols \
- x11/qt5/qtscript
+ devel/qbs
RUN_DEPENDS = devel/gdb \
+ devel/qbs \
devel/gmake \
${MODGCC4_CPPDEP} \
x11/gtk+3,-guic \
x11/qt5/qtwebkit \
- x11/qt5/qtquickcontrols \
- x11/qt5/qtscript
+ x11/qt5/qtquickcontrols
LIB_DEPENDS = x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qttools \
security/botan \
- devel/qbs
+ x11/qt5/qtscript \
+ devel/llvm
PORTHOME = ${WRKDIR}
@@ -81,7 +83,7 @@ NO_TEST = Yes
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
-CONFIGURE_ENV = QBS_INSTALL_DIR=${LOCALBASE}
+CONFIGURE_ENV = QBS_INSTALL_DIR=${LOCALBASE}
GDB_ADJ_FILES = \
src/plugins/debugger/debuggeritemmanager.cpp \
@@ -92,6 +94,8 @@ GDB_ADJ_FILES = \
pre-configure:
cd ${WRKSRC}; sed -i 's,"gdb","egdb",g' ${GDB_ADJ_FILES}
+ # use system qbs (qtcreator.pro)
+ rm -rf ${WRKSRC}/src/shared/qbs
post-install:
.for _l _v in ${SHARED_LIBS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qt-creator/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 15 Mar 2018 20:04:34 -0000 1.11
+++ distinfo 31 Mar 2018 12:47:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.5.2.tar.gz) = bafSaaQU78JQZiAxCKspb8qgGcw4Ba/Ux+lz85FBId0=
-SIZE (qt-creator-opensource-src-4.5.2.tar.gz) = 28604085
+SHA256 (qt-creator-opensource-src-4.6.0.tar.gz) = L3IF6T66Owhod8HfE33SUxT1kqn5UvlldA2XklMGuWw=
+SIZE (qt-creator-opensource-src-4.6.0.tar.gz) = 30855534
Index: patches/patch-src_libs_utils_buildablehelperlibrary_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_libs_utils_buildablehelperlibrary_cpp
--- patches/patch-src_libs_utils_buildablehelperlibrary_cpp 28 Apr 2017 16:00:10 -0000 1.2
+++ patches/patch-src_libs_utils_buildablehelperlibrary_cpp 31 Mar 2018 12:47:18 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-src_libs_utils_buildable
Prefer qmake-qt5 to qmake4 by removing the QDir::Reversed flag.
---- src/libs/utils/buildablehelperlibrary.cpp.orig Wed Mar 22 09:25:13 2017
-+++ src/libs/utils/buildablehelperlibrary.cpp Mon Apr 24 18:05:10 2017
-@@ -86,8 +86,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En
+Index: src/libs/utils/buildablehelperlibrary.cpp
+--- src/libs/utils/buildablehelperlibrary.cpp.orig
++++ src/libs/utils/buildablehelperlibrary.cpp
+@@ -87,8 +87,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En
return FileName::fromString(qmakePath);
}
Index: patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_plugins_projectexplorer_gcctoolchain_cpp
--- patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 14 Jan 2018 10:07:48 -0000 1.5
+++ patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 31 Mar 2018 12:47:18 -0000
@@ -5,7 +5,7 @@ Append eg++ before g++ so eg++ is used b
Index: src/plugins/projectexplorer/gcctoolchain.cpp
--- src/plugins/projectexplorer/gcctoolchain.cpp.orig
+++ src/plugins/projectexplorer/gcctoolchain.cpp
-@@ -707,7 +707,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
+@@ -726,7 +726,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
QString GccToolChain::makeCommand(const Environment &environment) const
{
Index: patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
--- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 14 Jan 2018 10:07:48 -0000 1.4
+++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 31 Mar 2018 12:47:18 -0000
@@ -7,11 +7,11 @@ compile C++11 code.
Index: src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
--- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig
+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
-@@ -679,6 +679,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
- buildSteps->insertStep(0, qmakeStep);
+@@ -126,6 +126,7 @@ void QmakeBuildConfiguration::initialize(const BuildIn
- MakeStep *makeStep = new MakeStep(buildSteps);
-+ makeStep->setUserArguments(QLatin1String("CXX=eg++ LINK=eg++"));
- buildSteps->insertStep(1, makeStep);
+ BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+ auto qmakeStep = new QMakeStep(buildSteps);
++ qmakeStep->setUserArguments(QLatin1String("CXX=eg++ LINK=eg++"));
+ buildSteps->appendStep(qmakeStep);
+ buildSteps->appendStep(new MakeStep(buildSteps));
- MakeStep *cleanStep = new MakeStep(cleanSteps);
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
diff -N patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 14 Jun 2017 17:11:20 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v 1.3 2017/06/14 17:11:20 rsadowski Exp $
-Index: src/shared/qbs/src/lib/corelib/tools/processutils.cpp
---- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig
-+++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp
-@@ -49,6 +49,11 @@
- # include "fileinfo.h"
- # include <unistd.h>
- # include <cstdio>
-+#elif defined(Q_OS_OPENBSD)
-+# include <sys/param.h>
-+# include <sys/sysctl.h>
-+# include <fcntl.h>
-+# include <kvm.h>
- #elif defined(Q_OS_BSD4)
- # include <QtCore/qfile.h>
- # include <sys/cdefs.h>
-@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
- sprintf(exePath, "/proc/%lld/exe", pid);
- readlink(exePath, buf, sizeof(buf));
- return FileInfo::fileName(QString::fromUtf8(buf));
-+#elif defined(Q_OS_OPENBSD)
-+ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+ if (!kd)
-+ return QString();
-+ int cnt;
-+ struct kinfo_proc *kp = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(*kp), &cnt);
-+ if (!kp || cnt < 1) {
-+ kvm_close(kd);
-+ return QString();
-+ }
-+ QString name = QString::fromUtf8(kp->p_comm);
-+ kvm_close(kd);
-+ return name;
- #elif defined(Q_OS_BSD4)
- # if defined(Q_OS_NETBSD)
- struct kinfo_proc2 kp;
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
===================================================================
RCS file: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
diff -N patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 14 Jan 2018 10:07:48 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v 1.5 2018/01/14 10:07:48 rsadowski Exp $
-Index: src/shared/qbs/src/lib/corelib/tools/tools.pri
---- src/shared/qbs/src/lib/corelib/tools/tools.pri.orig
-+++ src/shared/qbs/src/lib/corelib/tools/tools.pri
-@@ -106,6 +106,10 @@ osx {
- LIBS += -framework Security
- }
-
-+openbsd {
-+ LIBS += -lkvm
-+}
-+
- !qbs_no_dev_install {
- tools_headers.files = \
- $$PWD/architectures.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 14 Jan 2018 10:07:48 -0000 1.7
+++ pkg/PLIST 31 Mar 2018 12:47:18 -0000
@@ -43,6 +43,9 @@ lib/qtcreator/plugins/libBinEditor.so
lib/qtcreator/plugins/libBookmarks.so
lib/qtcreator/plugins/libCMakeProjectManager.so
lib/qtcreator/plugins/libCVS.so
+lib/qtcreator/plugins/libClangCodeModel.so
+lib/qtcreator/plugins/libClangPchManager.so
+lib/qtcreator/plugins/libClangRefactoring.so
lib/qtcreator/plugins/libClangStaticAnalyzer.so
lib/qtcreator/plugins/libClassView.so
lib/qtcreator/plugins/libClearCase.so
@@ -97,6 +100,9 @@ lib/qtcreator/plugins/qmldesigner/libcom
lib/qtcreator/plugins/qmldesigner/libqtquickplugin.so
libexec/qtcreator/
@bin libexec/qtcreator/buildoutputparser
+@bin libexec/qtcreator/clangbackend
+@bin libexec/qtcreator/clangpchmanagerbackend
+@bin libexec/qtcreator/clangrefactoringbackend
@bin libexec/qtcreator/cpaster
@bin libexec/qtcreator/qml2puppet
@bin libexec/qtcreator/qtcreator_process_stub
@@ -172,6 +178,7 @@ share/qtcreator/modeleditor/standard.def
share/qtcreator/qml/
share/qtcreator/qml-type-descriptions/
share/qtcreator/qml-type-descriptions/builtins.qmltypes
+share/qtcreator/qml-type-descriptions/qbs-base.qmltypes
share/qtcreator/qml-type-descriptions/qbs-bundle.json
share/qtcreator/qml-type-descriptions/qbs.qmltypes
share/qtcreator/qml-type-descriptions/qmlproject-bundle.json
@@ -181,8 +188,6 @@ share/qtcreator/qml-type-descriptions/qm
share/qtcreator/qml-type-descriptions/qt-labs-folderlistmodel.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-gestures.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-particles.qmltypes
-share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json
-share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json
share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes
share/qtcreator/qml-type-descriptions/qtmobility-contacts.qmltypes
@@ -591,6 +596,7 @@ share/qtcreator/templates/wizards/autote
share/qtcreator/templates/wizards/autotest/files/tst.qbs
share/qtcreator/templates/wizards/autotest/files/tst.txt
share/qtcreator/templates/wizards/autotest/files/tst_main.cpp
+share/qtcreator/templates/wizards/autotest/files/tst_qml.tmpl
share/qtcreator/templates/wizards/autotest/files/tst_src.cpp
share/qtcreator/templates/wizards/autotest/files/tst_src.h
share/qtcreator/templates/wizards/autotest/wizard.json
@@ -650,8 +656,12 @@ share/qtcreator/templates/wizards/files/
share/qtcreator/templates/wizards/files/js/file.js
share/qtcreator/templates/wizards/files/js/wizard.json
share/qtcreator/templates/wizards/files/modeling/
-share/qtcreator/templates/wizards/files/modeling/file.qmodel
-share/qtcreator/templates/wizards/files/modeling/wizard.json
+share/qtcreator/templates/wizards/files/modeling/model/
+share/qtcreator/templates/wizards/files/modeling/model/file.qmodel
+share/qtcreator/templates/wizards/files/modeling/model/wizard.json
+share/qtcreator/templates/wizards/files/modeling/scratch/
+share/qtcreator/templates/wizards/files/modeling/scratch/file.qmodel
+share/qtcreator/templates/wizards/files/modeling/scratch/wizard.json
share/qtcreator/templates/wizards/files/nim/
share/qtcreator/templates/wizards/files/nim/file.nim
share/qtcreator/templates/wizards/files/nim/wizard.json
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qbs/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 14 Feb 2018 06:59:09 -0000 1.5
+++ Makefile 31 Mar 2018 12:47:25 -0000
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2018/02/14 06:59:09 rsadowski Exp $
COMMENT = declarative cross-platform build tool
-V = 1.10.1
+V = 1.11.0
DISTNAME = qbs-src-${V}
PKGNAME = qbs-${V}
-SHARED_LIBS = qbscore 3.0
-SHARED_LIBS += qbsqtprofilesetup 1.4
+SHARED_LIBS = qbscore 4.0
+SHARED_LIBS += qbsqtprofilesetup 2.0
CATEGORIES = devel
HOMEPAGE = https://doc.qt.io/qbs/
@@ -16,14 +16,15 @@ MAINTAINER = KDE porting team <openbsd-k
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Script
-WANTLIB += Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5Widgets Qt5Xml c kvm m
MASTER_SITES = https://download.qt.io/official_releases/qbs/${V}/
MODULES = devel/qmake x11/qt5
MODQMAKE_PROJECTS = qbs.pro
-MODQMAKE_ARGS = CONFIG+=qbs_enable_unit_tests=1
+MODQMAKE_ARGS = CONFIG+=qbs_enable_unit_tests=1 \
+ CONFIG+=qbs_enable_project_file_updates
BUILD_DEPENDS = x11/qt5/qtdeclarative
RUN_DEPENDS = x11/qt5/qtdeclarative
@@ -32,6 +33,7 @@ LIB_DEPENDS = x11/qt5/qtbase \
TEST_DEPENDS = ${BUILD_PKGPATH}
+MAKE_ENV = LD_LIBRARY_PATH=${WRKBUILD}/lib
TEST_ENV = LD_LIBRARY_PATH=${WRKBUILD}/lib
do-test:
@@ -39,5 +41,10 @@ do-test:
for t in tst_*; do \
${SETENV} ${ALL_TEST_ENV} ./$$t; \
done
+
+pre-fake:
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/qbs/tools
+ ${INSTALL_DATA} ${WRKSRC}/src/lib/corelib/tools/*.h \
+ ${PREFIX}/include/qbs/tools/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qbs/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 14 Feb 2018 06:59:09 -0000 1.4
+++ distinfo 31 Mar 2018 12:47:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qbs-src-1.10.1.tar.gz) = 9sECq/yZ9tbBGidU6StlPV9XMoWNeCwKFd74pIGB7+4=
-SIZE (qbs-src-1.10.1.tar.gz) = 4140847
+SHA256 (qbs-src-1.11.0.tar.gz) = bOMMRo5oj2hDRoMko0pxkUCbRxw/9vPoNO+L+ns0Z80=
+SIZE (qbs-src-1.11.0.tar.gz) = 4299668
Index: patches/patch-doc_man_man_qbs
===================================================================
RCS file: /cvs/ports/devel/qbs/patches/patch-doc_man_man_qbs,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_man_man_qbs
--- patches/patch-doc_man_man_qbs 28 Dec 2017 07:12:21 -0000 1.1
+++ patches/patch-doc_man_man_qbs 31 Mar 2018 12:47:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_man_man_qbs,v 1.1 20
Index: doc/man/man.qbs
--- doc/man/man.qbs.orig
+++ doc/man/man.qbs
-@@ -18,7 +18,7 @@ Product {
+@@ -19,7 +19,7 @@ Product {
name: "man page"
files: ["qbs.1"]
qbs.install: qbsbuildconfig.installManPage
Index: patches/patch-src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file: patches/patch-src_lib_corelib_tools_processutils_cpp
diff -N patches/patch-src_lib_corelib_tools_processutils_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_corelib_tools_processutils_cpp 31 Mar 2018 12:47:25 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+Index: src/lib/corelib/tools/processutils.cpp
+--- src/lib/corelib/tools/processutils.cpp.orig
++++ src/lib/corelib/tools/processutils.cpp
+@@ -49,6 +49,11 @@
+ # include "fileinfo.h"
+ # include <unistd.h>
+ # include <cstdio>
++#elif defined(Q_OS_OPENBSD)
++# include <sys/param.h>
++# include <sys/sysctl.h>
++# include <fcntl.h>
++# include <kvm.h>
+ #elif defined(Q_OS_BSD4)
+ # include <QtCore/qfile.h>
+ # include <sys/cdefs.h>
+@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
+ sprintf(exePath, "/proc/%lld/exe", pid);
+ readlink(exePath, buf, sizeof(buf));
+ return FileInfo::fileName(QString::fromUtf8(buf));
++#elif defined(Q_OS_OPENBSD)
++ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
++ if (!kd)
++ return QString();
++ int cnt;
++ struct kinfo_proc *kp = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(*kp), &cnt);
++ if (!kp || cnt < 1) {
++ kvm_close(kd);
++ return QString();
++ }
++ QString name = QString::fromUtf8(kp->p_comm);
++ kvm_close(kd);
++ return name;
+ #elif defined(Q_OS_BSD4)
+ # if defined(Q_OS_NETBSD)
+ struct kinfo_proc2 kp;
Index: patches/patch-src_lib_corelib_tools_tools_pri
===================================================================
RCS file: patches/patch-src_lib_corelib_tools_tools_pri
diff -N patches/patch-src_lib_corelib_tools_tools_pri
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_corelib_tools_tools_pri 31 Mar 2018 12:47:25 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/lib/corelib/tools/tools.pri
+--- src/lib/corelib/tools/tools.pri.orig
++++ src/lib/corelib/tools/tools.pri
+@@ -107,6 +107,10 @@ osx {
+ LIBS += -framework Security
+ }
+
++openbsd {
++ LIBS += -lkvm
++}
++
+ !qbs_no_dev_install {
+ tools_headers.files = \
+ $$PWD/architectures.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qbs/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 14 Feb 2018 06:59:09 -0000 1.4
+++ pkg/PLIST 31 Mar 2018 12:47:25 -0000
@@ -4,7 +4,6 @@
@bin bin/qbs-config
@bin bin/qbs-config-ui
@bin bin/qbs-create-project
-@bin bin/qbs-qmltypes
@bin bin/qbs-setup-android
@bin bin/qbs-setup-qt
@bin bin/qbs-setup-toolchains
@@ -18,6 +17,9 @@ include/qbs/api/rulecommand.h
include/qbs/api/runenvironment.h
include/qbs/buildgraph/
include/qbs/buildgraph/forward_decls.h
+include/qbs/generators/
+include/qbs/generators/generator.h
+include/qbs/generators/generatordata.h
include/qbs/language/
include/qbs/language/forward_decls.h
include/qbs/logging/
@@ -27,24 +29,60 @@ include/qbs/qbs_version.pri
include/qbs/qtenvironment.h
include/qbs/qtprofilesetup.h
include/qbs/tools/
+include/qbs/tools/applecodesignutils.h
include/qbs/tools/architectures.h
+include/qbs/tools/buildgraphlocker.h
include/qbs/tools/buildoptions.h
include/qbs/tools/cleanoptions.h
include/qbs/tools/codelocation.h
include/qbs/tools/commandechomode.h
+include/qbs/tools/dynamictypecheck.h
include/qbs/tools/error.h
+include/qbs/tools/executablefinder.h
+include/qbs/tools/fileinfo.h
+include/qbs/tools/filesaver.h
+include/qbs/tools/filetime.h
include/qbs/tools/generateoptions.h
+include/qbs/tools/hostosinfo.h
+include/qbs/tools/id.h
include/qbs/tools/installoptions.h
+include/qbs/tools/iosutils.h
+include/qbs/tools/jsliterals.h
+include/qbs/tools/launcherinterface.h
+include/qbs/tools/launcherpackets.h
+include/qbs/tools/launchersocket.h
+include/qbs/tools/msvcinfo.h
+include/qbs/tools/pathutils.h
+include/qbs/tools/persistence.h
include/qbs/tools/preferences.h
include/qbs/tools/processresult.h
+include/qbs/tools/processresult_p.h
+include/qbs/tools/processutils.h
include/qbs/tools/profile.h
+include/qbs/tools/profiling.h
+include/qbs/tools/progressobserver.h
+include/qbs/tools/projectgeneratormanager.h
include/qbs/tools/qbs_export.h
+include/qbs/tools/qbsassert.h
include/qbs/tools/qbspluginmanager.h
+include/qbs/tools/qbsprocess.h
+include/qbs/tools/qttools.h
+include/qbs/tools/scannerpluginmanager.h
+include/qbs/tools/scripttools.h
+include/qbs/tools/set.h
include/qbs/tools/settings.h
+include/qbs/tools/settingscreator.h
include/qbs/tools/settingsmodel.h
include/qbs/tools/setupprojectparameters.h
+include/qbs/tools/shellutils.h
+include/qbs/tools/stlutils.h
+include/qbs/tools/stringconstants.h
+include/qbs/tools/stringutils.h
include/qbs/tools/toolchains.h
include/qbs/tools/version.h
+include/qbs/tools/visualstudioversioninfo.h
+include/qbs/tools/vsenvironmentdetector.h
+include/qbs/tools/weakpointer.h
include/qbs/use_installed_corelib.pri
include/qbs/use_installed_qtprofilesetup.pri
lib/libqbscore.prl
@@ -207,8 +245,10 @@ share/qbs/imports/qbs/Probes/AndroidNdkP
share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
share/qbs/imports/qbs/Probes/BinaryProbe.qbs
share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
+share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs
share/qbs/imports/qbs/Probes/GccProbe.qbs
share/qbs/imports/qbs/Probes/GccVersionProbe.qbs
+share/qbs/imports/qbs/Probes/IcoUtilsVersionProbe.qbs
share/qbs/imports/qbs/Probes/IncludeProbe.qbs
share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs
share/qbs/imports/qbs/Probes/JdkProbe.qbs
@@ -237,7 +277,6 @@ share/qbs/imports/qbs/base/CppApplicatio
share/qbs/imports/qbs/base/DynamicLibrary.qbs
share/qbs/imports/qbs/base/InnoSetup.qbs
share/qbs/imports/qbs/base/InstallPackage.qbs
-share/qbs/imports/qbs/base/Installer.qbs
share/qbs/imports/qbs/base/JavaClassCollection.qbs
share/qbs/imports/qbs/base/JavaJarFile.qbs
share/qbs/imports/qbs/base/Library.qbs
@@ -287,6 +326,7 @@ share/qbs/modules/cpp/ios-gcc.qbs
share/qbs/modules/cpp/macos-gcc.qbs
share/qbs/modules/cpp/msvc.js
share/qbs/modules/cpp/qnx-qcc.qbs
+share/qbs/modules/cpp/setuprunenv.js
share/qbs/modules/cpp/tvos-gcc.qbs
share/qbs/modules/cpp/watchos-gcc.qbs
share/qbs/modules/cpp/windows-mingw.qbs
@@ -299,6 +339,9 @@ share/qbs/modules/dmg/dmg.js
share/qbs/modules/ib/
share/qbs/modules/ib/IBModule.qbs
share/qbs/modules/ib/ib.js
+share/qbs/modules/ico/
+share/qbs/modules/ico/IcoModule.qbs
+share/qbs/modules/ico/ico.js
share/qbs/modules/innosetup/
share/qbs/modules/innosetup/InnoSetupModule.qbs
share/qbs/modules/java/
Hi All,
please find attached diffs to update qbs to 1.11.0 and qt-creator
to 4.6.0.
Disable the whole qbs build set by removing qbs directory in qt-creator
and merge useful patches from qt-creator to qbs.
Tested on amd64.
Ok? Comments?
Best regards,
Rafael Sadowski
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile 15 Mar 2018 20:04:34 -0000 1.35
+++ Makefile 31 Mar 2018 12:47:18 -0000
@@ -4,7 +4,7 @@
USE_WXNEEDED = Yes
COMMENT = cross-platform IDE for use with Qt
-V = 4.5.2
+V = 4.6.0
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
@@ -40,8 +40,8 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Designer
WANTLIB += Qt5DesignerComponents Qt5Gui Qt5Help Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Sql Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml botan-1.10 c m qbscore qbsqtprofilesetup
+WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg
+WANTLIB += Qt5Widgets Qt5Xml botan-1.10 c clang m
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
@@ -50,28 +50,30 @@ MODULES = x11/qt5 \
MODQMAKE_INSTALL_ROOT = ${PREFIX}
-MODQMAKE_ARGS = USE_SYSTEM_BOTAN=1
+MODQMAKE_ARGS = USE_SYSTEM_BOTAN=1 \
+ CONFIG+=qbs_enable_project_file_updates
# qtcreator.sh is created with custom LINK?= in Makefile
MODQT5_USE_CXX11 = No
COMPILER = base-clang ports-gcc
BUILD_DEPENDS = x11/qt5/qtquickcontrols \
- x11/qt5/qtscript
+ devel/qbs
RUN_DEPENDS = devel/gdb \
+ devel/qbs \
devel/gmake \
${MODGCC4_CPPDEP} \
x11/gtk+3,-guic \
x11/qt5/qtwebkit \
- x11/qt5/qtquickcontrols \
- x11/qt5/qtscript
+ x11/qt5/qtquickcontrols
LIB_DEPENDS = x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qttools \
security/botan \
- devel/qbs
+ x11/qt5/qtscript \
+ devel/llvm
PORTHOME = ${WRKDIR}
@@ -81,7 +83,7 @@ NO_TEST = Yes
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
-CONFIGURE_ENV = QBS_INSTALL_DIR=${LOCALBASE}
+CONFIGURE_ENV = QBS_INSTALL_DIR=${LOCALBASE}
GDB_ADJ_FILES = \
src/plugins/debugger/debuggeritemmanager.cpp \
@@ -92,6 +94,8 @@ GDB_ADJ_FILES = \
pre-configure:
cd ${WRKSRC}; sed -i 's,"gdb","egdb",g' ${GDB_ADJ_FILES}
+ # use system qbs (qtcreator.pro)
+ rm -rf ${WRKSRC}/src/shared/qbs
post-install:
.for _l _v in ${SHARED_LIBS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qt-creator/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 15 Mar 2018 20:04:34 -0000 1.11
+++ distinfo 31 Mar 2018 12:47:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.5.2.tar.gz) = bafSaaQU78JQZiAxCKspb8qgGcw4Ba/Ux+lz85FBId0=
-SIZE (qt-creator-opensource-src-4.5.2.tar.gz) = 28604085
+SHA256 (qt-creator-opensource-src-4.6.0.tar.gz) = L3IF6T66Owhod8HfE33SUxT1kqn5UvlldA2XklMGuWw=
+SIZE (qt-creator-opensource-src-4.6.0.tar.gz) = 30855534
Index: patches/patch-src_libs_utils_buildablehelperlibrary_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_libs_utils_buildablehelperlibrary_cpp
--- patches/patch-src_libs_utils_buildablehelperlibrary_cpp 28 Apr 2017 16:00:10 -0000 1.2
+++ patches/patch-src_libs_utils_buildablehelperlibrary_cpp 31 Mar 2018 12:47:18 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-src_libs_utils_buildable
Prefer qmake-qt5 to qmake4 by removing the QDir::Reversed flag.
---- src/libs/utils/buildablehelperlibrary.cpp.orig Wed Mar 22 09:25:13 2017
-+++ src/libs/utils/buildablehelperlibrary.cpp Mon Apr 24 18:05:10 2017
-@@ -86,8 +86,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En
+Index: src/libs/utils/buildablehelperlibrary.cpp
+--- src/libs/utils/buildablehelperlibrary.cpp.orig
++++ src/libs/utils/buildablehelperlibrary.cpp
+@@ -87,8 +87,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En
return FileName::fromString(qmakePath);
}
Index: patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_plugins_projectexplorer_gcctoolchain_cpp
--- patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 14 Jan 2018 10:07:48 -0000 1.5
+++ patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 31 Mar 2018 12:47:18 -0000
@@ -5,7 +5,7 @@ Append eg++ before g++ so eg++ is used b
Index: src/plugins/projectexplorer/gcctoolchain.cpp
--- src/plugins/projectexplorer/gcctoolchain.cpp.orig
+++ src/plugins/projectexplorer/gcctoolchain.cpp
-@@ -707,7 +707,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
+@@ -726,7 +726,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
QString GccToolChain::makeCommand(const Environment &environment) const
{
Index: patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
--- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 14 Jan 2018 10:07:48 -0000 1.4
+++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 31 Mar 2018 12:47:18 -0000
@@ -7,11 +7,11 @@ compile C++11 code.
Index: src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
--- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig
+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
-@@ -679,6 +679,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
- buildSteps->insertStep(0, qmakeStep);
+@@ -126,6 +126,7 @@ void QmakeBuildConfiguration::initialize(const BuildIn
- MakeStep *makeStep = new MakeStep(buildSteps);
-+ makeStep->setUserArguments(QLatin1String("CXX=eg++ LINK=eg++"));
- buildSteps->insertStep(1, makeStep);
+ BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+ auto qmakeStep = new QMakeStep(buildSteps);
++ qmakeStep->setUserArguments(QLatin1String("CXX=eg++ LINK=eg++"));
+ buildSteps->appendStep(qmakeStep);
+ buildSteps->appendStep(new MakeStep(buildSteps));
- MakeStep *cleanStep = new MakeStep(cleanSteps);
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
diff -N patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 14 Jun 2017 17:11:20 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v 1.3 2017/06/14 17:11:20 rsadowski Exp $
-Index: src/shared/qbs/src/lib/corelib/tools/processutils.cpp
---- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig
-+++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp
-@@ -49,6 +49,11 @@
- # include "fileinfo.h"
- # include <unistd.h>
- # include <cstdio>
-+#elif defined(Q_OS_OPENBSD)
-+# include <sys/param.h>
-+# include <sys/sysctl.h>
-+# include <fcntl.h>
-+# include <kvm.h>
- #elif defined(Q_OS_BSD4)
- # include <QtCore/qfile.h>
- # include <sys/cdefs.h>
-@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
- sprintf(exePath, "/proc/%lld/exe", pid);
- readlink(exePath, buf, sizeof(buf));
- return FileInfo::fileName(QString::fromUtf8(buf));
-+#elif defined(Q_OS_OPENBSD)
-+ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+ if (!kd)
-+ return QString();
-+ int cnt;
-+ struct kinfo_proc *kp = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(*kp), &cnt);
-+ if (!kp || cnt < 1) {
-+ kvm_close(kd);
-+ return QString();
-+ }
-+ QString name = QString::fromUtf8(kp->p_comm);
-+ kvm_close(kd);
-+ return name;
- #elif defined(Q_OS_BSD4)
- # if defined(Q_OS_NETBSD)
- struct kinfo_proc2 kp;
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
===================================================================
RCS file: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
diff -N patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 14 Jan 2018 10:07:48 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v 1.5 2018/01/14 10:07:48 rsadowski Exp $
-Index: src/shared/qbs/src/lib/corelib/tools/tools.pri
---- src/shared/qbs/src/lib/corelib/tools/tools.pri.orig
-+++ src/shared/qbs/src/lib/corelib/tools/tools.pri
-@@ -106,6 +106,10 @@ osx {
- LIBS += -framework Security
- }
-
-+openbsd {
-+ LIBS += -lkvm
-+}
-+
- !qbs_no_dev_install {
- tools_headers.files = \
- $$PWD/architectures.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 14 Jan 2018 10:07:48 -0000 1.7
+++ pkg/PLIST 31 Mar 2018 12:47:18 -0000
@@ -43,6 +43,9 @@ lib/qtcreator/plugins/libBinEditor.so
lib/qtcreator/plugins/libBookmarks.so
lib/qtcreator/plugins/libCMakeProjectManager.so
lib/qtcreator/plugins/libCVS.so
+lib/qtcreator/plugins/libClangCodeModel.so
+lib/qtcreator/plugins/libClangPchManager.so
+lib/qtcreator/plugins/libClangRefactoring.so
lib/qtcreator/plugins/libClangStaticAnalyzer.so
lib/qtcreator/plugins/libClassView.so
lib/qtcreator/plugins/libClearCase.so
@@ -97,6 +100,9 @@ lib/qtcreator/plugins/qmldesigner/libcom
lib/qtcreator/plugins/qmldesigner/libqtquickplugin.so
libexec/qtcreator/
@bin libexec/qtcreator/buildoutputparser
+@bin libexec/qtcreator/clangbackend
+@bin libexec/qtcreator/clangpchmanagerbackend
+@bin libexec/qtcreator/clangrefactoringbackend
@bin libexec/qtcreator/cpaster
@bin libexec/qtcreator/qml2puppet
@bin libexec/qtcreator/qtcreator_process_stub
@@ -172,6 +178,7 @@ share/qtcreator/modeleditor/standard.def
share/qtcreator/qml/
share/qtcreator/qml-type-descriptions/
share/qtcreator/qml-type-descriptions/builtins.qmltypes
+share/qtcreator/qml-type-descriptions/qbs-base.qmltypes
share/qtcreator/qml-type-descriptions/qbs-bundle.json
share/qtcreator/qml-type-descriptions/qbs.qmltypes
share/qtcreator/qml-type-descriptions/qmlproject-bundle.json
@@ -181,8 +188,6 @@ share/qtcreator/qml-type-descriptions/qm
share/qtcreator/qml-type-descriptions/qt-labs-folderlistmodel.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-gestures.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-particles.qmltypes
-share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json
-share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json
share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes
share/qtcreator/qml-type-descriptions/qtmobility-contacts.qmltypes
@@ -591,6 +596,7 @@ share/qtcreator/templates/wizards/autote
share/qtcreator/templates/wizards/autotest/files/tst.qbs
share/qtcreator/templates/wizards/autotest/files/tst.txt
share/qtcreator/templates/wizards/autotest/files/tst_main.cpp
+share/qtcreator/templates/wizards/autotest/files/tst_qml.tmpl
share/qtcreator/templates/wizards/autotest/files/tst_src.cpp
share/qtcreator/templates/wizards/autotest/files/tst_src.h
share/qtcreator/templates/wizards/autotest/wizard.json
@@ -650,8 +656,12 @@ share/qtcreator/templates/wizards/files/
share/qtcreator/templates/wizards/files/js/file.js
share/qtcreator/templates/wizards/files/js/wizard.json
share/qtcreator/templates/wizards/files/modeling/
-share/qtcreator/templates/wizards/files/modeling/file.qmodel
-share/qtcreator/templates/wizards/files/modeling/wizard.json
+share/qtcreator/templates/wizards/files/modeling/model/
+share/qtcreator/templates/wizards/files/modeling/model/file.qmodel
+share/qtcreator/templates/wizards/files/modeling/model/wizard.json
+share/qtcreator/templates/wizards/files/modeling/scratch/
+share/qtcreator/templates/wizards/files/modeling/scratch/file.qmodel
+share/qtcreator/templates/wizards/files/modeling/scratch/wizard.json
share/qtcreator/templates/wizards/files/nim/
share/qtcreator/templates/wizards/files/nim/file.nim
share/qtcreator/templates/wizards/files/nim/wizard.json
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qbs/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 14 Feb 2018 06:59:09 -0000 1.5
+++ Makefile 31 Mar 2018 12:47:25 -0000
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2018/02/14 06:59:09 rsadowski Exp $
COMMENT = declarative cross-platform build tool
-V = 1.10.1
+V = 1.11.0
DISTNAME = qbs-src-${V}
PKGNAME = qbs-${V}
-SHARED_LIBS = qbscore 3.0
-SHARED_LIBS += qbsqtprofilesetup 1.4
+SHARED_LIBS = qbscore 4.0
+SHARED_LIBS += qbsqtprofilesetup 2.0
CATEGORIES = devel
HOMEPAGE = https://doc.qt.io/qbs/
@@ -16,14 +16,15 @@ MAINTAINER = KDE porting team <openbsd-k
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Script
-WANTLIB += Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5Widgets Qt5Xml c kvm m
MASTER_SITES = https://download.qt.io/official_releases/qbs/${V}/
MODULES = devel/qmake x11/qt5
MODQMAKE_PROJECTS = qbs.pro
-MODQMAKE_ARGS = CONFIG+=qbs_enable_unit_tests=1
+MODQMAKE_ARGS = CONFIG+=qbs_enable_unit_tests=1 \
+ CONFIG+=qbs_enable_project_file_updates
BUILD_DEPENDS = x11/qt5/qtdeclarative
RUN_DEPENDS = x11/qt5/qtdeclarative
@@ -32,6 +33,7 @@ LIB_DEPENDS = x11/qt5/qtbase \
TEST_DEPENDS = ${BUILD_PKGPATH}
+MAKE_ENV = LD_LIBRARY_PATH=${WRKBUILD}/lib
TEST_ENV = LD_LIBRARY_PATH=${WRKBUILD}/lib
do-test:
@@ -39,5 +41,10 @@ do-test:
for t in tst_*; do \
${SETENV} ${ALL_TEST_ENV} ./$$t; \
done
+
+pre-fake:
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/qbs/tools
+ ${INSTALL_DATA} ${WRKSRC}/src/lib/corelib/tools/*.h \
+ ${PREFIX}/include/qbs/tools/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qbs/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 14 Feb 2018 06:59:09 -0000 1.4
+++ distinfo 31 Mar 2018 12:47:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qbs-src-1.10.1.tar.gz) = 9sECq/yZ9tbBGidU6StlPV9XMoWNeCwKFd74pIGB7+4=
-SIZE (qbs-src-1.10.1.tar.gz) = 4140847
+SHA256 (qbs-src-1.11.0.tar.gz) = bOMMRo5oj2hDRoMko0pxkUCbRxw/9vPoNO+L+ns0Z80=
+SIZE (qbs-src-1.11.0.tar.gz) = 4299668
Index: patches/patch-doc_man_man_qbs
===================================================================
RCS file: /cvs/ports/devel/qbs/patches/patch-doc_man_man_qbs,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_man_man_qbs
--- patches/patch-doc_man_man_qbs 28 Dec 2017 07:12:21 -0000 1.1
+++ patches/patch-doc_man_man_qbs 31 Mar 2018 12:47:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_man_man_qbs,v 1.1 20
Index: doc/man/man.qbs
--- doc/man/man.qbs.orig
+++ doc/man/man.qbs
-@@ -18,7 +18,7 @@ Product {
+@@ -19,7 +19,7 @@ Product {
name: "man page"
files: ["qbs.1"]
qbs.install: qbsbuildconfig.installManPage
Index: patches/patch-src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file: patches/patch-src_lib_corelib_tools_processutils_cpp
diff -N patches/patch-src_lib_corelib_tools_processutils_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_corelib_tools_processutils_cpp 31 Mar 2018 12:47:25 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+Index: src/lib/corelib/tools/processutils.cpp
+--- src/lib/corelib/tools/processutils.cpp.orig
++++ src/lib/corelib/tools/processutils.cpp
+@@ -49,6 +49,11 @@
+ # include "fileinfo.h"
+ # include <unistd.h>
+ # include <cstdio>
++#elif defined(Q_OS_OPENBSD)
++# include <sys/param.h>
++# include <sys/sysctl.h>
++# include <fcntl.h>
++# include <kvm.h>
+ #elif defined(Q_OS_BSD4)
+ # include <QtCore/qfile.h>
+ # include <sys/cdefs.h>
+@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
+ sprintf(exePath, "/proc/%lld/exe", pid);
+ readlink(exePath, buf, sizeof(buf));
+ return FileInfo::fileName(QString::fromUtf8(buf));
++#elif defined(Q_OS_OPENBSD)
++ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
++ if (!kd)
++ return QString();
++ int cnt;
++ struct kinfo_proc *kp = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(*kp), &cnt);
++ if (!kp || cnt < 1) {
++ kvm_close(kd);
++ return QString();
++ }
++ QString name = QString::fromUtf8(kp->p_comm);
++ kvm_close(kd);
++ return name;
+ #elif defined(Q_OS_BSD4)
+ # if defined(Q_OS_NETBSD)
+ struct kinfo_proc2 kp;
Index: patches/patch-src_lib_corelib_tools_tools_pri
===================================================================
RCS file: patches/patch-src_lib_corelib_tools_tools_pri
diff -N patches/patch-src_lib_corelib_tools_tools_pri
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_corelib_tools_tools_pri 31 Mar 2018 12:47:25 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/lib/corelib/tools/tools.pri
+--- src/lib/corelib/tools/tools.pri.orig
++++ src/lib/corelib/tools/tools.pri
+@@ -107,6 +107,10 @@ osx {
+ LIBS += -framework Security
+ }
+
++openbsd {
++ LIBS += -lkvm
++}
++
+ !qbs_no_dev_install {
+ tools_headers.files = \
+ $$PWD/architectures.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qbs/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 14 Feb 2018 06:59:09 -0000 1.4
+++ pkg/PLIST 31 Mar 2018 12:47:25 -0000
@@ -4,7 +4,6 @@
@bin bin/qbs-config
@bin bin/qbs-config-ui
@bin bin/qbs-create-project
-@bin bin/qbs-qmltypes
@bin bin/qbs-setup-android
@bin bin/qbs-setup-qt
@bin bin/qbs-setup-toolchains
@@ -18,6 +17,9 @@ include/qbs/api/rulecommand.h
include/qbs/api/runenvironment.h
include/qbs/buildgraph/
include/qbs/buildgraph/forward_decls.h
+include/qbs/generators/
+include/qbs/generators/generator.h
+include/qbs/generators/generatordata.h
include/qbs/language/
include/qbs/language/forward_decls.h
include/qbs/logging/
@@ -27,24 +29,60 @@ include/qbs/qbs_version.pri
include/qbs/qtenvironment.h
include/qbs/qtprofilesetup.h
include/qbs/tools/
+include/qbs/tools/applecodesignutils.h
include/qbs/tools/architectures.h
+include/qbs/tools/buildgraphlocker.h
include/qbs/tools/buildoptions.h
include/qbs/tools/cleanoptions.h
include/qbs/tools/codelocation.h
include/qbs/tools/commandechomode.h
+include/qbs/tools/dynamictypecheck.h
include/qbs/tools/error.h
+include/qbs/tools/executablefinder.h
+include/qbs/tools/fileinfo.h
+include/qbs/tools/filesaver.h
+include/qbs/tools/filetime.h
include/qbs/tools/generateoptions.h
+include/qbs/tools/hostosinfo.h
+include/qbs/tools/id.h
include/qbs/tools/installoptions.h
+include/qbs/tools/iosutils.h
+include/qbs/tools/jsliterals.h
+include/qbs/tools/launcherinterface.h
+include/qbs/tools/launcherpackets.h
+include/qbs/tools/launchersocket.h
+include/qbs/tools/msvcinfo.h
+include/qbs/tools/pathutils.h
+include/qbs/tools/persistence.h
include/qbs/tools/preferences.h
include/qbs/tools/processresult.h
+include/qbs/tools/processresult_p.h
+include/qbs/tools/processutils.h
include/qbs/tools/profile.h
+include/qbs/tools/profiling.h
+include/qbs/tools/progressobserver.h
+include/qbs/tools/projectgeneratormanager.h
include/qbs/tools/qbs_export.h
+include/qbs/tools/qbsassert.h
include/qbs/tools/qbspluginmanager.h
+include/qbs/tools/qbsprocess.h
+include/qbs/tools/qttools.h
+include/qbs/tools/scannerpluginmanager.h
+include/qbs/tools/scripttools.h
+include/qbs/tools/set.h
include/qbs/tools/settings.h
+include/qbs/tools/settingscreator.h
include/qbs/tools/settingsmodel.h
include/qbs/tools/setupprojectparameters.h
+include/qbs/tools/shellutils.h
+include/qbs/tools/stlutils.h
+include/qbs/tools/stringconstants.h
+include/qbs/tools/stringutils.h
include/qbs/tools/toolchains.h
include/qbs/tools/version.h
+include/qbs/tools/visualstudioversioninfo.h
+include/qbs/tools/vsenvironmentdetector.h
+include/qbs/tools/weakpointer.h
include/qbs/use_installed_corelib.pri
include/qbs/use_installed_qtprofilesetup.pri
lib/libqbscore.prl
@@ -207,8 +245,10 @@ share/qbs/imports/qbs/Probes/AndroidNdkP
share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
share/qbs/imports/qbs/Probes/BinaryProbe.qbs
share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
+share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs
share/qbs/imports/qbs/Probes/GccProbe.qbs
share/qbs/imports/qbs/Probes/GccVersionProbe.qbs
+share/qbs/imports/qbs/Probes/IcoUtilsVersionProbe.qbs
share/qbs/imports/qbs/Probes/IncludeProbe.qbs
share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs
share/qbs/imports/qbs/Probes/JdkProbe.qbs
@@ -237,7 +277,6 @@ share/qbs/imports/qbs/base/CppApplicatio
share/qbs/imports/qbs/base/DynamicLibrary.qbs
share/qbs/imports/qbs/base/InnoSetup.qbs
share/qbs/imports/qbs/base/InstallPackage.qbs
-share/qbs/imports/qbs/base/Installer.qbs
share/qbs/imports/qbs/base/JavaClassCollection.qbs
share/qbs/imports/qbs/base/JavaJarFile.qbs
share/qbs/imports/qbs/base/Library.qbs
@@ -287,6 +326,7 @@ share/qbs/modules/cpp/ios-gcc.qbs
share/qbs/modules/cpp/macos-gcc.qbs
share/qbs/modules/cpp/msvc.js
share/qbs/modules/cpp/qnx-qcc.qbs
+share/qbs/modules/cpp/setuprunenv.js
share/qbs/modules/cpp/tvos-gcc.qbs
share/qbs/modules/cpp/watchos-gcc.qbs
share/qbs/modules/cpp/windows-mingw.qbs
@@ -299,6 +339,9 @@ share/qbs/modules/dmg/dmg.js
share/qbs/modules/ib/
share/qbs/modules/ib/IBModule.qbs
share/qbs/modules/ib/ib.js
+share/qbs/modules/ico/
+share/qbs/modules/ico/IcoModule.qbs
+share/qbs/modules/ico/ico.js
share/qbs/modules/innosetup/
share/qbs/modules/innosetup/InnoSetupModule.qbs
share/qbs/modules/java/
Hi All,
please find attached diffs to update qbs to 1.11.0 and qt-creator
to 4.6.0.
Disable the whole qbs build set by removing qbs directory in qt-creator
and merge useful patches from qt-creator to qbs.
Tested on amd64.
Ok? Comments?
Best regards,
Rafael Sadowski
Re: aqbanking
Henning asked me to take a look at this update, I've fixed up a few
things but have no idea what to do with kmymoney which seems unhappy
(bunch of undefined gwenhywfar-related symbols at startup).
..snip..
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN6CppGui9checkCertEPK17GWEN_SSLCERTDESCRP11GWEN_SYNCIOj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN6CppGui7logHookEPKc17GWEN_LOGGER_LEVELS1_'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui10execDialogEP11GWEN_DIALOGj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui10openDialogEP11GWEN_DIALOGj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui11closeDialogEP11GWEN_DIALOG'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui9runDialogEP11GWEN_DIALOGi'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui11getFileNameEPKc22GWEN_GUI_FILENAME_TYPEjS1_P11GWEN_BUFFERj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZTI7QT4_Gui'
KMyMoneyPlugin::PluginLoader:: createInstanceFromService returned 0 for KBanking with error Cannot load library /usr/local/lib/kde4/kmm_kbanking.so: (Cannot load specified object)
KMyMoneyPlugin::PluginLoader:: createInstanceFromService returned 0 for SEPA orders with error Could not find plugin 'SEPA orders' for application 'kmymoney'
Index: devel/gwenhywfar/Makefile
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- devel/gwenhywfar/Makefile 21 Nov 2017 00:12:59 -0000 1.20
+++ devel/gwenhywfar/Makefile 31 Mar 2018 12:36:30 -0000
@@ -3,14 +3,13 @@
COMMENT= helper library for networking and security applications
# update the "release=XX" in DISTFILES, not just DISTNAME
-DISTNAME= gwenhywfar-4.13.1
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=01\&release=78\&file=01}
-REVISION= 8
-
-SHARED_LIBS += gwenhywfar 1.3 # 73.1
-SHARED_LIBS += gwengui-gtk2 0.0 # unknown
-SHARED_LIBS += gwengui-qt4 0.0 # unknown
-SHARED_LIBS += gwengui-cpp 0.0 # unknown
+DISTNAME= gwenhywfar-4.20.0
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=01\&release=208\&file=02}
+
+SHARED_LIBS += gwenhywfar 2.0 # 79.1
+SHARED_LIBS += gwengui-gtk2 1.0 # unknown
+SHARED_LIBS += gwengui-qt4 1.0 # unknown
+SHARED_LIBS += gwengui-cpp 1.0 # unknown
CATEGORIES= devel
@@ -48,6 +47,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/
pre-configure:
${SUBST_CMD} ${WRKSRC}/gwenhywfar-config.cmake.in \
+ ${WRKSRC}/gui/cpp/gwengui-cpp-config.cmake.in \
${WRKSRC}/gui/qt4/gwengui-qt4-config.cmake.in
.include <bsd.port.mk>
Index: devel/gwenhywfar/distinfo
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- devel/gwenhywfar/distinfo 30 Jan 2015 16:20:43 -0000 1.5
+++ devel/gwenhywfar/distinfo 31 Mar 2018 12:36:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (gwenhywfar-4.13.1.tar.gz) = S+yoksEjVUjqCuMBMqbS5XkRwiNAdGWFOVzLAdhOxys=
-SIZE (gwenhywfar-4.13.1.tar.gz) = 2518248
+SHA256 (gwenhywfar-4.20.0.tar.gz) = Wojaq7oTiPlShZCqtd5SehLdRKfaRXLOSEaaKZEbD7A=
+SIZE (gwenhywfar-4.20.0.tar.gz) = 2379537
Index: devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
===================================================================
RCS file: devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
diff -N devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: gui/cpp/gwengui-cpp-config.cmake.in
+--- gui/cpp/gwengui-cpp-config.cmake.in.orig
++++ gui/cpp/gwengui-cpp-config.cmake.in
+@@ -25,7 +25,7 @@ set_and_check(prefix "@prefix@")
+ set_and_check(exec_prefix "@exec_prefix@")
+ set_and_check(includedir "@includedir@")
+ set_and_check(GWENGUI_CPP_INCLUDE_DIRS "@gwenhywfar_headerdir@")
+-set_and_check(GWENGUI_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
++set_and_check(GWENGUI_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so.${LIBgwengui-cpp_VERSION}")
+ set(GWENGUI_CPP_FOUND true)
+
+ if(GWENGUI_CPP_FOUND AND NOT TARGET gwenhywfar::gui-cpp)
Index: devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gui_qt4_gwengui-qt4-config_cmake_in
--- devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in 12 Jan 2017 16:36:12 -0000 1.1
+++ devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -1,15 +1,14 @@
$OpenBSD: patch-gui_qt4_gwengui-qt4-config_cmake_in,v 1.1 2017/01/12 16:36:12 zhuk Exp $
Unbreak CMake config file.
---- gui/qt4/gwengui-qt4-config.cmake.in.orig Wed Jan 11 00:46:50 2017
-+++ gui/qt4/gwengui-qt4-config.cmake.in Wed Jan 11 00:47:51 2017
-@@ -22,8 +22,8 @@ if(NOT EXISTS "${_file}")
- set_and_check(exec_prefix "@exec_prefix@")
- set_and_check(includedir "@includedir@")
- set_and_check(GWENGUI_QT4_INCLUDE_DIRS "@gwenhywfar_headerdir@")
-- set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so")
-- set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
-+ set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so.${LIBgwengui-qt4_VERSION}")
-+ set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so.${LIBgwengui-cpp_VERSION}")
-
- set(GWENGUI_QT4_LIBRARIES ${GWENGUI_QT4_LIBRARIES} ${GWENHYWFAR_CPP_LIBRARIES})
+Index: gui/qt4/gwengui-qt4-config.cmake.in
+--- gui/qt4/gwengui-qt4-config.cmake.in.orig
++++ gui/qt4/gwengui-qt4-config.cmake.in
+@@ -44,7 +44,7 @@ set_and_check(prefix "@prefix@")
+ set_and_check(exec_prefix "@exec_prefix@")
+ set_and_check(includedir "@includedir@")
+ set_and_check(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS "@gwenhywfar_headerdir@")
+-set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so")
++set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so.${LIBgwengui-qt4_VERSION}")
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND true)
+ if(${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT TARGET gwenhywfar::gui-qt4)
Index: devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gwenhywfar-config_cmake_in
--- devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in 12 Jan 2017 16:36:12 -0000 1.1
+++ devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-gwenhywfar-config_cmake_in,v 1.1 2017/01/12 16:36:12 zhuk Exp $
Unbreak CMake config file.
---- gwenhywfar-config.cmake.in.orig Wed Jan 11 00:39:48 2017
-+++ gwenhywfar-config.cmake.in Wed Jan 11 00:40:29 2017
+Index: gwenhywfar-config.cmake.in
+--- gwenhywfar-config.cmake.in.orig
++++ gwenhywfar-config.cmake.in
@@ -23,7 +23,7 @@ set_and_check(prefix "@prefix@")
set_and_check(exec_prefix "@exec_prefix@")
set_and_check(includedir "@includedir@")
set_and_check(GWENHYWFAR_INCLUDE_DIRS "@gwenhywfar_headerdir@")
-set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@")
+set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so.${LIBgwenhywfar_VERSION}")
+ set(GWENHYWFAR_FOUND TRUE)
# find components
-
Index: devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-plugins_dbio_csv_Makefile_in
--- devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in 30 Jan 2015 16:20:43 -0000 1.3
+++ devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in 31 Mar 2018 12:36:30 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-plugins_dbio_csv_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen Exp $
---- plugins/dbio/csv/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/csv/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = csv.xml
+Index: plugins/dbio/csv/Makefile.in
+--- plugins/dbio/csv/Makefile.in.orig
++++ plugins/dbio/csv/Makefile.in
+@@ -480,7 +480,7 @@ dbioplugin_DATA = csv.xml
csv_la_SOURCES = csv.c
csv_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
csv_la_LDFLAGS = -no-undefined $(STRIPALL) \
Index: devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-plugins_dbio_olddb_Makefile_in
--- devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in 30 Jan 2015 16:20:43 -0000 1.3
+++ devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in 31 Mar 2018 12:36:30 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-plugins_dbio_olddb_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen Exp $
---- plugins/dbio/olddb/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/olddb/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = olddb.xml
+Index: plugins/dbio/olddb/Makefile.in
+--- plugins/dbio/olddb/Makefile.in.orig
++++ plugins/dbio/olddb/Makefile.in
+@@ -480,7 +480,7 @@ dbioplugin_DATA = olddb.xml
olddb_la_SOURCES = olddb.c
olddb_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
olddb_la_LDFLAGS = -no-undefined $(STRIPALL) \
Index: devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-plugins_dbio_xmldb_Makefile_in
--- devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in 30 Jan 2015 16:20:43 -0000 1.3
+++ devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in 31 Mar 2018 12:36:30 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-plugins_dbio_xmldb_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen Exp $
---- plugins/dbio/xmldb/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/xmldb/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = xmldb.xml
+Index: plugins/dbio/xmldb/Makefile.in
+--- plugins/dbio/xmldb/Makefile.in.orig
++++ plugins/dbio/xmldb/Makefile.in
+@@ -480,7 +480,7 @@ dbioplugin_DATA = xmldb.xml
xmldb_la_SOURCES = xmldb.c
xmldb_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
xmldb_la_LDFLAGS = -no-undefined $(STRIPALL) \
Index: devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c
===================================================================
RCS file: devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c
diff -N devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c
--- devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c 6 Mar 2016 12:17:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_sio_syncio_tls_c,v 1.1 2016/03/06 12:17:17 ajacoutot Exp $
-
-Fix build with GnutTLS 3.4.
-(from upstream's 4.15.2beta release)
-
---- src/sio/syncio_tls.c.orig Sun Mar 6 10:04:31 2016
-+++ src/sio/syncio_tls.c Sun Mar 6 10:04:52 2016
-@@ -364,7 +364,7 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO *sio) {
- const int proto_prio[2] = { GNUTLS_SSL3, 0 };
-
- DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
-- rv=gnutls_protocol_set_priority(xio->session, proto_prio);
-+ rv=gnutls_priority_set(xio->session, proto_prio);
- if (rv) {
- DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
- gnutls_deinit(xio->session);
Index: devel/gwenhywfar/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- devel/gwenhywfar/pkg/PLIST 30 Jan 2015 16:20:43 -0000 1.4
+++ devel/gwenhywfar/pkg/PLIST 31 Mar 2018 12:36:30 -0000
@@ -49,6 +49,7 @@ include/gwenhywfar4/gwenhywfar/debug.h
include/gwenhywfar4/gwenhywfar/dialog.h
include/gwenhywfar4/gwenhywfar/dialog_be.h
include/gwenhywfar4/gwenhywfar/directory.h
+include/gwenhywfar4/gwenhywfar/endianfns.h
include/gwenhywfar4/gwenhywfar/error.h
include/gwenhywfar4/gwenhywfar/fastbuffer.h
include/gwenhywfar4/gwenhywfar/fslock.h
@@ -133,12 +134,15 @@ include/gwenhywfar4/gwenhywfar/widget_be
include/gwenhywfar4/gwenhywfar/xml.h
include/gwenhywfar4/gwenhywfar/xmlctx.h
include/gwenhywfar4/gwenhywfar/xsdnode.h
-lib/cmake/gwengui-qt4-4.13/
-lib/cmake/gwengui-qt4-4.13/gwengui-qt4-config-version.cmake
-lib/cmake/gwengui-qt4-4.13/gwengui-qt4-config.cmake
-lib/cmake/gwenhywfar-4.13/
-lib/cmake/gwenhywfar-4.13/gwenhywfar-config-version.cmake
-lib/cmake/gwenhywfar-4.13/gwenhywfar-config.cmake
+lib/cmake/gwengui-cpp-4.20/
+lib/cmake/gwengui-cpp-4.20/gwengui-cpp-config-version.cmake
+lib/cmake/gwengui-cpp-4.20/gwengui-cpp-config.cmake
+lib/cmake/gwengui-qt4-4.20/
+lib/cmake/gwengui-qt4-4.20/gwengui-qt4-config-version.cmake
+lib/cmake/gwengui-qt4-4.20/gwengui-qt4-config.cmake
+lib/cmake/gwenhywfar-4.20/
+lib/cmake/gwenhywfar-4.20/gwenhywfar-config-version.cmake
+lib/cmake/gwenhywfar-4.20/gwenhywfar-config.cmake
lib/gwenhywfar/
lib/gwenhywfar/plugins/
lib/gwenhywfar/plugins/60/
Index: productivity/aqbanking/Makefile
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- productivity/aqbanking/Makefile 21 Nov 2017 00:13:03 -0000 1.17
+++ productivity/aqbanking/Makefile 31 Mar 2018 12:36:30 -0000
@@ -3,17 +3,16 @@
COMMENT= online banking interface and financial data framework
# update the "release=XX" in DISTFILES, not just DISTNAME
-DISTNAME= aqbanking-5.5.1
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=03\&release=118\&file=01}
-WRKDIST= ${WRKDIR}/aqbanking-5.5.1
-REVISION= 5
+DISTNAME= aqbanking-5.7.8
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=03\&release=217\&file=02}
-SHARED_LIBS += aqbanking 2.0 # 39.2
-SHARED_LIBS += aqbankingpp 0.0 # unknown
-SHARED_LIBS += aqhbci 1.0 # 22.0
-SHARED_LIBS += aqnone 0.0 # 39.2
-SHARED_LIBS += aqofxconnect 0.2 # 7.2
-SHARED_LIBS += aqebics 0.0 # unknown
+SHARED_LIBS += aqbanking 3.0 # 41.8
+SHARED_LIBS += aqbankingpp 1.0 # unknown
+SHARED_LIBS += aqhbci 2.0 # 24.1
+SHARED_LIBS += aqnone 1.0 # 41.8
+SHARED_LIBS += aqofxconnect 1.0 # 7.2
+SHARED_LIBS += aqebics 1.0 # unknown
+SHARED_LIBS += aqpaypal 0.0 # unknown
CATEGORIES= productivity
Index: productivity/aqbanking/distinfo
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- productivity/aqbanking/distinfo 30 Jan 2015 16:21:03 -0000 1.5
+++ productivity/aqbanking/distinfo 31 Mar 2018 12:36:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (aqbanking-5.5.1.tar.gz) = I48X0n2G4M7yOUecS+FSy5j1vp1rh/yjh0HTLnYvrd8=
-SIZE (aqbanking-5.5.1.tar.gz) = 3818696
+SHA256 (aqbanking-5.7.8.tar.gz) = FvhuTMSanqqo3+MgZgfmJ4cyCLzkWnADDDyuqbWvx2g=
+SIZE (aqbanking-5.7.8.tar.gz) = 3818825
Index: productivity/aqbanking/patches/patch-aqbanking-config_cmake_in
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/patches/patch-aqbanking-config_cmake_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-aqbanking-config_cmake_in
--- productivity/aqbanking/patches/patch-aqbanking-config_cmake_in 12 Jan 2017 16:36:12 -0000 1.1
+++ productivity/aqbanking/patches/patch-aqbanking-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-aqbanking-config_cmake_in,v 1.1 2017/01/12 16:36:12 zhuk Exp $
Unbreak CMake config.
---- aqbanking-config.cmake.in.orig Wed Jan 11 09:51:02 2017
-+++ aqbanking-config.cmake.in Wed Jan 11 09:51:54 2017
-@@ -21,7 +21,7 @@ find_package(Gwenhywfar "@GWENHYWFAR_MINIMUM_VERSION@"
+Index: aqbanking-config.cmake.in
+--- aqbanking-config.cmake.in.orig
++++ aqbanking-config.cmake.in
+@@ -22,7 +22,7 @@ find_dependency(gwenhywfar "@GWENHYWFAR_MINIMUM_VERSIO
set_and_check(prefix "@prefix@")
set_and_check(exec_prefix "@exec_prefix@")
set_and_check(AQBANKING_INCLUDE_DIRS "@includedir@/aqbanking@AQBANKING_VERSION_MAJOR@")
-set_and_check(AQBANKING_LIBRARIES "@libdir@/libaqbanking.so")
+set_and_check(AQBANKING_LIBRARIES "@libdir@/libaqbanking.so.${LIBaqbanking_VERSION}")
- set(AQBANKING_LIBRARIES ${AQBANKING_LIBRARIES} ${GWENHYWFAR_LIBRARIES})
+ set(AQBANKING_FOUND true)
- mark_as_advanced( AQBANKING_INCLUDE_DIRS AQBANKING_LIBRARIES )
+ # The target is available since aqbanking 5.6.5
Index: productivity/aqbanking/pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- productivity/aqbanking/pkg/PLIST 30 Jan 2015 16:21:03 -0000 1.4
+++ productivity/aqbanking/pkg/PLIST 31 Mar 2018 12:36:30 -0000
@@ -3,6 +3,7 @@
bin/aqbanking-config
@bin bin/aqebics-tool
@bin bin/aqhbci-tool4
+@bin bin/aqpaypal-tool
@bin bin/hbcixml3
include/aqbanking5/
include/aqbanking5/aqbanking/
@@ -132,82 +133,89 @@ include/aqebics/client/
include/aqebics/client/account.h
include/aqebics/client/provider.h
include/aqebics/client/user.h
+include/aqpaypal/
+include/aqpaypal/aqpaypal.h
+include/aqpaypal/provider.h
+include/aqpaypal/user.h
lib/aqbanking/
lib/aqbanking/plugins/
-lib/aqbanking/plugins/34/
-lib/aqbanking/plugins/34/bankinfo/
-lib/aqbanking/plugins/34/bankinfo/at.la
-lib/aqbanking/plugins/34/bankinfo/at.so
-lib/aqbanking/plugins/34/bankinfo/at.xml
-lib/aqbanking/plugins/34/bankinfo/ca.la
-lib/aqbanking/plugins/34/bankinfo/ca.so
-lib/aqbanking/plugins/34/bankinfo/ca.xml
-lib/aqbanking/plugins/34/bankinfo/ch.la
-lib/aqbanking/plugins/34/bankinfo/ch.so
-lib/aqbanking/plugins/34/bankinfo/ch.xml
-lib/aqbanking/plugins/34/bankinfo/de.la
-lib/aqbanking/plugins/34/bankinfo/de.so
-lib/aqbanking/plugins/34/bankinfo/de.xml
-lib/aqbanking/plugins/34/bankinfo/us.la
-lib/aqbanking/plugins/34/bankinfo/us.so
-lib/aqbanking/plugins/34/bankinfo/us.xml
-lib/aqbanking/plugins/34/dbio/
-lib/aqbanking/plugins/34/dbio/dtaus.la
-lib/aqbanking/plugins/34/dbio/dtaus.so
-lib/aqbanking/plugins/34/dbio/dtaus.xml
-lib/aqbanking/plugins/34/dbio/swift.la
-lib/aqbanking/plugins/34/dbio/swift.so
-lib/aqbanking/plugins/34/dbio/swift.xml
-lib/aqbanking/plugins/34/imexporters/
-lib/aqbanking/plugins/34/imexporters/csv.la
-lib/aqbanking/plugins/34/imexporters/csv.so
-lib/aqbanking/plugins/34/imexporters/csv.xml
-lib/aqbanking/plugins/34/imexporters/ctxfile.la
-lib/aqbanking/plugins/34/imexporters/ctxfile.so
-lib/aqbanking/plugins/34/imexporters/ctxfile.xml
-lib/aqbanking/plugins/34/imexporters/dtaus.la
-lib/aqbanking/plugins/34/imexporters/dtaus.so
-lib/aqbanking/plugins/34/imexporters/dtaus.xml
-lib/aqbanking/plugins/34/imexporters/eri2.la
-lib/aqbanking/plugins/34/imexporters/eri2.so
-lib/aqbanking/plugins/34/imexporters/eri2.xml
-lib/aqbanking/plugins/34/imexporters/ofx.la
-lib/aqbanking/plugins/34/imexporters/ofx.so
-lib/aqbanking/plugins/34/imexporters/ofx.xml
-lib/aqbanking/plugins/34/imexporters/openhbci1.la
-lib/aqbanking/plugins/34/imexporters/openhbci1.so
-lib/aqbanking/plugins/34/imexporters/openhbci1.xml
-lib/aqbanking/plugins/34/imexporters/q43.la
-lib/aqbanking/plugins/34/imexporters/q43.so
-lib/aqbanking/plugins/34/imexporters/q43.xml
-lib/aqbanking/plugins/34/imexporters/sepa.la
-lib/aqbanking/plugins/34/imexporters/sepa.so
-lib/aqbanking/plugins/34/imexporters/sepa.xml
-lib/aqbanking/plugins/34/imexporters/swift.la
-lib/aqbanking/plugins/34/imexporters/swift.so
-lib/aqbanking/plugins/34/imexporters/swift.xml
-lib/aqbanking/plugins/34/imexporters/xmldb.la
-lib/aqbanking/plugins/34/imexporters/xmldb.so
-lib/aqbanking/plugins/34/imexporters/xmldb.xml
-lib/aqbanking/plugins/34/imexporters/yellownet.la
-lib/aqbanking/plugins/34/imexporters/yellownet.so
-lib/aqbanking/plugins/34/imexporters/yellownet.xml
-lib/aqbanking/plugins/34/providers/
-lib/aqbanking/plugins/34/providers/aqebics.la
-lib/aqbanking/plugins/34/providers/aqebics.so
-lib/aqbanking/plugins/34/providers/aqebics.xml
-lib/aqbanking/plugins/34/providers/aqhbci.la
-lib/aqbanking/plugins/34/providers/aqhbci.so
-lib/aqbanking/plugins/34/providers/aqhbci.xml
-lib/aqbanking/plugins/34/providers/aqnone.la
-lib/aqbanking/plugins/34/providers/aqnone.so
-lib/aqbanking/plugins/34/providers/aqnone.xml
-lib/aqbanking/plugins/34/providers/aqofxconnect.la
-lib/aqbanking/plugins/34/providers/aqofxconnect.so
-lib/aqbanking/plugins/34/providers/aqofxconnect.xml
-lib/cmake/aqbanking-5.5/
-lib/cmake/aqbanking-5.5/aqbanking-config-version.cmake
-lib/cmake/aqbanking-5.5/aqbanking-config.cmake
+lib/aqbanking/plugins/35/
+lib/aqbanking/plugins/35/bankinfo/
+lib/aqbanking/plugins/35/bankinfo/at.la
+lib/aqbanking/plugins/35/bankinfo/at.so
+lib/aqbanking/plugins/35/bankinfo/at.xml
+lib/aqbanking/plugins/35/bankinfo/ca.la
+lib/aqbanking/plugins/35/bankinfo/ca.so
+lib/aqbanking/plugins/35/bankinfo/ca.xml
+lib/aqbanking/plugins/35/bankinfo/ch.la
+lib/aqbanking/plugins/35/bankinfo/ch.so
+lib/aqbanking/plugins/35/bankinfo/ch.xml
+lib/aqbanking/plugins/35/bankinfo/de.la
+lib/aqbanking/plugins/35/bankinfo/de.so
+lib/aqbanking/plugins/35/bankinfo/de.xml
+lib/aqbanking/plugins/35/bankinfo/us.la
+lib/aqbanking/plugins/35/bankinfo/us.so
+lib/aqbanking/plugins/35/bankinfo/us.xml
+lib/aqbanking/plugins/35/dbio/
+lib/aqbanking/plugins/35/dbio/dtaus.la
+lib/aqbanking/plugins/35/dbio/dtaus.so
+lib/aqbanking/plugins/35/dbio/dtaus.xml
+lib/aqbanking/plugins/35/dbio/swift.la
+lib/aqbanking/plugins/35/dbio/swift.so
+lib/aqbanking/plugins/35/dbio/swift.xml
+lib/aqbanking/plugins/35/imexporters/
+lib/aqbanking/plugins/35/imexporters/csv.la
+lib/aqbanking/plugins/35/imexporters/csv.so
+lib/aqbanking/plugins/35/imexporters/csv.xml
+lib/aqbanking/plugins/35/imexporters/ctxfile.la
+lib/aqbanking/plugins/35/imexporters/ctxfile.so
+lib/aqbanking/plugins/35/imexporters/ctxfile.xml
+lib/aqbanking/plugins/35/imexporters/dtaus.la
+lib/aqbanking/plugins/35/imexporters/dtaus.so
+lib/aqbanking/plugins/35/imexporters/dtaus.xml
+lib/aqbanking/plugins/35/imexporters/eri2.la
+lib/aqbanking/plugins/35/imexporters/eri2.so
+lib/aqbanking/plugins/35/imexporters/eri2.xml
+lib/aqbanking/plugins/35/imexporters/ofx.la
+lib/aqbanking/plugins/35/imexporters/ofx.so
+lib/aqbanking/plugins/35/imexporters/ofx.xml
+lib/aqbanking/plugins/35/imexporters/openhbci1.la
+lib/aqbanking/plugins/35/imexporters/openhbci1.so
+lib/aqbanking/plugins/35/imexporters/openhbci1.xml
+lib/aqbanking/plugins/35/imexporters/q43.la
+lib/aqbanking/plugins/35/imexporters/q43.so
+lib/aqbanking/plugins/35/imexporters/q43.xml
+lib/aqbanking/plugins/35/imexporters/sepa.la
+lib/aqbanking/plugins/35/imexporters/sepa.so
+lib/aqbanking/plugins/35/imexporters/sepa.xml
+lib/aqbanking/plugins/35/imexporters/swift.la
+lib/aqbanking/plugins/35/imexporters/swift.so
+lib/aqbanking/plugins/35/imexporters/swift.xml
+lib/aqbanking/plugins/35/imexporters/xmldb.la
+lib/aqbanking/plugins/35/imexporters/xmldb.so
+lib/aqbanking/plugins/35/imexporters/xmldb.xml
+lib/aqbanking/plugins/35/imexporters/yellownet.la
+lib/aqbanking/plugins/35/imexporters/yellownet.so
+lib/aqbanking/plugins/35/imexporters/yellownet.xml
+lib/aqbanking/plugins/35/providers/
+lib/aqbanking/plugins/35/providers/aqebics.la
+lib/aqbanking/plugins/35/providers/aqebics.so
+lib/aqbanking/plugins/35/providers/aqebics.xml
+lib/aqbanking/plugins/35/providers/aqhbci.la
+lib/aqbanking/plugins/35/providers/aqhbci.so
+lib/aqbanking/plugins/35/providers/aqhbci.xml
+lib/aqbanking/plugins/35/providers/aqnone.la
+lib/aqbanking/plugins/35/providers/aqnone.so
+lib/aqbanking/plugins/35/providers/aqnone.xml
+lib/aqbanking/plugins/35/providers/aqofxconnect.la
+lib/aqbanking/plugins/35/providers/aqofxconnect.so
+lib/aqbanking/plugins/35/providers/aqofxconnect.xml
+lib/aqbanking/plugins/35/providers/aqpaypal.la
+lib/aqbanking/plugins/35/providers/aqpaypal.so
+lib/aqbanking/plugins/35/providers/aqpaypal.xml
+lib/cmake/aqbanking-5.7/
+lib/cmake/aqbanking-5.7/aqbanking-config-version.cmake
+lib/cmake/aqbanking-5.7/aqbanking-config.cmake
lib/libaqbanking.la
@lib lib/libaqbanking.so.${LIBaqbanking_VERSION}
lib/libaqbankingpp.la
@@ -220,6 +228,8 @@ lib/libaqnone.la
@lib lib/libaqnone.so.${LIBaqnone_VERSION}
lib/libaqofxconnect.la
@lib lib/libaqofxconnect.so.${LIBaqofxconnect_VERSION}
+lib/libaqpaypal.la
+@lib lib/libaqpaypal.so.${LIBaqpaypal_VERSION}
lib/pkgconfig/aqbanking.pc
share/aclocal/aqbanking.m4
share/aqbanking/
@@ -253,6 +263,7 @@ share/aqbanking/backends/aqhbci/dialogs/
share/aqbanking/backends/aqhbci/dialogs/dlg_pintan.dlg
share/aqbanking/backends/aqhbci/dialogs/dlg_pintan_special.dlg
share/aqbanking/backends/aqhbci/dialogs/dlg_rdh_special.dlg
+share/aqbanking/backends/aqhbci/dialogs/dlg_zkacard.dlg
share/aqbanking/backends/aqhbci/dialogs/keyfile.png
share/aqbanking/backends/aqhbci/dialogs/pintan.png
share/aqbanking/backends/aqhbci/hbci.xml
@@ -262,6 +273,11 @@ share/aqbanking/backends/aqofxconnect/di
share/aqbanking/backends/aqofxconnect/dialogs/dlg_getinst.dlg
share/aqbanking/backends/aqofxconnect/dialogs/dlg_newuser.dlg
share/aqbanking/backends/aqofxconnect/dialogs/dlg_ofx_special.dlg
+share/aqbanking/backends/aqpaypal/
+share/aqbanking/backends/aqpaypal/dialogs/
+share/aqbanking/backends/aqpaypal/dialogs/dlg_editsecret.dlg
+share/aqbanking/backends/aqpaypal/dialogs/dlg_edituser.dlg
+share/aqbanking/backends/aqpaypal/dialogs/dlg_newuser.dlg
share/aqbanking/bankinfo/
share/aqbanking/bankinfo/at/
share/aqbanking/bankinfo/at/banks.data
@@ -364,6 +380,7 @@ share/aqbanking/imexporters/swift/
share/aqbanking/imexporters/swift/profiles/
share/aqbanking/imexporters/swift/profiles/amro940.conf
share/aqbanking/imexporters/swift/profiles/amro942.conf
+share/aqbanking/imexporters/swift/profiles/swiftmt535.conf
share/aqbanking/imexporters/swift/profiles/swiftmt940.conf
share/aqbanking/imexporters/swift/profiles/swiftmt942.conf
share/aqbanking/imexporters/xmldb/
@@ -392,4 +409,7 @@ share/doc/aqebics/aqebics-tool/README
share/doc/aqhbci/
share/doc/aqhbci/aqhbci-tool/
share/doc/aqhbci/aqhbci-tool/README
+share/doc/aqpaypal/
+share/doc/aqpaypal/aqpaypal-tool/
+share/doc/aqpaypal/aqpaypal-tool/README
share/locale/de/LC_MESSAGES/aqbanking.mo
things but have no idea what to do with kmymoney which seems unhappy
(bunch of undefined gwenhywfar-related symbols at startup).
..snip..
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN6CppGui9checkCertEPK17GWEN_SSLCERTDESCRP11GWEN_SYNCIOj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN6CppGui7logHookEPKc17GWEN_LOGGER_LEVELS1_'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui10execDialogEP11GWEN_DIALOGj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui10openDialogEP11GWEN_DIALOGj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui11closeDialogEP11GWEN_DIALOG'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui9runDialogEP11GWEN_DIALOGi'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZN7QT4_Gui11getFileNameEPKc22GWEN_GUI_FILENAME_TYPEjS1_P11GWEN_BUFFERj'
kmymoney:/usr/local/lib/kde4/kmm_kbanking.so: undefined symbol '_ZTI7QT4_Gui'
KMyMoneyPlugin::PluginLoader:: createInstanceFromService returned 0 for KBanking with error Cannot load library /usr/local/lib/kde4/kmm_kbanking.so: (Cannot load specified object)
KMyMoneyPlugin::PluginLoader:: createInstanceFromService returned 0 for SEPA orders with error Could not find plugin 'SEPA orders' for application 'kmymoney'
Index: devel/gwenhywfar/Makefile
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- devel/gwenhywfar/Makefile 21 Nov 2017 00:12:59 -0000 1.20
+++ devel/gwenhywfar/Makefile 31 Mar 2018 12:36:30 -0000
@@ -3,14 +3,13 @@
COMMENT= helper library for networking and security applications
# update the "release=XX" in DISTFILES, not just DISTNAME
-DISTNAME= gwenhywfar-4.13.1
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=01\&release=78\&file=01}
-REVISION= 8
-
-SHARED_LIBS += gwenhywfar 1.3 # 73.1
-SHARED_LIBS += gwengui-gtk2 0.0 # unknown
-SHARED_LIBS += gwengui-qt4 0.0 # unknown
-SHARED_LIBS += gwengui-cpp 0.0 # unknown
+DISTNAME= gwenhywfar-4.20.0
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=01\&release=208\&file=02}
+
+SHARED_LIBS += gwenhywfar 2.0 # 79.1
+SHARED_LIBS += gwengui-gtk2 1.0 # unknown
+SHARED_LIBS += gwengui-qt4 1.0 # unknown
+SHARED_LIBS += gwengui-cpp 1.0 # unknown
CATEGORIES= devel
@@ -48,6 +47,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/
pre-configure:
${SUBST_CMD} ${WRKSRC}/gwenhywfar-config.cmake.in \
+ ${WRKSRC}/gui/cpp/gwengui-cpp-config.cmake.in \
${WRKSRC}/gui/qt4/gwengui-qt4-config.cmake.in
.include <bsd.port.mk>
Index: devel/gwenhywfar/distinfo
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- devel/gwenhywfar/distinfo 30 Jan 2015 16:20:43 -0000 1.5
+++ devel/gwenhywfar/distinfo 31 Mar 2018 12:36:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (gwenhywfar-4.13.1.tar.gz) = S+yoksEjVUjqCuMBMqbS5XkRwiNAdGWFOVzLAdhOxys=
-SIZE (gwenhywfar-4.13.1.tar.gz) = 2518248
+SHA256 (gwenhywfar-4.20.0.tar.gz) = Wojaq7oTiPlShZCqtd5SehLdRKfaRXLOSEaaKZEbD7A=
+SIZE (gwenhywfar-4.20.0.tar.gz) = 2379537
Index: devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
===================================================================
RCS file: devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
diff -N devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/gwenhywfar/patches/patch-gui_cpp_gwengui-cpp-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: gui/cpp/gwengui-cpp-config.cmake.in
+--- gui/cpp/gwengui-cpp-config.cmake.in.orig
++++ gui/cpp/gwengui-cpp-config.cmake.in
+@@ -25,7 +25,7 @@ set_and_check(prefix "@prefix@")
+ set_and_check(exec_prefix "@exec_prefix@")
+ set_and_check(includedir "@includedir@")
+ set_and_check(GWENGUI_CPP_INCLUDE_DIRS "@gwenhywfar_headerdir@")
+-set_and_check(GWENGUI_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
++set_and_check(GWENGUI_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so.${LIBgwengui-cpp_VERSION}")
+ set(GWENGUI_CPP_FOUND true)
+
+ if(GWENGUI_CPP_FOUND AND NOT TARGET gwenhywfar::gui-cpp)
Index: devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gui_qt4_gwengui-qt4-config_cmake_in
--- devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in 12 Jan 2017 16:36:12 -0000 1.1
+++ devel/gwenhywfar/patches/patch-gui_qt4_gwengui-qt4-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -1,15 +1,14 @@
$OpenBSD: patch-gui_qt4_gwengui-qt4-config_cmake_in,v 1.1 2017/01/12 16:36:12 zhuk Exp $
Unbreak CMake config file.
---- gui/qt4/gwengui-qt4-config.cmake.in.orig Wed Jan 11 00:46:50 2017
-+++ gui/qt4/gwengui-qt4-config.cmake.in Wed Jan 11 00:47:51 2017
-@@ -22,8 +22,8 @@ if(NOT EXISTS "${_file}")
- set_and_check(exec_prefix "@exec_prefix@")
- set_and_check(includedir "@includedir@")
- set_and_check(GWENGUI_QT4_INCLUDE_DIRS "@gwenhywfar_headerdir@")
-- set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so")
-- set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
-+ set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so.${LIBgwengui-qt4_VERSION}")
-+ set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so.${LIBgwengui-cpp_VERSION}")
-
- set(GWENGUI_QT4_LIBRARIES ${GWENGUI_QT4_LIBRARIES} ${GWENHYWFAR_CPP_LIBRARIES})
+Index: gui/qt4/gwengui-qt4-config.cmake.in
+--- gui/qt4/gwengui-qt4-config.cmake.in.orig
++++ gui/qt4/gwengui-qt4-config.cmake.in
+@@ -44,7 +44,7 @@ set_and_check(prefix "@prefix@")
+ set_and_check(exec_prefix "@exec_prefix@")
+ set_and_check(includedir "@includedir@")
+ set_and_check(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS "@gwenhywfar_headerdir@")
+-set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so")
++set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so.${LIBgwengui-qt4_VERSION}")
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND true)
+ if(${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT TARGET gwenhywfar::gui-qt4)
Index: devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gwenhywfar-config_cmake_in
--- devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in 12 Jan 2017 16:36:12 -0000 1.1
+++ devel/gwenhywfar/patches/patch-gwenhywfar-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-gwenhywfar-config_cmake_in,v 1.1 2017/01/12 16:36:12 zhuk Exp $
Unbreak CMake config file.
---- gwenhywfar-config.cmake.in.orig Wed Jan 11 00:39:48 2017
-+++ gwenhywfar-config.cmake.in Wed Jan 11 00:40:29 2017
+Index: gwenhywfar-config.cmake.in
+--- gwenhywfar-config.cmake.in.orig
++++ gwenhywfar-config.cmake.in
@@ -23,7 +23,7 @@ set_and_check(prefix "@prefix@")
set_and_check(exec_prefix "@exec_prefix@")
set_and_check(includedir "@includedir@")
set_and_check(GWENHYWFAR_INCLUDE_DIRS "@gwenhywfar_headerdir@")
-set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@")
+set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so.${LIBgwenhywfar_VERSION}")
+ set(GWENHYWFAR_FOUND TRUE)
# find components
-
Index: devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-plugins_dbio_csv_Makefile_in
--- devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in 30 Jan 2015 16:20:43 -0000 1.3
+++ devel/gwenhywfar/patches/patch-plugins_dbio_csv_Makefile_in 31 Mar 2018 12:36:30 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-plugins_dbio_csv_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen Exp $
---- plugins/dbio/csv/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/csv/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = csv.xml
+Index: plugins/dbio/csv/Makefile.in
+--- plugins/dbio/csv/Makefile.in.orig
++++ plugins/dbio/csv/Makefile.in
+@@ -480,7 +480,7 @@ dbioplugin_DATA = csv.xml
csv_la_SOURCES = csv.c
csv_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
csv_la_LDFLAGS = -no-undefined $(STRIPALL) \
Index: devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-plugins_dbio_olddb_Makefile_in
--- devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in 30 Jan 2015 16:20:43 -0000 1.3
+++ devel/gwenhywfar/patches/patch-plugins_dbio_olddb_Makefile_in 31 Mar 2018 12:36:30 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-plugins_dbio_olddb_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen Exp $
---- plugins/dbio/olddb/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/olddb/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = olddb.xml
+Index: plugins/dbio/olddb/Makefile.in
+--- plugins/dbio/olddb/Makefile.in.orig
++++ plugins/dbio/olddb/Makefile.in
+@@ -480,7 +480,7 @@ dbioplugin_DATA = olddb.xml
olddb_la_SOURCES = olddb.c
olddb_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
olddb_la_LDFLAGS = -no-undefined $(STRIPALL) \
Index: devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-plugins_dbio_xmldb_Makefile_in
--- devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in 30 Jan 2015 16:20:43 -0000 1.3
+++ devel/gwenhywfar/patches/patch-plugins_dbio_xmldb_Makefile_in 31 Mar 2018 12:36:30 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-plugins_dbio_xmldb_Makefile_in,v 1.3 2015/01/30 16:20:43 sthen Exp $
---- plugins/dbio/xmldb/Makefile.in.orig Sat Jan 3 22:45:27 2015
-+++ plugins/dbio/xmldb/Makefile.in Fri Jan 30 16:15:53 2015
-@@ -464,7 +464,7 @@ dbioplugin_DATA = xmldb.xml
+Index: plugins/dbio/xmldb/Makefile.in
+--- plugins/dbio/xmldb/Makefile.in.orig
++++ plugins/dbio/xmldb/Makefile.in
+@@ -480,7 +480,7 @@ dbioplugin_DATA = xmldb.xml
xmldb_la_SOURCES = xmldb.c
xmldb_la_LIBADD = $(top_builddir)/src/libgwenhywfar.la
xmldb_la_LDFLAGS = -no-undefined $(STRIPALL) \
Index: devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c
===================================================================
RCS file: devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c
diff -N devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c
--- devel/gwenhywfar/patches/patch-src_sio_syncio_tls_c 6 Mar 2016 12:17:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_sio_syncio_tls_c,v 1.1 2016/03/06 12:17:17 ajacoutot Exp $
-
-Fix build with GnutTLS 3.4.
-(from upstream's 4.15.2beta release)
-
---- src/sio/syncio_tls.c.orig Sun Mar 6 10:04:31 2016
-+++ src/sio/syncio_tls.c Sun Mar 6 10:04:52 2016
-@@ -364,7 +364,7 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO *sio) {
- const int proto_prio[2] = { GNUTLS_SSL3, 0 };
-
- DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
-- rv=gnutls_protocol_set_priority(xio->session, proto_prio);
-+ rv=gnutls_priority_set(xio->session, proto_prio);
- if (rv) {
- DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
- gnutls_deinit(xio->session);
Index: devel/gwenhywfar/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gwenhywfar/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- devel/gwenhywfar/pkg/PLIST 30 Jan 2015 16:20:43 -0000 1.4
+++ devel/gwenhywfar/pkg/PLIST 31 Mar 2018 12:36:30 -0000
@@ -49,6 +49,7 @@ include/gwenhywfar4/gwenhywfar/debug.h
include/gwenhywfar4/gwenhywfar/dialog.h
include/gwenhywfar4/gwenhywfar/dialog_be.h
include/gwenhywfar4/gwenhywfar/directory.h
+include/gwenhywfar4/gwenhywfar/endianfns.h
include/gwenhywfar4/gwenhywfar/error.h
include/gwenhywfar4/gwenhywfar/fastbuffer.h
include/gwenhywfar4/gwenhywfar/fslock.h
@@ -133,12 +134,15 @@ include/gwenhywfar4/gwenhywfar/widget_be
include/gwenhywfar4/gwenhywfar/xml.h
include/gwenhywfar4/gwenhywfar/xmlctx.h
include/gwenhywfar4/gwenhywfar/xsdnode.h
-lib/cmake/gwengui-qt4-4.13/
-lib/cmake/gwengui-qt4-4.13/gwengui-qt4-config-version.cmake
-lib/cmake/gwengui-qt4-4.13/gwengui-qt4-config.cmake
-lib/cmake/gwenhywfar-4.13/
-lib/cmake/gwenhywfar-4.13/gwenhywfar-config-version.cmake
-lib/cmake/gwenhywfar-4.13/gwenhywfar-config.cmake
+lib/cmake/gwengui-cpp-4.20/
+lib/cmake/gwengui-cpp-4.20/gwengui-cpp-config-version.cmake
+lib/cmake/gwengui-cpp-4.20/gwengui-cpp-config.cmake
+lib/cmake/gwengui-qt4-4.20/
+lib/cmake/gwengui-qt4-4.20/gwengui-qt4-config-version.cmake
+lib/cmake/gwengui-qt4-4.20/gwengui-qt4-config.cmake
+lib/cmake/gwenhywfar-4.20/
+lib/cmake/gwenhywfar-4.20/gwenhywfar-config-version.cmake
+lib/cmake/gwenhywfar-4.20/gwenhywfar-config.cmake
lib/gwenhywfar/
lib/gwenhywfar/plugins/
lib/gwenhywfar/plugins/60/
Index: productivity/aqbanking/Makefile
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- productivity/aqbanking/Makefile 21 Nov 2017 00:13:03 -0000 1.17
+++ productivity/aqbanking/Makefile 31 Mar 2018 12:36:30 -0000
@@ -3,17 +3,16 @@
COMMENT= online banking interface and financial data framework
# update the "release=XX" in DISTFILES, not just DISTNAME
-DISTNAME= aqbanking-5.5.1
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=03\&release=118\&file=01}
-WRKDIST= ${WRKDIR}/aqbanking-5.5.1
-REVISION= 5
+DISTNAME= aqbanking-5.7.8
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{download.php?package=03\&release=217\&file=02}
-SHARED_LIBS += aqbanking 2.0 # 39.2
-SHARED_LIBS += aqbankingpp 0.0 # unknown
-SHARED_LIBS += aqhbci 1.0 # 22.0
-SHARED_LIBS += aqnone 0.0 # 39.2
-SHARED_LIBS += aqofxconnect 0.2 # 7.2
-SHARED_LIBS += aqebics 0.0 # unknown
+SHARED_LIBS += aqbanking 3.0 # 41.8
+SHARED_LIBS += aqbankingpp 1.0 # unknown
+SHARED_LIBS += aqhbci 2.0 # 24.1
+SHARED_LIBS += aqnone 1.0 # 41.8
+SHARED_LIBS += aqofxconnect 1.0 # 7.2
+SHARED_LIBS += aqebics 1.0 # unknown
+SHARED_LIBS += aqpaypal 0.0 # unknown
CATEGORIES= productivity
Index: productivity/aqbanking/distinfo
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- productivity/aqbanking/distinfo 30 Jan 2015 16:21:03 -0000 1.5
+++ productivity/aqbanking/distinfo 31 Mar 2018 12:36:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (aqbanking-5.5.1.tar.gz) = I48X0n2G4M7yOUecS+FSy5j1vp1rh/yjh0HTLnYvrd8=
-SIZE (aqbanking-5.5.1.tar.gz) = 3818696
+SHA256 (aqbanking-5.7.8.tar.gz) = FvhuTMSanqqo3+MgZgfmJ4cyCLzkWnADDDyuqbWvx2g=
+SIZE (aqbanking-5.7.8.tar.gz) = 3818825
Index: productivity/aqbanking/patches/patch-aqbanking-config_cmake_in
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/patches/patch-aqbanking-config_cmake_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-aqbanking-config_cmake_in
--- productivity/aqbanking/patches/patch-aqbanking-config_cmake_in 12 Jan 2017 16:36:12 -0000 1.1
+++ productivity/aqbanking/patches/patch-aqbanking-config_cmake_in 31 Mar 2018 12:36:30 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-aqbanking-config_cmake_in,v 1.1 2017/01/12 16:36:12 zhuk Exp $
Unbreak CMake config.
---- aqbanking-config.cmake.in.orig Wed Jan 11 09:51:02 2017
-+++ aqbanking-config.cmake.in Wed Jan 11 09:51:54 2017
-@@ -21,7 +21,7 @@ find_package(Gwenhywfar "@GWENHYWFAR_MINIMUM_VERSION@"
+Index: aqbanking-config.cmake.in
+--- aqbanking-config.cmake.in.orig
++++ aqbanking-config.cmake.in
+@@ -22,7 +22,7 @@ find_dependency(gwenhywfar "@GWENHYWFAR_MINIMUM_VERSIO
set_and_check(prefix "@prefix@")
set_and_check(exec_prefix "@exec_prefix@")
set_and_check(AQBANKING_INCLUDE_DIRS "@includedir@/aqbanking@AQBANKING_VERSION_MAJOR@")
-set_and_check(AQBANKING_LIBRARIES "@libdir@/libaqbanking.so")
+set_and_check(AQBANKING_LIBRARIES "@libdir@/libaqbanking.so.${LIBaqbanking_VERSION}")
- set(AQBANKING_LIBRARIES ${AQBANKING_LIBRARIES} ${GWENHYWFAR_LIBRARIES})
+ set(AQBANKING_FOUND true)
- mark_as_advanced( AQBANKING_INCLUDE_DIRS AQBANKING_LIBRARIES )
+ # The target is available since aqbanking 5.6.5
Index: productivity/aqbanking/pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/aqbanking/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- productivity/aqbanking/pkg/PLIST 30 Jan 2015 16:21:03 -0000 1.4
+++ productivity/aqbanking/pkg/PLIST 31 Mar 2018 12:36:30 -0000
@@ -3,6 +3,7 @@
bin/aqbanking-config
@bin bin/aqebics-tool
@bin bin/aqhbci-tool4
+@bin bin/aqpaypal-tool
@bin bin/hbcixml3
include/aqbanking5/
include/aqbanking5/aqbanking/
@@ -132,82 +133,89 @@ include/aqebics/client/
include/aqebics/client/account.h
include/aqebics/client/provider.h
include/aqebics/client/user.h
+include/aqpaypal/
+include/aqpaypal/aqpaypal.h
+include/aqpaypal/provider.h
+include/aqpaypal/user.h
lib/aqbanking/
lib/aqbanking/plugins/
-lib/aqbanking/plugins/34/
-lib/aqbanking/plugins/34/bankinfo/
-lib/aqbanking/plugins/34/bankinfo/at.la
-lib/aqbanking/plugins/34/bankinfo/at.so
-lib/aqbanking/plugins/34/bankinfo/at.xml
-lib/aqbanking/plugins/34/bankinfo/ca.la
-lib/aqbanking/plugins/34/bankinfo/ca.so
-lib/aqbanking/plugins/34/bankinfo/ca.xml
-lib/aqbanking/plugins/34/bankinfo/ch.la
-lib/aqbanking/plugins/34/bankinfo/ch.so
-lib/aqbanking/plugins/34/bankinfo/ch.xml
-lib/aqbanking/plugins/34/bankinfo/de.la
-lib/aqbanking/plugins/34/bankinfo/de.so
-lib/aqbanking/plugins/34/bankinfo/de.xml
-lib/aqbanking/plugins/34/bankinfo/us.la
-lib/aqbanking/plugins/34/bankinfo/us.so
-lib/aqbanking/plugins/34/bankinfo/us.xml
-lib/aqbanking/plugins/34/dbio/
-lib/aqbanking/plugins/34/dbio/dtaus.la
-lib/aqbanking/plugins/34/dbio/dtaus.so
-lib/aqbanking/plugins/34/dbio/dtaus.xml
-lib/aqbanking/plugins/34/dbio/swift.la
-lib/aqbanking/plugins/34/dbio/swift.so
-lib/aqbanking/plugins/34/dbio/swift.xml
-lib/aqbanking/plugins/34/imexporters/
-lib/aqbanking/plugins/34/imexporters/csv.la
-lib/aqbanking/plugins/34/imexporters/csv.so
-lib/aqbanking/plugins/34/imexporters/csv.xml
-lib/aqbanking/plugins/34/imexporters/ctxfile.la
-lib/aqbanking/plugins/34/imexporters/ctxfile.so
-lib/aqbanking/plugins/34/imexporters/ctxfile.xml
-lib/aqbanking/plugins/34/imexporters/dtaus.la
-lib/aqbanking/plugins/34/imexporters/dtaus.so
-lib/aqbanking/plugins/34/imexporters/dtaus.xml
-lib/aqbanking/plugins/34/imexporters/eri2.la
-lib/aqbanking/plugins/34/imexporters/eri2.so
-lib/aqbanking/plugins/34/imexporters/eri2.xml
-lib/aqbanking/plugins/34/imexporters/ofx.la
-lib/aqbanking/plugins/34/imexporters/ofx.so
-lib/aqbanking/plugins/34/imexporters/ofx.xml
-lib/aqbanking/plugins/34/imexporters/openhbci1.la
-lib/aqbanking/plugins/34/imexporters/openhbci1.so
-lib/aqbanking/plugins/34/imexporters/openhbci1.xml
-lib/aqbanking/plugins/34/imexporters/q43.la
-lib/aqbanking/plugins/34/imexporters/q43.so
-lib/aqbanking/plugins/34/imexporters/q43.xml
-lib/aqbanking/plugins/34/imexporters/sepa.la
-lib/aqbanking/plugins/34/imexporters/sepa.so
-lib/aqbanking/plugins/34/imexporters/sepa.xml
-lib/aqbanking/plugins/34/imexporters/swift.la
-lib/aqbanking/plugins/34/imexporters/swift.so
-lib/aqbanking/plugins/34/imexporters/swift.xml
-lib/aqbanking/plugins/34/imexporters/xmldb.la
-lib/aqbanking/plugins/34/imexporters/xmldb.so
-lib/aqbanking/plugins/34/imexporters/xmldb.xml
-lib/aqbanking/plugins/34/imexporters/yellownet.la
-lib/aqbanking/plugins/34/imexporters/yellownet.so
-lib/aqbanking/plugins/34/imexporters/yellownet.xml
-lib/aqbanking/plugins/34/providers/
-lib/aqbanking/plugins/34/providers/aqebics.la
-lib/aqbanking/plugins/34/providers/aqebics.so
-lib/aqbanking/plugins/34/providers/aqebics.xml
-lib/aqbanking/plugins/34/providers/aqhbci.la
-lib/aqbanking/plugins/34/providers/aqhbci.so
-lib/aqbanking/plugins/34/providers/aqhbci.xml
-lib/aqbanking/plugins/34/providers/aqnone.la
-lib/aqbanking/plugins/34/providers/aqnone.so
-lib/aqbanking/plugins/34/providers/aqnone.xml
-lib/aqbanking/plugins/34/providers/aqofxconnect.la
-lib/aqbanking/plugins/34/providers/aqofxconnect.so
-lib/aqbanking/plugins/34/providers/aqofxconnect.xml
-lib/cmake/aqbanking-5.5/
-lib/cmake/aqbanking-5.5/aqbanking-config-version.cmake
-lib/cmake/aqbanking-5.5/aqbanking-config.cmake
+lib/aqbanking/plugins/35/
+lib/aqbanking/plugins/35/bankinfo/
+lib/aqbanking/plugins/35/bankinfo/at.la
+lib/aqbanking/plugins/35/bankinfo/at.so
+lib/aqbanking/plugins/35/bankinfo/at.xml
+lib/aqbanking/plugins/35/bankinfo/ca.la
+lib/aqbanking/plugins/35/bankinfo/ca.so
+lib/aqbanking/plugins/35/bankinfo/ca.xml
+lib/aqbanking/plugins/35/bankinfo/ch.la
+lib/aqbanking/plugins/35/bankinfo/ch.so
+lib/aqbanking/plugins/35/bankinfo/ch.xml
+lib/aqbanking/plugins/35/bankinfo/de.la
+lib/aqbanking/plugins/35/bankinfo/de.so
+lib/aqbanking/plugins/35/bankinfo/de.xml
+lib/aqbanking/plugins/35/bankinfo/us.la
+lib/aqbanking/plugins/35/bankinfo/us.so
+lib/aqbanking/plugins/35/bankinfo/us.xml
+lib/aqbanking/plugins/35/dbio/
+lib/aqbanking/plugins/35/dbio/dtaus.la
+lib/aqbanking/plugins/35/dbio/dtaus.so
+lib/aqbanking/plugins/35/dbio/dtaus.xml
+lib/aqbanking/plugins/35/dbio/swift.la
+lib/aqbanking/plugins/35/dbio/swift.so
+lib/aqbanking/plugins/35/dbio/swift.xml
+lib/aqbanking/plugins/35/imexporters/
+lib/aqbanking/plugins/35/imexporters/csv.la
+lib/aqbanking/plugins/35/imexporters/csv.so
+lib/aqbanking/plugins/35/imexporters/csv.xml
+lib/aqbanking/plugins/35/imexporters/ctxfile.la
+lib/aqbanking/plugins/35/imexporters/ctxfile.so
+lib/aqbanking/plugins/35/imexporters/ctxfile.xml
+lib/aqbanking/plugins/35/imexporters/dtaus.la
+lib/aqbanking/plugins/35/imexporters/dtaus.so
+lib/aqbanking/plugins/35/imexporters/dtaus.xml
+lib/aqbanking/plugins/35/imexporters/eri2.la
+lib/aqbanking/plugins/35/imexporters/eri2.so
+lib/aqbanking/plugins/35/imexporters/eri2.xml
+lib/aqbanking/plugins/35/imexporters/ofx.la
+lib/aqbanking/plugins/35/imexporters/ofx.so
+lib/aqbanking/plugins/35/imexporters/ofx.xml
+lib/aqbanking/plugins/35/imexporters/openhbci1.la
+lib/aqbanking/plugins/35/imexporters/openhbci1.so
+lib/aqbanking/plugins/35/imexporters/openhbci1.xml
+lib/aqbanking/plugins/35/imexporters/q43.la
+lib/aqbanking/plugins/35/imexporters/q43.so
+lib/aqbanking/plugins/35/imexporters/q43.xml
+lib/aqbanking/plugins/35/imexporters/sepa.la
+lib/aqbanking/plugins/35/imexporters/sepa.so
+lib/aqbanking/plugins/35/imexporters/sepa.xml
+lib/aqbanking/plugins/35/imexporters/swift.la
+lib/aqbanking/plugins/35/imexporters/swift.so
+lib/aqbanking/plugins/35/imexporters/swift.xml
+lib/aqbanking/plugins/35/imexporters/xmldb.la
+lib/aqbanking/plugins/35/imexporters/xmldb.so
+lib/aqbanking/plugins/35/imexporters/xmldb.xml
+lib/aqbanking/plugins/35/imexporters/yellownet.la
+lib/aqbanking/plugins/35/imexporters/yellownet.so
+lib/aqbanking/plugins/35/imexporters/yellownet.xml
+lib/aqbanking/plugins/35/providers/
+lib/aqbanking/plugins/35/providers/aqebics.la
+lib/aqbanking/plugins/35/providers/aqebics.so
+lib/aqbanking/plugins/35/providers/aqebics.xml
+lib/aqbanking/plugins/35/providers/aqhbci.la
+lib/aqbanking/plugins/35/providers/aqhbci.so
+lib/aqbanking/plugins/35/providers/aqhbci.xml
+lib/aqbanking/plugins/35/providers/aqnone.la
+lib/aqbanking/plugins/35/providers/aqnone.so
+lib/aqbanking/plugins/35/providers/aqnone.xml
+lib/aqbanking/plugins/35/providers/aqofxconnect.la
+lib/aqbanking/plugins/35/providers/aqofxconnect.so
+lib/aqbanking/plugins/35/providers/aqofxconnect.xml
+lib/aqbanking/plugins/35/providers/aqpaypal.la
+lib/aqbanking/plugins/35/providers/aqpaypal.so
+lib/aqbanking/plugins/35/providers/aqpaypal.xml
+lib/cmake/aqbanking-5.7/
+lib/cmake/aqbanking-5.7/aqbanking-config-version.cmake
+lib/cmake/aqbanking-5.7/aqbanking-config.cmake
lib/libaqbanking.la
@lib lib/libaqbanking.so.${LIBaqbanking_VERSION}
lib/libaqbankingpp.la
@@ -220,6 +228,8 @@ lib/libaqnone.la
@lib lib/libaqnone.so.${LIBaqnone_VERSION}
lib/libaqofxconnect.la
@lib lib/libaqofxconnect.so.${LIBaqofxconnect_VERSION}
+lib/libaqpaypal.la
+@lib lib/libaqpaypal.so.${LIBaqpaypal_VERSION}
lib/pkgconfig/aqbanking.pc
share/aclocal/aqbanking.m4
share/aqbanking/
@@ -253,6 +263,7 @@ share/aqbanking/backends/aqhbci/dialogs/
share/aqbanking/backends/aqhbci/dialogs/dlg_pintan.dlg
share/aqbanking/backends/aqhbci/dialogs/dlg_pintan_special.dlg
share/aqbanking/backends/aqhbci/dialogs/dlg_rdh_special.dlg
+share/aqbanking/backends/aqhbci/dialogs/dlg_zkacard.dlg
share/aqbanking/backends/aqhbci/dialogs/keyfile.png
share/aqbanking/backends/aqhbci/dialogs/pintan.png
share/aqbanking/backends/aqhbci/hbci.xml
@@ -262,6 +273,11 @@ share/aqbanking/backends/aqofxconnect/di
share/aqbanking/backends/aqofxconnect/dialogs/dlg_getinst.dlg
share/aqbanking/backends/aqofxconnect/dialogs/dlg_newuser.dlg
share/aqbanking/backends/aqofxconnect/dialogs/dlg_ofx_special.dlg
+share/aqbanking/backends/aqpaypal/
+share/aqbanking/backends/aqpaypal/dialogs/
+share/aqbanking/backends/aqpaypal/dialogs/dlg_editsecret.dlg
+share/aqbanking/backends/aqpaypal/dialogs/dlg_edituser.dlg
+share/aqbanking/backends/aqpaypal/dialogs/dlg_newuser.dlg
share/aqbanking/bankinfo/
share/aqbanking/bankinfo/at/
share/aqbanking/bankinfo/at/banks.data
@@ -364,6 +380,7 @@ share/aqbanking/imexporters/swift/
share/aqbanking/imexporters/swift/profiles/
share/aqbanking/imexporters/swift/profiles/amro940.conf
share/aqbanking/imexporters/swift/profiles/amro942.conf
+share/aqbanking/imexporters/swift/profiles/swiftmt535.conf
share/aqbanking/imexporters/swift/profiles/swiftmt940.conf
share/aqbanking/imexporters/swift/profiles/swiftmt942.conf
share/aqbanking/imexporters/xmldb/
@@ -392,4 +409,7 @@ share/doc/aqebics/aqebics-tool/README
share/doc/aqhbci/
share/doc/aqhbci/aqhbci-tool/
share/doc/aqhbci/aqhbci-tool/README
+share/doc/aqpaypal/
+share/doc/aqpaypal/aqpaypal-tool/
+share/doc/aqpaypal/aqpaypal-tool/README
share/locale/de/LC_MESSAGES/aqbanking.mo
Re: NEW: devel/rgbds
On Sat, Mar 31, 2018 at 01:18:46PM +0200, Klemens Nanni wrote:
> I did a quick test, the toolchain seems to work and my ROM starts, but
> that might mean nothing at all:
>
> $ cat > a.s
> section "die",rom0
This must be a banked ROM section (ROMX).
> di ; disable interrupts
> stop ; stop the cpu
> $ rgbasm -o a.o a.s
> $ rgblink -o a.gb a.o
> $ rgbfix -v a.gb
> $ mednafen a.gb
>
> Have fun!
> I did a quick test, the toolchain seems to work and my ROM starts, but
> that might mean nothing at all:
>
> $ cat > a.s
> section "die",rom0
This must be a banked ROM section (ROMX).
> di ; disable interrupts
> stop ; stop the cpu
> $ rgbasm -o a.o a.s
> $ rgblink -o a.gb a.o
> $ rgbfix -v a.gb
> $ mednafen a.gb
>
> Have fun!
Re: NEW: devel/rgbds
On Fri, Mar 30, 2018 at 11:42:14PM -0600, Anthony J. Bentley wrote:
> RGBDS (Rednex Game Boy Development System) is a free assembler/linker package
> for the Game Boy and Game Boy Color. It consists of:
>
> - rgbasm (assembler)
> - rgblink (linker)
> - rgbfix (checksum/header fixer)
> - rgbgfx (PNG to Game Boy graphics converter)
Nice, even pledged!
Looks good port-wise except for:
* move one pledge() above argc check/usage() call
* MAKE_FLAGS for proper binary/manual permissions, also pass CFLAGS to
build without debug symbols by default (this makes it DEBUG aware)
* same indentation for all variables in Makefile
See updated tarball attached. OK kn with the pledge() and make bits in.
I did a quick test, the toolchain seems to work and my ROM starts, but
that might mean nothing at all:
$ cat > a.s
section "die",rom0
di ; disable interrupts
stop ; stop the cpu
$ rgbasm -o a.o a.s
$ rgblink -o a.gb a.o
$ rgbfix -v a.gb
$ mednafen a.gb
Have fun!
> RGBDS (Rednex Game Boy Development System) is a free assembler/linker package
> for the Game Boy and Game Boy Color. It consists of:
>
> - rgbasm (assembler)
> - rgblink (linker)
> - rgbfix (checksum/header fixer)
> - rgbgfx (PNG to Game Boy graphics converter)
Nice, even pledged!
Looks good port-wise except for:
* move one pledge() above argc check/usage() call
* MAKE_FLAGS for proper binary/manual permissions, also pass CFLAGS to
build without debug symbols by default (this makes it DEBUG aware)
* same indentation for all variables in Makefile
See updated tarball attached. OK kn with the pledge() and make bits in.
I did a quick test, the toolchain seems to work and my ROM starts, but
that might mean nothing at all:
$ cat > a.s
section "die",rom0
di ; disable interrupts
stop ; stop the cpu
$ rgbasm -o a.o a.s
$ rgblink -o a.gb a.o
$ rgbfix -v a.gb
$ mednafen a.gb
Have fun!
Re: Update: telephony/kamailio to 5.1.2
On 2018/03/31 12:07, Roman Kravchuk wrote:
> Index: patches/patch-src_modules_tls_tls_locking_c
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_locking_c,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_locking_c
> --- patches/patch-src_modules_tls_tls_locking_c 21 Sep 2017 09:34:32 -0000 1.1
> +++ patches/patch-src_modules_tls_tls_locking_c 31 Mar 2018 09:00:39 -0000
> @@ -3,21 +3,43 @@ $OpenBSD: patch-src_modules_tls_tls_lock
> Index: src/modules/tls/tls_locking.c
> --- src/modules/tls/tls_locking.c.orig
> +++ src/modules/tls/tls_locking.c
> -@@ -33,7 +33,7 @@ static int n_static_locks=0;
> +@@ -33,7 +33,8 @@ static int n_static_locks=0;
> static gen_lock_set_t* static_locks=0;
>
> /* OpenSSL is thread-safe since 1.1.0 */
> --#if OPENSSL_VERSION_NUMBER < 0x10100000L
> -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
> +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
> ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
> ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
I would like if somebody who is familiar with the current status of
thread safety in libressl could chime in. Either have a look at this
(suggested only if you own peril-sensitive sunglasses...) or explain
what does/doesn't need locking as I'm not too sure of how things
ended up after the pledge fixes.
> Index: patches/patch-src_modules_tls_tls_locking_c
> ===================================================================
> RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_locking_c,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_locking_c
> --- patches/patch-src_modules_tls_tls_locking_c 21 Sep 2017 09:34:32 -0000 1.1
> +++ patches/patch-src_modules_tls_tls_locking_c 31 Mar 2018 09:00:39 -0000
> @@ -3,21 +3,43 @@ $OpenBSD: patch-src_modules_tls_tls_lock
> Index: src/modules/tls/tls_locking.c
> --- src/modules/tls/tls_locking.c.orig
> +++ src/modules/tls/tls_locking.c
> -@@ -33,7 +33,7 @@ static int n_static_locks=0;
> +@@ -33,7 +33,8 @@ static int n_static_locks=0;
> static gen_lock_set_t* static_locks=0;
>
> /* OpenSSL is thread-safe since 1.1.0 */
> --#if OPENSSL_VERSION_NUMBER < 0x10100000L
> -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
> +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
> ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
> ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
I would like if somebody who is familiar with the current status of
thread safety in libressl could chime in. Either have a look at this
(suggested only if you own peril-sensitive sunglasses...) or explain
what does/doesn't need locking as I'm not too sure of how things
ended up after the pledge fixes.
UPDATE: math/octave
please test/comment/ok this update for octave.
it seems to work fine on amd64.
note that I've just committed a change to qrupdate that prevents octave
from linking in the g2c library and crashing on some computations.
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.101
diff -u -p -u -r1.101 Makefile
--- Makefile 28 Feb 2018 19:23:56 -0000 1.101
+++ Makefile 31 Mar 2018 06:44:49 -0000
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.2.1
+VERSION = 4.2.2
DISTNAME = octave-${VERSION}
-REVISION = 2
CATEGORIES = math
-SHARED_LIBS += octave 8.0
-SHARED_LIBS += octgui 2.0
-SHARED_LIBS += octinterp 7.0
+SHARED_LIBS += octave 9.0
+SHARED_LIBS += octgui 3.0
+SHARED_LIBS += octinterp 8.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -27,7 +26,7 @@ WANTLIB += Xext Xfixes Xft Xi Xinerama X
WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
WANTLIB += fftw3f_threads fltk fltk_gl fontconfig freetype gl2ps glapi
-WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m ncurses
+WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m curses
WANTLIB += nghttp2 ogg pcre png portaudio pthread qhull qrupdate
WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- distinfo 3 Nov 2017 12:28:53 -0000 1.18
+++ distinfo 31 Mar 2018 06:44:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
-SIZE (octave-4.2.1.tar.gz) = 25409651
+SHA256 (octave-4.2.2.tar.gz) = d7hDldjncooasiMFj+XpLcOMA7wT9zWOZTOqs292cm4=
+SIZE (octave-4.2.2.tar.gz) = 25624087
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-configure
--- patches/patch-configure 3 Nov 2017 12:28:53 -0000 1.10
+++ patches/patch-configure 31 Mar 2018 06:44:49 -0000
@@ -5,16 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt version $ver... " >&6; }
- ;;
- 5)
- QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
-- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
- ;;
- *)
- as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
-@@ -44617,13 +44617,13 @@ fi
+@@ -44777,13 +44777,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -31,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -44662,7 +44662,7 @@ fi
+@@ -44822,7 +44822,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: patches/patch-liboctave_system_file-stat_cc
===================================================================
RCS file: patches/patch-liboctave_system_file-stat_cc
diff -N patches/patch-liboctave_system_file-stat_cc
--- patches/patch-liboctave_system_file-stat_cc 3 Nov 2017 12:28:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-liboctave_system_file-stat_cc,v 1.1 2017/11/03 12:28:53 steven Exp $
-
-Index: liboctave/system/file-stat.cc
---- liboctave/system/file-stat.cc.orig
-+++ liboctave/system/file-stat.cc
-@@ -174,7 +174,7 @@ namespace octave
- update_internal ();
- }
-
-- inline file_stat::~file_stat () { }
-+ file_stat::~file_stat () { }
-
- void
- file_stat::update_internal (bool force)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST
--- pkg/PLIST 3 Nov 2017 12:28:53 -0000 1.21
+++ pkg/PLIST 31 Mar 2018 06:44:50 -0000
@@ -940,6 +940,7 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t1.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t2.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t3.m
+share/octave/${VERSION}/etc/tests/fixed/classdef/struct_wrapper.m
share/octave/${VERSION}/etc/tests/fixed/classes/
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/Blork.m
it seems to work fine on amd64.
note that I've just committed a change to qrupdate that prevents octave
from linking in the g2c library and crashing on some computations.
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.101
diff -u -p -u -r1.101 Makefile
--- Makefile 28 Feb 2018 19:23:56 -0000 1.101
+++ Makefile 31 Mar 2018 06:44:49 -0000
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.2.1
+VERSION = 4.2.2
DISTNAME = octave-${VERSION}
-REVISION = 2
CATEGORIES = math
-SHARED_LIBS += octave 8.0
-SHARED_LIBS += octgui 2.0
-SHARED_LIBS += octinterp 7.0
+SHARED_LIBS += octave 9.0
+SHARED_LIBS += octgui 3.0
+SHARED_LIBS += octinterp 8.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -27,7 +26,7 @@ WANTLIB += Xext Xfixes Xft Xi Xinerama X
WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
WANTLIB += fftw3f_threads fltk fltk_gl fontconfig freetype gl2ps glapi
-WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m ncurses
+WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m curses
WANTLIB += nghttp2 ogg pcre png portaudio pthread qhull qrupdate
WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- distinfo 3 Nov 2017 12:28:53 -0000 1.18
+++ distinfo 31 Mar 2018 06:44:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
-SIZE (octave-4.2.1.tar.gz) = 25409651
+SHA256 (octave-4.2.2.tar.gz) = d7hDldjncooasiMFj+XpLcOMA7wT9zWOZTOqs292cm4=
+SIZE (octave-4.2.2.tar.gz) = 25624087
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-configure
--- patches/patch-configure 3 Nov 2017 12:28:53 -0000 1.10
+++ patches/patch-configure 31 Mar 2018 06:44:49 -0000
@@ -5,16 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt version $ver... " >&6; }
- ;;
- 5)
- QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
-- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
- ;;
- *)
- as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
-@@ -44617,13 +44617,13 @@ fi
+@@ -44777,13 +44777,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -31,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -44662,7 +44662,7 @@ fi
+@@ -44822,7 +44822,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: patches/patch-liboctave_system_file-stat_cc
===================================================================
RCS file: patches/patch-liboctave_system_file-stat_cc
diff -N patches/patch-liboctave_system_file-stat_cc
--- patches/patch-liboctave_system_file-stat_cc 3 Nov 2017 12:28:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-liboctave_system_file-stat_cc,v 1.1 2017/11/03 12:28:53 steven Exp $
-
-Index: liboctave/system/file-stat.cc
---- liboctave/system/file-stat.cc.orig
-+++ liboctave/system/file-stat.cc
-@@ -174,7 +174,7 @@ namespace octave
- update_internal ();
- }
-
-- inline file_stat::~file_stat () { }
-+ file_stat::~file_stat () { }
-
- void
- file_stat::update_internal (bool force)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST
--- pkg/PLIST 3 Nov 2017 12:28:53 -0000 1.21
+++ pkg/PLIST 31 Mar 2018 06:44:50 -0000
@@ -940,6 +940,7 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t1.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t2.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t3.m
+share/octave/${VERSION}/etc/tests/fixed/classdef/struct_wrapper.m
share/octave/${VERSION}/etc/tests/fixed/classes/
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/Blork.m
Update: telephony/kamailio to 5.1.2
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile 20 Mar 2018 22:03:35 -0000 1.44
+++ Makefile 31 Mar 2018 09:00:39 -0000
@@ -2,7 +2,7 @@
COMMENT-main = mature and flexible open source SIP server
-VERSION = 5.0.6
+VERSION = 5.1.2
DISTNAME = kamailio-${VERSION}_src
@@ -21,25 +21,26 @@ PKGNAME-radius = kamailio-radius-${VERSI
CATEGORIES = telephony
MAINTAINER = Roman Kravchuk <kravchuk.kp@gmail.com>
-HOMEPAGE = http://www.kamailio.org/
+HOMEPAGE = https://www.kamailio.org/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-SHARED_LIBS = srdb1 4.0 # 1.0
-SHARED_LIBS += srdb2 4.0 # 1.0
-SHARED_LIBS += trie 4.0 # 1.0
-SHARED_LIBS += srutils 3.0 # 1.0
+SHARED_LIBS = srdb1 5.0 # 1.0
+SHARED_LIBS += srdb2 5.0 # 1.0
+SHARED_LIBS += trie 5.0 # 1.0
+SHARED_LIBS += srutils 4.0 # 1.0
MAKE_ENV = CC="${CC}" \
CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS -DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
LD_EXTRA_OPTS="${LDFLAGS} -pthread -L${LOCALBASE}/lib"
-MASTER_SITES = http://www.kamailio.org/pub/kamailio/${VERSION}/src/
+MASTER_SITES = https://www.kamailio.org/pub/kamailio/${VERSION}/src/
WRKDIST = ${WRKDIR}/kamailio-${VERSION}
-WANTLIB-main = c crypto curl expat event_core event_extra iconv m \
- pcre pthread ssl lzma xml2 curses readline unistring z
+WANTLIB-main = c crypto curl curses expat event_core event_extra iconv m \
+ pcre pthread ssl lzma xml2 ncurses readline unistring z \
+ ${COMPILER_LIBCXX}
LIB_DEPENDS-main = converters/libiconv \
converters/libunistring \
@@ -53,6 +54,7 @@ KAMAILIO_GROUPS = kstandard kcpl khttp_a
FLAVOR ?=
MULTI_PACKAGES = -main
+CONFIGURE_STYLE = No
USE_GMAKE = Yes
NO_TEST = Yes
@@ -62,15 +64,20 @@ MAKE_FLAGS = LIBDIR=lib \
cfg-prefix=${WRKINST} \
cfg_dir=share/examples/kamailio/ \
cfg_target=${SYSCONFDIR}/kamailio/ \
- run_target=${VARBASE}/run/kamailio/ \
+ run_target=${VARBASE}/run/kamailio \
QUIET=verbose \
RADCLI=1 \
SCTP=0 \
+ MEMPKG=sys \
group_include="${KAMAILIO_GROUPS}" \
LIBsrdb1_VERSION=${LIBsrdb1_VERSION} \
LIBsrdb2_VERSION=${LIBsrdb2_VERSION} \
LIBtrie_VERSION=${LIBtrie_VERSION} \
LIBsrutils_VERSION=${LIBsrutils_VERSION} \
+
+MODULES = lang/python
+MODPY_BUILDDEP = No
+MODPY_ADJ_FILES = utils/kamctl/dbtextdb/dbtextdb.py
PSEUDO_FLAVORS += no_berkeley
.if !${FLAVOR:Mno_berkeley}
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/kamailio/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 20 Mar 2018 22:03:35 -0000 1.10
+++ distinfo 31 Mar 2018 09:00:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (kamailio-5.0.6_src.tar.gz) = yhYma1WYZtWMa3fyNfvPXwcfYnSSwo8z7PWY5B2V1Co=
-SIZE (kamailio-5.0.6_src.tar.gz) = 11724268
+SHA256 (kamailio-5.1.2_src.tar.gz) = bsnO+h+gt+IJDkHzQXLbUR2vonwMEeK4whQLyHWxa10=
+SIZE (kamailio-5.1.2_src.tar.gz) = 12010615
Index: patches/patch-etc_kamailio_cfg
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-etc_kamailio_cfg,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-etc_kamailio_cfg
--- patches/patch-etc_kamailio_cfg 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-etc_kamailio_cfg 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-etc_kamailio_cfg,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- etc/kamailio.cfg.orig Wed Apr 5 16:32:38 2017
-+++ etc/kamailio.cfg Mon May 15 21:48:56 2017
-@@ -160,6 +160,9 @@ log_facility=LOG_LOCAL0
+Index: etc/kamailio.cfg
+--- etc/kamailio.cfg.orig
++++ etc/kamailio.cfg
+@@ -161,6 +161,9 @@ log_prefix="{$mt $hdr(CSeq) $ci} "
/* number of SIP routing processes */
children=8
Index: patches/patch-src_core_rand_fastrand_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_rand_fastrand_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_rand_fastrand_c
--- patches/patch-src_core_rand_fastrand_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_rand_fastrand_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_rand_fastrand_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/rand/fastrand.c.orig Mon May 15 22:48:56 2017
-+++ src/core/rand/fastrand.c Mon May 15 22:50:19 2017
-@@ -25,6 +25,18 @@
+Index: src/core/rand/fastrand.c
+--- src/core/rand/fastrand.c.orig
++++ src/core/rand/fastrand.c
+@@ -23,6 +23,18 @@
#include "fastrand.h"
#include <stdlib.h>
@@ -20,7 +21,7 @@ $OpenBSD: patch-src_core_rand_fastrand_c
#include "isaac/rand.h"
#define FASTRAND_MAX ((unsigned int)(-1))
-@@ -54,3 +66,4 @@ unsigned int fastrand_max(unsigned int max)
+@@ -52,3 +64,4 @@ unsigned int fastrand_max(unsigned int max)
{
return fastrand()%(max+1);
}
Index: patches/patch-src_core_select_core_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_select_core_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_select_core_c
--- patches/patch-src_core_select_core_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_select_core_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_select_core_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/select_core.c.orig Mon May 15 22:51:55 2017
-+++ src/core/select_core.c Mon May 15 22:53:45 2017
-@@ -1513,7 +1513,11 @@ int select_sys_unique(str* res, select_t* s, struct si
+Index: src/core/select_core.c
+--- src/core/select_core.c.orig
++++ src/core/select_core.c
+@@ -1504,7 +1504,11 @@ int select_sys_unique(str* res, select_t* s, struct si
for (i = UNIQUE_ID_FIX_LEN, cb = 0, x = 0; i < UNIQUE_ID_FIX_LEN+UNIQUE_ID_RAND_LEN; i++) {
if (!cb) {
cb = rb;
Index: patches/patch-src_core_tcp_read_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_tcp_read_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_core_tcp_read_c
--- patches/patch-src_core_tcp_read_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_core_tcp_read_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_core_tcp_read_c,v 1.
Index: src/core/tcp_read.c
--- src/core/tcp_read.c.orig
+++ src/core/tcp_read.c
-@@ -1530,6 +1530,14 @@ void release_tcpconn(struct tcp_connection* c, long st
+@@ -1663,6 +1663,14 @@ void release_tcpconn(struct tcp_connection* c, long st
ip_addr2a(&c->rcv.src_ip), c->rcv.src_port,
ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);
LM_DBG("extra_data %p\n", c->extra_data);
Index: patches/patch-src_main_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_main_c
--- patches/patch-src_main_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_main_c 31 Mar 2018 09:00:39 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_main_c,v 1.2 2017/09
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
-@@ -1842,8 +1842,10 @@ int main(int argc, char** argv)
+@@ -1845,8 +1845,10 @@ int main(int argc, char** argv)
int proto;
char *options;
int ret;
@@ -13,7 +13,7 @@ Index: src/main.c
int debug_save, debug_flag;
int dont_fork_cnt;
struct name_lst* n_lst;
-@@ -2109,6 +2111,7 @@ int main(int argc, char** argv)
+@@ -2112,6 +2114,7 @@ int main(int argc, char** argv)
goto error;
}
@@ -21,7 +21,7 @@ Index: src/main.c
/* seed the prng */
/* try to use /dev/urandom if possible */
seed=0;
-@@ -2129,6 +2132,7 @@ try_again:
+@@ -2132,6 +2135,7 @@ try_again:
fastrand_seed(kam_rand());
srandom(kam_rand()+time(0));
LM_DBG("test random numbers %u %lu %u\n", kam_rand(), random(), fastrand());
Index: patches/patch-src_modules_db_berkeley_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_bdb_lib_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/bdb_lib.c.orig Mon May 15 23:34:21 2017
-+++ src/modules/db_berkeley/bdb_lib.c Mon May 15 23:34:56 2017
-@@ -666,7 +666,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+Index: src/modules/db_berkeley/bdb_lib.c
+--- src/modules/db_berkeley/bdb_lib.c.orig
++++ src/modules/db_berkeley/bdb_lib.c
+@@ -623,7 +623,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -686,7 +686,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -645,7 +645,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_db_berkeley_km_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_km_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_km_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_km_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_km_bdb_lib_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_km_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/km_bdb_lib.c.orig Mon May 15 23:35:24 2017
-+++ src/modules/db_berkeley/km_bdb_lib.c Mon May 15 23:36:06 2017
-@@ -719,7 +719,7 @@ int km_bdblib_create_journal(table_p _tp)
+Index: src/modules/db_berkeley/km_bdb_lib.c
+--- src/modules/db_berkeley/km_bdb_lib.c.orig
++++ src/modules/db_berkeley/km_bdb_lib.c
+@@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp)
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -740,7 +740,7 @@ int km_bdblib_create_journal(table_p _tp)
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -699,7 +699,7 @@ int km_bdblib_create_journal(table_p _tp)
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_ipops_detailed_ip_type_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_ipops_detailed_ip_type_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_ipops_detailed_ip_type_c
--- patches/patch-src_modules_ipops_detailed_ip_type_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_ipops_detailed_ip_type_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_ipops_detail
Index: src/modules/ipops/detailed_ip_type.c
--- src/modules/ipops/detailed_ip_type.c.orig
+++ src/modules/ipops/detailed_ip_type.c
-@@ -26,7 +26,7 @@
+@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <arpa/inet.h>
Index: patches/patch-src_modules_nat_traversal_nat_traversal_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_nat_traversal_nat_traversal_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_modules_nat_traversal_nat_traversal_c
--- patches/patch-src_modules_nat_traversal_nat_traversal_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_modules_nat_traversal_nat_traversal_c 31 Mar 2018 09:00:39 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-src_modules_nat_traversa
Index: src/modules/nat_traversal/nat_traversal.c
--- src/modules/nat_traversal/nat_traversal.c.orig
+++ src/modules/nat_traversal/nat_traversal.c
-@@ -1724,7 +1724,7 @@ restore_keepalive_state(void)
- res = fscanf(f, STATE_FILE_HEADER); // skip header
+@@ -1754,7 +1754,7 @@ static void restore_keepalive_state(void)
+ res = fscanf(f, STATE_FILE_HEADER); // skip header
- while (true) {
-- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime);
-+ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime);
- if (res == EOF) {
- if (ferror(f))
- LM_ERR("error while reading keepalive state file: %s\n", strerror(errno));
+ while(true) {
+- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime);
++ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime);
+ if(res == EOF) {
+ if(ferror(f))
+ LM_ERR("error while reading keepalive state file: %s\n",
Index: patches/patch-src_modules_rls_utils_c
===================================================================
RCS file: patches/patch-src_modules_rls_utils_c
diff -N patches/patch-src_modules_rls_utils_c
--- patches/patch-src_modules_rls_utils_c 21 Sep 2017 09:34:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_c,v 1.2 2017/09/21 09:34:32 sthen Exp $
-
-Index: src/modules/rls/utils.c
---- src/modules/rls/utils.c.orig
-+++ src/modules/rls/utils.c
-@@ -26,14 +26,14 @@
- #define SIP_PREFIX "sip:"
- #define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1
-
--str* normalize_sip_uri(const str *uri)
-+str* normalize_sip_uri(str *uri)
- {
- static str normalized_uri;
- static str null_str = {NULL, 0};
- static char buf[MAX_URI_SIZE];
-
- normalized_uri.s = buf;
-- if (un_escape((str *)uri, &normalized_uri) < 0)
-+ if (un_escape(uri, &normalized_uri) < 0)
- {
- LM_ERR("un-escaping URI\n");
- return &null_str;
Index: patches/patch-src_modules_rls_utils_h
===================================================================
RCS file: patches/patch-src_modules_rls_utils_h
diff -N patches/patch-src_modules_rls_utils_h
--- patches/patch-src_modules_rls_utils_h 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_h,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/rls/utils.h
---- src/modules/rls/utils.h.orig
-+++ src/modules/rls/utils.h
-@@ -26,6 +26,6 @@
-
- #include "../../core/ut.h"
-
--extern str* normalize_sip_uri(const str *uri);
-+extern str* normalize_sip_uri(str *uri);
-
- #endif
Index: patches/patch-src_modules_tls_tls_domain_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_domain_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_domain_c
--- patches/patch-src_modules_tls_tls_domain_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_domain_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,17 @@ $OpenBSD: patch-src_modules_tls_tls_doma
Index: src/modules/tls/tls_domain.c
--- src/modules/tls/tls_domain.c.orig
+++ src/modules/tls/tls_domain.c
-@@ -734,7 +734,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
+@@ -124,7 +124,8 @@ static void setup_dh(SSL_CTX *ctx)
+ return;
+ }
+
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+ /* libssl >= v1.1.0 */
+ DH_set0_pqg(dh, p, NULL, g);
+ #else
+@@ -734,7 +735,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
if(data==0)
data = (struct tls_extra_data*)SSL_get_app_data(ssl);
LOG(tls_dbg, "SSL handshake done\n");
@@ -12,7 +22,7 @@ Index: src/modules/tls/tls_domain.c
/* CVE-2009-3555 - disable renegotiation */
if (ssl->s3) {
LOG(tls_dbg, "SSL disable renegotiation\n");
-@@ -858,7 +858,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
+@@ -858,7 +859,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
*/
static int tls_ssl_ctx_set_freelist(SSL_CTX* ctx, long val, void* unused)
{
@@ -21,12 +31,13 @@ Index: src/modules/tls/tls_domain.c
if (val >= 0)
#if OPENSSL_VERSION_NUMBER >= 0x01000000L
#ifndef OPENSSL_NO_BUF_FREELISTS
-@@ -997,7 +997,7 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
+@@ -997,7 +998,8 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
memset(d->ctx, 0, sizeof(SSL_CTX*) * procs_no);
for(i = 0; i < procs_no; i++) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
if(d->method>TLS_USE_TLSvRANGE) {
d->ctx[i] = SSL_CTX_new(SSLv23_method());
Index: patches/patch-src_modules_tls_tls_init_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_tls_tls_init_c
--- patches/patch-src_modules_tls_tls_init_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_tls_tls_init_c 31 Mar 2018 09:00:39 -0000
@@ -3,131 +3,27 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.c
--- src/modules/tls/tls_init.c.orig
+++ src/modules/tls/tls_init.c
-@@ -119,7 +119,7 @@ to compile on the _target_ system)"
+@@ -119,7 +119,8 @@ static int tls_mod_initialized = 0;
int openssl_kssl_malloc_bug=0; /* is openssl bug #1467 present ? */
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
const SSL_METHOD* ssl_methods[TLS_METHOD_MAX];
#else
sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
-@@ -143,7 +143,7 @@ sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
- */
-
-
--
-+#ifndef LIBRESSL_VERSION_NUMBER
- inline static char* buf_append(char* buf, char* end, char* str, int str_len)
- {
- if ( (buf+str_len)<end){
-@@ -321,6 +321,7 @@ static void ser_free(void *ptr, const char *fname, int
- }
- #endif
-
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- /*
- * Initialize TLS socket
-@@ -356,7 +357,7 @@ error:
+@@ -361,7 +362,8 @@ error:
*/
static void init_ssl_methods(void)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
memset(ssl_methods, 0, sizeof(ssl_methods));
-@@ -366,7 +367,7 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_SSLv23 - 1] = SSLv23_method();
-
- /* only specific SSL or TLS version */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_SSL2
- ssl_methods[TLS_USE_SSLv2_cli - 1] = SSLv2_client_method();
- ssl_methods[TLS_USE_SSLv2_srv - 1] = SSLv2_server_method();
-@@ -384,13 +385,13 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
- ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method();
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method();
- ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method();
- ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method();
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method();
- ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method();
- ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method();
-@@ -399,11 +400,11 @@ static void init_ssl_methods(void)
- /* ranges of TLS versions (require a minimum TLS version) */
- ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS;
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_PLUS - 1] = (void*)TLS_OP_TLSv1_1_PLUS;
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS;
- #endif
-
-@@ -477,6 +478,7 @@ static void init_ssl_methods(void)
- */
- static int init_tls_compression(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- #if OPENSSL_VERSION_NUMBER >= 0x00908000L
- int n, r;
-@@ -563,6 +565,7 @@ static int init_tls_compression(void)
- end:
- #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8 */
- #endif /* OPENSSL_VERSION_NUMBER < 1.1.0 */
-+#endif /* LIBRESSL_VERSION_NUMBER */
- return 0;
- }
-
-@@ -573,6 +576,7 @@ end:
- */
- int tls_pre_init(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- void *(*mf)(size_t) = NULL;
- void *(*rf)(void *, size_t) = NULL;
-@@ -599,6 +603,7 @@ int tls_pre_init(void)
- " (can be loaded first to be safe)\n");
- return -1;
- }
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- if (tls_init_locks()<0)
- return -1;
-@@ -632,7 +637,7 @@ int init_tls_h(void)
- {
- /*struct socket_info* si;*/
- long ssl_version;
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
- int lib_kerberos;
- int lib_zlib;
- int kerberos_support;
-@@ -676,7 +681,7 @@ int init_tls_h(void)
- }
-
- /* check kerberos support using compile flags only for version < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef TLS_KERBEROS_SUPPORT
- kerberos_support=1;
-@@ -847,7 +852,7 @@ void destroy_tls_h(void)
+@@ -857,7 +859,7 @@ void destroy_tls_h(void)
tls_destroy_cfg();
tls_destroy_locks();
tls_ct_wq_destroy();
@@ -135,4 +31,4 @@ Index: src/modules/tls/tls_init.c
+#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
/* explicit execution of libssl cleanup to avoid being executed again
* by atexit(), when shm is gone */
- DBG("executing openssl v1.1+ cleanup\n");
+ LM_DBG("executing openssl v1.1+ cleanup\n");
Index: patches/patch-src_modules_tls_tls_init_h
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_init_h
--- patches/patch-src_modules_tls_tls_init_h 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_init_h 31 Mar 2018 09:00:39 -0000
@@ -3,12 +3,13 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.h
--- src/modules/tls/tls_init.h.orig
+++ src/modules/tls/tls_init.h
-@@ -45,7 +45,7 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
+@@ -45,7 +45,8 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
extern const SSL_METHOD* ssl_methods[];
#else
typedef struct sr_tls_methods_s {
Index: patches/patch-src_modules_tls_tls_locking_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_locking_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_locking_c
--- patches/patch-src_modules_tls_tls_locking_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_locking_c 31 Mar 2018 09:00:39 -0000
@@ -3,21 +3,43 @@ $OpenBSD: patch-src_modules_tls_tls_lock
Index: src/modules/tls/tls_locking.c
--- src/modules/tls/tls_locking.c.orig
+++ src/modules/tls/tls_locking.c
-@@ -33,7 +33,7 @@ static int n_static_locks=0;
+@@ -33,7 +33,8 @@ static int n_static_locks=0;
static gen_lock_set_t* static_locks=0;
/* OpenSSL is thread-safe since 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* "dynamic" locks */
-@@ -168,7 +168,7 @@ int tls_init_locks()
+@@ -94,8 +95,8 @@ static void dyn_destroy_f(struct CRYPTO_dynlock_value
+ shm_free(l);
+ }
+
++#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ /* normal locking callback */
+ static void locking_f(int mode, int n, const char* file, int line)
+ {
+@@ -118,9 +119,7 @@ static void locking_f(int mode, int n, const char* fil
+ }
+ }
+
+-#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ void tls_destroy_locks()
+ {
+ if (static_locks){
+@@ -168,7 +167,8 @@ int tls_init_locks()
}
/* OpenSSL is thread-safe since 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* set "dynamic" locks callbacks */
CRYPTO_set_dynlock_create_callback(dyn_create_f);
CRYPTO_set_dynlock_lock_callback(dyn_lock_f);
Index: patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
--- patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_xhttp_pi_xht
Index: src/modules/xhttp_pi/xhttp_pi_fnc.c
--- src/modules/xhttp_pi/xhttp_pi_fnc.c.orig
+++ src/modules/xhttp_pi/xhttp_pi_fnc.c
-@@ -3193,7 +3193,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3186,7 +3186,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
val_str.len = max_page_len - ctx->reply.body.len;
if(db_time2str(values[j].val.time_val,
val_str.s, &val_str.len)!=0){
@@ -12,7 +12,7 @@ Index: src/modules/xhttp_pi/xhttp_pi_fnc
values[j].val.time_val);
goto error;
}
-@@ -3201,7 +3201,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3194,7 +3194,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
ctx->reply.body.len += val_str.len;
if(link_on) XHTTP_PI_COPY_2(p,XHTTP_PI_SQUOT_GT,val_str);
LM_DBG(" got %.*s[%d]=>"
Index: patches/patch-src_modules_xmlrpc_xmlrpc_c
===================================================================
RCS file: patches/patch-src_modules_xmlrpc_xmlrpc_c
diff -N patches/patch-src_modules_xmlrpc_xmlrpc_c
--- patches/patch-src_modules_xmlrpc_xmlrpc_c 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_modules_xmlrpc_xmlrpc_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/xmlrpc/xmlrpc.c
---- src/modules/xmlrpc/xmlrpc.c.orig
-+++ src/modules/xmlrpc/xmlrpc.c
-@@ -19,7 +19,7 @@
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
- /*This define breaks on Solaris OS */
--#ifndef __OS_solaris
-+#if !defined (__OS_solaris) && !defined (__OpenBSD__)
- #define _XOPEN_SOURCE 4 /* strptime */
- #endif
- #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
Index: patches/patch-utils_kamctl_kamctl_base
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl_base,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctl_base
--- patches/patch-utils_kamctl_kamctl_base 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-utils_kamctl_kamctl_base 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-utils_kamctl_kamctl_base,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- utils/kamctl/kamctl.base.orig Wed Apr 5 16:32:39 2017
-+++ utils/kamctl/kamctl.base Mon May 15 21:48:56 2017
-@@ -556,7 +556,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
+Index: utils/kamctl/kamctl.base
+--- utils/kamctl/kamctl.base.orig
++++ utils/kamctl/kamctl.base
+@@ -559,7 +559,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
mdbg() {
if [ "0$VERBOSE" -ne 0 ] ; then
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +11,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -565,7 +565,7 @@ mdbg() {
+@@ -568,7 +568,7 @@ mdbg() {
mwarn() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +20,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** WARNING: $1"
fi
-@@ -573,7 +573,7 @@ mwarn() {
+@@ -576,7 +576,7 @@ mwarn() {
minfo() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +29,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** INFO: $1"
fi
-@@ -581,7 +581,7 @@ minfo() {
+@@ -584,7 +584,7 @@ minfo() {
mecho() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +38,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -589,7 +589,7 @@ mecho() {
+@@ -592,7 +592,7 @@ mecho() {
merr() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
Index: patches/patch-utils_kamctl_kamctlrc
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctlrc,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctlrc
--- patches/patch-utils_kamctl_kamctlrc 20 Mar 2018 22:03:35 -0000 1.5
+++ patches/patch-utils_kamctl_kamctlrc 31 Mar 2018 09:00:39 -0000
@@ -11,7 +11,7 @@ Index: utils/kamctl/kamctlrc
# awk tool
# AWK="awk"
-@@ -151,8 +151,11 @@
+@@ -155,8 +155,11 @@
## Kamailio START Options
## PID file path - default is: /var/run/kamailio.pid
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 3 Jul 2017 22:14:20 -0000 1.6
+++ pkg/PLIST-main 31 Mar 2018 09:00:39 -0000
@@ -19,8 +19,10 @@ lib/kamailio/kamctl/kamdbctl.dbtext
@lib lib/kamailio/libtrie.so.${LIBtrie_VERSION}
lib/kamailio/modules/
lib/kamailio/modules/acc.so
+lib/kamailio/modules/acc_diameter.so
lib/kamailio/modules/alias_db.so
lib/kamailio/modules/app_jsdt.so
+lib/kamailio/modules/app_sqlang.so
lib/kamailio/modules/async.so
lib/kamailio/modules/auth.so
lib/kamailio/modules/auth_db.so
@@ -32,6 +34,7 @@ lib/kamailio/modules/avpops.so
lib/kamailio/modules/benchmark.so
lib/kamailio/modules/blst.so
lib/kamailio/modules/call_control.so
+lib/kamailio/modules/call_obj.so
lib/kamailio/modules/cfg_db.so
lib/kamailio/modules/cfg_rpc.so
lib/kamailio/modules/cfgt.so
@@ -56,6 +59,7 @@ lib/kamailio/modules/domain.so
lib/kamailio/modules/domainpolicy.so
lib/kamailio/modules/drouting.so
lib/kamailio/modules/enum.so
+lib/kamailio/modules/evrexec.so
lib/kamailio/modules/exec.so
lib/kamailio/modules/group.so
lib/kamailio/modules/htable.so
@@ -64,6 +68,7 @@ lib/kamailio/modules/http_client.so
lib/kamailio/modules/imc.so
lib/kamailio/modules/ipops.so
lib/kamailio/modules/jsonrpcs.so
+lib/kamailio/modules/keepalive.so
lib/kamailio/modules/kex.so
lib/kamailio/modules/lcr.so
lib/kamailio/modules/log_custom.so
@@ -103,6 +108,7 @@ lib/kamailio/modules/sca.so
lib/kamailio/modules/sdpops.so
lib/kamailio/modules/seas.so
lib/kamailio/modules/sipcapture.so
+lib/kamailio/modules/sipdump.so
lib/kamailio/modules/sipt.so
lib/kamailio/modules/siptrace.so
lib/kamailio/modules/siputils.so
@@ -159,8 +165,10 @@ share/doc/kamailio/INSTALL
share/doc/kamailio/README
share/doc/kamailio/modules/
share/doc/kamailio/modules/README.acc
+share/doc/kamailio/modules/README.acc_diameter
share/doc/kamailio/modules/README.alias_db
share/doc/kamailio/modules/README.app_jsdt
+share/doc/kamailio/modules/README.app_sqlang
share/doc/kamailio/modules/README.async
share/doc/kamailio/modules/README.auth
share/doc/kamailio/modules/README.auth_db
@@ -172,6 +180,7 @@ share/doc/kamailio/modules/README.avpops
share/doc/kamailio/modules/README.benchmark
share/doc/kamailio/modules/README.blst
share/doc/kamailio/modules/README.call_control
+share/doc/kamailio/modules/README.call_obj
share/doc/kamailio/modules/README.cfg_db
share/doc/kamailio/modules/README.cfg_rpc
share/doc/kamailio/modules/README.cfgt
@@ -196,6 +205,7 @@ share/doc/kamailio/modules/README.domain
share/doc/kamailio/modules/README.domainpolicy
share/doc/kamailio/modules/README.drouting
share/doc/kamailio/modules/README.enum
+share/doc/kamailio/modules/README.evrexec
share/doc/kamailio/modules/README.exec
share/doc/kamailio/modules/README.group
share/doc/kamailio/modules/README.htable
@@ -204,6 +214,7 @@ share/doc/kamailio/modules/README.http_c
share/doc/kamailio/modules/README.imc
share/doc/kamailio/modules/README.ipops
share/doc/kamailio/modules/README.jsonrpcs
+share/doc/kamailio/modules/README.keepalive
share/doc/kamailio/modules/README.kex
share/doc/kamailio/modules/README.lcr
share/doc/kamailio/modules/README.log_custom
@@ -243,6 +254,7 @@ share/doc/kamailio/modules/README.sca
share/doc/kamailio/modules/README.sdpops
share/doc/kamailio/modules/README.seas
share/doc/kamailio/modules/README.sipcapture
+share/doc/kamailio/modules/README.sipdump
share/doc/kamailio/modules/README.sipt
share/doc/kamailio/modules/README.siptrace
share/doc/kamailio/modules/README.siputils
@@ -288,8 +300,6 @@ share/doc/kamailio/modules/README.xprint
share/examples/kamailio/
@sample ${SYSCONFDIR}/kamailio/
@comment share/examples/kamailio/dictionary.kamailio
-share/examples/kamailio/kamailio-advanced.cfg
-share/examples/kamailio/kamailio-basic.cfg
share/examples/kamailio/kamailio.cfg
@sample ${SYSCONFDIR}/kamailio/kamailio.cfg
share/examples/kamailio/kamctlrc
Hi ports@,
This is update kamailio port.
Changelog:
- update to version 5.1.2
- sync pathes
- sync WANTLIB
- switch to compile with system malloc
Tested on current amd64.
Ok? Comments?
===================================================================
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile 20 Mar 2018 22:03:35 -0000 1.44
+++ Makefile 31 Mar 2018 09:00:39 -0000
@@ -2,7 +2,7 @@
COMMENT-main = mature and flexible open source SIP server
-VERSION = 5.0.6
+VERSION = 5.1.2
DISTNAME = kamailio-${VERSION}_src
@@ -21,25 +21,26 @@ PKGNAME-radius = kamailio-radius-${VERSI
CATEGORIES = telephony
MAINTAINER = Roman Kravchuk <kravchuk.kp@gmail.com>
-HOMEPAGE = http://www.kamailio.org/
+HOMEPAGE = https://www.kamailio.org/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-SHARED_LIBS = srdb1 4.0 # 1.0
-SHARED_LIBS += srdb2 4.0 # 1.0
-SHARED_LIBS += trie 4.0 # 1.0
-SHARED_LIBS += srutils 3.0 # 1.0
+SHARED_LIBS = srdb1 5.0 # 1.0
+SHARED_LIBS += srdb2 5.0 # 1.0
+SHARED_LIBS += trie 5.0 # 1.0
+SHARED_LIBS += srutils 4.0 # 1.0
MAKE_ENV = CC="${CC}" \
CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS -DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
LD_EXTRA_OPTS="${LDFLAGS} -pthread -L${LOCALBASE}/lib"
-MASTER_SITES = http://www.kamailio.org/pub/kamailio/${VERSION}/src/
+MASTER_SITES = https://www.kamailio.org/pub/kamailio/${VERSION}/src/
WRKDIST = ${WRKDIR}/kamailio-${VERSION}
-WANTLIB-main = c crypto curl expat event_core event_extra iconv m \
- pcre pthread ssl lzma xml2 curses readline unistring z
+WANTLIB-main = c crypto curl curses expat event_core event_extra iconv m \
+ pcre pthread ssl lzma xml2 ncurses readline unistring z \
+ ${COMPILER_LIBCXX}
LIB_DEPENDS-main = converters/libiconv \
converters/libunistring \
@@ -53,6 +54,7 @@ KAMAILIO_GROUPS = kstandard kcpl khttp_a
FLAVOR ?=
MULTI_PACKAGES = -main
+CONFIGURE_STYLE = No
USE_GMAKE = Yes
NO_TEST = Yes
@@ -62,15 +64,20 @@ MAKE_FLAGS = LIBDIR=lib \
cfg-prefix=${WRKINST} \
cfg_dir=share/examples/kamailio/ \
cfg_target=${SYSCONFDIR}/kamailio/ \
- run_target=${VARBASE}/run/kamailio/ \
+ run_target=${VARBASE}/run/kamailio \
QUIET=verbose \
RADCLI=1 \
SCTP=0 \
+ MEMPKG=sys \
group_include="${KAMAILIO_GROUPS}" \
LIBsrdb1_VERSION=${LIBsrdb1_VERSION} \
LIBsrdb2_VERSION=${LIBsrdb2_VERSION} \
LIBtrie_VERSION=${LIBtrie_VERSION} \
LIBsrutils_VERSION=${LIBsrutils_VERSION} \
+
+MODULES = lang/python
+MODPY_BUILDDEP = No
+MODPY_ADJ_FILES = utils/kamctl/dbtextdb/dbtextdb.py
PSEUDO_FLAVORS += no_berkeley
.if !${FLAVOR:Mno_berkeley}
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/kamailio/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 20 Mar 2018 22:03:35 -0000 1.10
+++ distinfo 31 Mar 2018 09:00:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (kamailio-5.0.6_src.tar.gz) = yhYma1WYZtWMa3fyNfvPXwcfYnSSwo8z7PWY5B2V1Co=
-SIZE (kamailio-5.0.6_src.tar.gz) = 11724268
+SHA256 (kamailio-5.1.2_src.tar.gz) = bsnO+h+gt+IJDkHzQXLbUR2vonwMEeK4whQLyHWxa10=
+SIZE (kamailio-5.1.2_src.tar.gz) = 12010615
Index: patches/patch-etc_kamailio_cfg
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-etc_kamailio_cfg,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-etc_kamailio_cfg
--- patches/patch-etc_kamailio_cfg 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-etc_kamailio_cfg 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-etc_kamailio_cfg,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- etc/kamailio.cfg.orig Wed Apr 5 16:32:38 2017
-+++ etc/kamailio.cfg Mon May 15 21:48:56 2017
-@@ -160,6 +160,9 @@ log_facility=LOG_LOCAL0
+Index: etc/kamailio.cfg
+--- etc/kamailio.cfg.orig
++++ etc/kamailio.cfg
+@@ -161,6 +161,9 @@ log_prefix="{$mt $hdr(CSeq) $ci} "
/* number of SIP routing processes */
children=8
Index: patches/patch-src_core_rand_fastrand_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_rand_fastrand_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_rand_fastrand_c
--- patches/patch-src_core_rand_fastrand_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_rand_fastrand_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_rand_fastrand_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/rand/fastrand.c.orig Mon May 15 22:48:56 2017
-+++ src/core/rand/fastrand.c Mon May 15 22:50:19 2017
-@@ -25,6 +25,18 @@
+Index: src/core/rand/fastrand.c
+--- src/core/rand/fastrand.c.orig
++++ src/core/rand/fastrand.c
+@@ -23,6 +23,18 @@
#include "fastrand.h"
#include <stdlib.h>
@@ -20,7 +21,7 @@ $OpenBSD: patch-src_core_rand_fastrand_c
#include "isaac/rand.h"
#define FASTRAND_MAX ((unsigned int)(-1))
-@@ -54,3 +66,4 @@ unsigned int fastrand_max(unsigned int max)
+@@ -52,3 +64,4 @@ unsigned int fastrand_max(unsigned int max)
{
return fastrand()%(max+1);
}
Index: patches/patch-src_core_select_core_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_select_core_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_select_core_c
--- patches/patch-src_core_select_core_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_select_core_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_select_core_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/select_core.c.orig Mon May 15 22:51:55 2017
-+++ src/core/select_core.c Mon May 15 22:53:45 2017
-@@ -1513,7 +1513,11 @@ int select_sys_unique(str* res, select_t* s, struct si
+Index: src/core/select_core.c
+--- src/core/select_core.c.orig
++++ src/core/select_core.c
+@@ -1504,7 +1504,11 @@ int select_sys_unique(str* res, select_t* s, struct si
for (i = UNIQUE_ID_FIX_LEN, cb = 0, x = 0; i < UNIQUE_ID_FIX_LEN+UNIQUE_ID_RAND_LEN; i++) {
if (!cb) {
cb = rb;
Index: patches/patch-src_core_tcp_read_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_tcp_read_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_core_tcp_read_c
--- patches/patch-src_core_tcp_read_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_core_tcp_read_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_core_tcp_read_c,v 1.
Index: src/core/tcp_read.c
--- src/core/tcp_read.c.orig
+++ src/core/tcp_read.c
-@@ -1530,6 +1530,14 @@ void release_tcpconn(struct tcp_connection* c, long st
+@@ -1663,6 +1663,14 @@ void release_tcpconn(struct tcp_connection* c, long st
ip_addr2a(&c->rcv.src_ip), c->rcv.src_port,
ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);
LM_DBG("extra_data %p\n", c->extra_data);
Index: patches/patch-src_main_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_main_c
--- patches/patch-src_main_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_main_c 31 Mar 2018 09:00:39 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_main_c,v 1.2 2017/09
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
-@@ -1842,8 +1842,10 @@ int main(int argc, char** argv)
+@@ -1845,8 +1845,10 @@ int main(int argc, char** argv)
int proto;
char *options;
int ret;
@@ -13,7 +13,7 @@ Index: src/main.c
int debug_save, debug_flag;
int dont_fork_cnt;
struct name_lst* n_lst;
-@@ -2109,6 +2111,7 @@ int main(int argc, char** argv)
+@@ -2112,6 +2114,7 @@ int main(int argc, char** argv)
goto error;
}
@@ -21,7 +21,7 @@ Index: src/main.c
/* seed the prng */
/* try to use /dev/urandom if possible */
seed=0;
-@@ -2129,6 +2132,7 @@ try_again:
+@@ -2132,6 +2135,7 @@ try_again:
fastrand_seed(kam_rand());
srandom(kam_rand()+time(0));
LM_DBG("test random numbers %u %lu %u\n", kam_rand(), random(), fastrand());
Index: patches/patch-src_modules_db_berkeley_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_bdb_lib_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/bdb_lib.c.orig Mon May 15 23:34:21 2017
-+++ src/modules/db_berkeley/bdb_lib.c Mon May 15 23:34:56 2017
-@@ -666,7 +666,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+Index: src/modules/db_berkeley/bdb_lib.c
+--- src/modules/db_berkeley/bdb_lib.c.orig
++++ src/modules/db_berkeley/bdb_lib.c
+@@ -623,7 +623,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -686,7 +686,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -645,7 +645,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_db_berkeley_km_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_km_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_km_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_km_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_km_bdb_lib_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_km_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/km_bdb_lib.c.orig Mon May 15 23:35:24 2017
-+++ src/modules/db_berkeley/km_bdb_lib.c Mon May 15 23:36:06 2017
-@@ -719,7 +719,7 @@ int km_bdblib_create_journal(table_p _tp)
+Index: src/modules/db_berkeley/km_bdb_lib.c
+--- src/modules/db_berkeley/km_bdb_lib.c.orig
++++ src/modules/db_berkeley/km_bdb_lib.c
+@@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp)
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -740,7 +740,7 @@ int km_bdblib_create_journal(table_p _tp)
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -699,7 +699,7 @@ int km_bdblib_create_journal(table_p _tp)
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_ipops_detailed_ip_type_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_ipops_detailed_ip_type_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_ipops_detailed_ip_type_c
--- patches/patch-src_modules_ipops_detailed_ip_type_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_ipops_detailed_ip_type_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_ipops_detail
Index: src/modules/ipops/detailed_ip_type.c
--- src/modules/ipops/detailed_ip_type.c.orig
+++ src/modules/ipops/detailed_ip_type.c
-@@ -26,7 +26,7 @@
+@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <arpa/inet.h>
Index: patches/patch-src_modules_nat_traversal_nat_traversal_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_nat_traversal_nat_traversal_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_modules_nat_traversal_nat_traversal_c
--- patches/patch-src_modules_nat_traversal_nat_traversal_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_modules_nat_traversal_nat_traversal_c 31 Mar 2018 09:00:39 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-src_modules_nat_traversa
Index: src/modules/nat_traversal/nat_traversal.c
--- src/modules/nat_traversal/nat_traversal.c.orig
+++ src/modules/nat_traversal/nat_traversal.c
-@@ -1724,7 +1724,7 @@ restore_keepalive_state(void)
- res = fscanf(f, STATE_FILE_HEADER); // skip header
+@@ -1754,7 +1754,7 @@ static void restore_keepalive_state(void)
+ res = fscanf(f, STATE_FILE_HEADER); // skip header
- while (true) {
-- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime);
-+ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime);
- if (res == EOF) {
- if (ferror(f))
- LM_ERR("error while reading keepalive state file: %s\n", strerror(errno));
+ while(true) {
+- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime);
++ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime);
+ if(res == EOF) {
+ if(ferror(f))
+ LM_ERR("error while reading keepalive state file: %s\n",
Index: patches/patch-src_modules_rls_utils_c
===================================================================
RCS file: patches/patch-src_modules_rls_utils_c
diff -N patches/patch-src_modules_rls_utils_c
--- patches/patch-src_modules_rls_utils_c 21 Sep 2017 09:34:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_c,v 1.2 2017/09/21 09:34:32 sthen Exp $
-
-Index: src/modules/rls/utils.c
---- src/modules/rls/utils.c.orig
-+++ src/modules/rls/utils.c
-@@ -26,14 +26,14 @@
- #define SIP_PREFIX "sip:"
- #define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1
-
--str* normalize_sip_uri(const str *uri)
-+str* normalize_sip_uri(str *uri)
- {
- static str normalized_uri;
- static str null_str = {NULL, 0};
- static char buf[MAX_URI_SIZE];
-
- normalized_uri.s = buf;
-- if (un_escape((str *)uri, &normalized_uri) < 0)
-+ if (un_escape(uri, &normalized_uri) < 0)
- {
- LM_ERR("un-escaping URI\n");
- return &null_str;
Index: patches/patch-src_modules_rls_utils_h
===================================================================
RCS file: patches/patch-src_modules_rls_utils_h
diff -N patches/patch-src_modules_rls_utils_h
--- patches/patch-src_modules_rls_utils_h 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_h,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/rls/utils.h
---- src/modules/rls/utils.h.orig
-+++ src/modules/rls/utils.h
-@@ -26,6 +26,6 @@
-
- #include "../../core/ut.h"
-
--extern str* normalize_sip_uri(const str *uri);
-+extern str* normalize_sip_uri(str *uri);
-
- #endif
Index: patches/patch-src_modules_tls_tls_domain_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_domain_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_domain_c
--- patches/patch-src_modules_tls_tls_domain_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_domain_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,17 @@ $OpenBSD: patch-src_modules_tls_tls_doma
Index: src/modules/tls/tls_domain.c
--- src/modules/tls/tls_domain.c.orig
+++ src/modules/tls/tls_domain.c
-@@ -734,7 +734,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
+@@ -124,7 +124,8 @@ static void setup_dh(SSL_CTX *ctx)
+ return;
+ }
+
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+ /* libssl >= v1.1.0 */
+ DH_set0_pqg(dh, p, NULL, g);
+ #else
+@@ -734,7 +735,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
if(data==0)
data = (struct tls_extra_data*)SSL_get_app_data(ssl);
LOG(tls_dbg, "SSL handshake done\n");
@@ -12,7 +22,7 @@ Index: src/modules/tls/tls_domain.c
/* CVE-2009-3555 - disable renegotiation */
if (ssl->s3) {
LOG(tls_dbg, "SSL disable renegotiation\n");
-@@ -858,7 +858,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
+@@ -858,7 +859,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
*/
static int tls_ssl_ctx_set_freelist(SSL_CTX* ctx, long val, void* unused)
{
@@ -21,12 +31,13 @@ Index: src/modules/tls/tls_domain.c
if (val >= 0)
#if OPENSSL_VERSION_NUMBER >= 0x01000000L
#ifndef OPENSSL_NO_BUF_FREELISTS
-@@ -997,7 +997,7 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
+@@ -997,7 +998,8 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
memset(d->ctx, 0, sizeof(SSL_CTX*) * procs_no);
for(i = 0; i < procs_no; i++) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
if(d->method>TLS_USE_TLSvRANGE) {
d->ctx[i] = SSL_CTX_new(SSLv23_method());
Index: patches/patch-src_modules_tls_tls_init_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_tls_tls_init_c
--- patches/patch-src_modules_tls_tls_init_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_tls_tls_init_c 31 Mar 2018 09:00:39 -0000
@@ -3,131 +3,27 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.c
--- src/modules/tls/tls_init.c.orig
+++ src/modules/tls/tls_init.c
-@@ -119,7 +119,7 @@ to compile on the _target_ system)"
+@@ -119,7 +119,8 @@ static int tls_mod_initialized = 0;
int openssl_kssl_malloc_bug=0; /* is openssl bug #1467 present ? */
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
const SSL_METHOD* ssl_methods[TLS_METHOD_MAX];
#else
sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
-@@ -143,7 +143,7 @@ sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
- */
-
-
--
-+#ifndef LIBRESSL_VERSION_NUMBER
- inline static char* buf_append(char* buf, char* end, char* str, int str_len)
- {
- if ( (buf+str_len)<end){
-@@ -321,6 +321,7 @@ static void ser_free(void *ptr, const char *fname, int
- }
- #endif
-
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- /*
- * Initialize TLS socket
-@@ -356,7 +357,7 @@ error:
+@@ -361,7 +362,8 @@ error:
*/
static void init_ssl_methods(void)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
memset(ssl_methods, 0, sizeof(ssl_methods));
-@@ -366,7 +367,7 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_SSLv23 - 1] = SSLv23_method();
-
- /* only specific SSL or TLS version */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_SSL2
- ssl_methods[TLS_USE_SSLv2_cli - 1] = SSLv2_client_method();
- ssl_methods[TLS_USE_SSLv2_srv - 1] = SSLv2_server_method();
-@@ -384,13 +385,13 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
- ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method();
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method();
- ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method();
- ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method();
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method();
- ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method();
- ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method();
-@@ -399,11 +400,11 @@ static void init_ssl_methods(void)
- /* ranges of TLS versions (require a minimum TLS version) */
- ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS;
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_PLUS - 1] = (void*)TLS_OP_TLSv1_1_PLUS;
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS;
- #endif
-
-@@ -477,6 +478,7 @@ static void init_ssl_methods(void)
- */
- static int init_tls_compression(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- #if OPENSSL_VERSION_NUMBER >= 0x00908000L
- int n, r;
-@@ -563,6 +565,7 @@ static int init_tls_compression(void)
- end:
- #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8 */
- #endif /* OPENSSL_VERSION_NUMBER < 1.1.0 */
-+#endif /* LIBRESSL_VERSION_NUMBER */
- return 0;
- }
-
-@@ -573,6 +576,7 @@ end:
- */
- int tls_pre_init(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- void *(*mf)(size_t) = NULL;
- void *(*rf)(void *, size_t) = NULL;
-@@ -599,6 +603,7 @@ int tls_pre_init(void)
- " (can be loaded first to be safe)\n");
- return -1;
- }
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- if (tls_init_locks()<0)
- return -1;
-@@ -632,7 +637,7 @@ int init_tls_h(void)
- {
- /*struct socket_info* si;*/
- long ssl_version;
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
- int lib_kerberos;
- int lib_zlib;
- int kerberos_support;
-@@ -676,7 +681,7 @@ int init_tls_h(void)
- }
-
- /* check kerberos support using compile flags only for version < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef TLS_KERBEROS_SUPPORT
- kerberos_support=1;
-@@ -847,7 +852,7 @@ void destroy_tls_h(void)
+@@ -857,7 +859,7 @@ void destroy_tls_h(void)
tls_destroy_cfg();
tls_destroy_locks();
tls_ct_wq_destroy();
@@ -135,4 +31,4 @@ Index: src/modules/tls/tls_init.c
+#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
/* explicit execution of libssl cleanup to avoid being executed again
* by atexit(), when shm is gone */
- DBG("executing openssl v1.1+ cleanup\n");
+ LM_DBG("executing openssl v1.1+ cleanup\n");
Index: patches/patch-src_modules_tls_tls_init_h
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_init_h
--- patches/patch-src_modules_tls_tls_init_h 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_init_h 31 Mar 2018 09:00:39 -0000
@@ -3,12 +3,13 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.h
--- src/modules/tls/tls_init.h.orig
+++ src/modules/tls/tls_init.h
-@@ -45,7 +45,7 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
+@@ -45,7 +45,8 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
extern const SSL_METHOD* ssl_methods[];
#else
typedef struct sr_tls_methods_s {
Index: patches/patch-src_modules_tls_tls_locking_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_locking_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_locking_c
--- patches/patch-src_modules_tls_tls_locking_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_locking_c 31 Mar 2018 09:00:39 -0000
@@ -3,21 +3,43 @@ $OpenBSD: patch-src_modules_tls_tls_lock
Index: src/modules/tls/tls_locking.c
--- src/modules/tls/tls_locking.c.orig
+++ src/modules/tls/tls_locking.c
-@@ -33,7 +33,7 @@ static int n_static_locks=0;
+@@ -33,7 +33,8 @@ static int n_static_locks=0;
static gen_lock_set_t* static_locks=0;
/* OpenSSL is thread-safe since 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* "dynamic" locks */
-@@ -168,7 +168,7 @@ int tls_init_locks()
+@@ -94,8 +95,8 @@ static void dyn_destroy_f(struct CRYPTO_dynlock_value
+ shm_free(l);
+ }
+
++#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ /* normal locking callback */
+ static void locking_f(int mode, int n, const char* file, int line)
+ {
+@@ -118,9 +119,7 @@ static void locking_f(int mode, int n, const char* fil
+ }
+ }
+
+-#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ void tls_destroy_locks()
+ {
+ if (static_locks){
+@@ -168,7 +167,8 @@ int tls_init_locks()
}
/* OpenSSL is thread-safe since 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* set "dynamic" locks callbacks */
CRYPTO_set_dynlock_create_callback(dyn_create_f);
CRYPTO_set_dynlock_lock_callback(dyn_lock_f);
Index: patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
--- patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_xhttp_pi_xht
Index: src/modules/xhttp_pi/xhttp_pi_fnc.c
--- src/modules/xhttp_pi/xhttp_pi_fnc.c.orig
+++ src/modules/xhttp_pi/xhttp_pi_fnc.c
-@@ -3193,7 +3193,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3186,7 +3186,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
val_str.len = max_page_len - ctx->reply.body.len;
if(db_time2str(values[j].val.time_val,
val_str.s, &val_str.len)!=0){
@@ -12,7 +12,7 @@ Index: src/modules/xhttp_pi/xhttp_pi_fnc
values[j].val.time_val);
goto error;
}
-@@ -3201,7 +3201,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3194,7 +3194,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
ctx->reply.body.len += val_str.len;
if(link_on) XHTTP_PI_COPY_2(p,XHTTP_PI_SQUOT_GT,val_str);
LM_DBG(" got %.*s[%d]=>"
Index: patches/patch-src_modules_xmlrpc_xmlrpc_c
===================================================================
RCS file: patches/patch-src_modules_xmlrpc_xmlrpc_c
diff -N patches/patch-src_modules_xmlrpc_xmlrpc_c
--- patches/patch-src_modules_xmlrpc_xmlrpc_c 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_modules_xmlrpc_xmlrpc_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/xmlrpc/xmlrpc.c
---- src/modules/xmlrpc/xmlrpc.c.orig
-+++ src/modules/xmlrpc/xmlrpc.c
-@@ -19,7 +19,7 @@
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
- /*This define breaks on Solaris OS */
--#ifndef __OS_solaris
-+#if !defined (__OS_solaris) && !defined (__OpenBSD__)
- #define _XOPEN_SOURCE 4 /* strptime */
- #endif
- #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
Index: patches/patch-utils_kamctl_kamctl_base
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl_base,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctl_base
--- patches/patch-utils_kamctl_kamctl_base 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-utils_kamctl_kamctl_base 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-utils_kamctl_kamctl_base,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- utils/kamctl/kamctl.base.orig Wed Apr 5 16:32:39 2017
-+++ utils/kamctl/kamctl.base Mon May 15 21:48:56 2017
-@@ -556,7 +556,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
+Index: utils/kamctl/kamctl.base
+--- utils/kamctl/kamctl.base.orig
++++ utils/kamctl/kamctl.base
+@@ -559,7 +559,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
mdbg() {
if [ "0$VERBOSE" -ne 0 ] ; then
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +11,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -565,7 +565,7 @@ mdbg() {
+@@ -568,7 +568,7 @@ mdbg() {
mwarn() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +20,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** WARNING: $1"
fi
-@@ -573,7 +573,7 @@ mwarn() {
+@@ -576,7 +576,7 @@ mwarn() {
minfo() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +29,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** INFO: $1"
fi
-@@ -581,7 +581,7 @@ minfo() {
+@@ -584,7 +584,7 @@ minfo() {
mecho() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +38,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -589,7 +589,7 @@ mecho() {
+@@ -592,7 +592,7 @@ mecho() {
merr() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
Index: patches/patch-utils_kamctl_kamctlrc
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctlrc,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctlrc
--- patches/patch-utils_kamctl_kamctlrc 20 Mar 2018 22:03:35 -0000 1.5
+++ patches/patch-utils_kamctl_kamctlrc 31 Mar 2018 09:00:39 -0000
@@ -11,7 +11,7 @@ Index: utils/kamctl/kamctlrc
# awk tool
# AWK="awk"
-@@ -151,8 +151,11 @@
+@@ -155,8 +155,11 @@
## Kamailio START Options
## PID file path - default is: /var/run/kamailio.pid
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 3 Jul 2017 22:14:20 -0000 1.6
+++ pkg/PLIST-main 31 Mar 2018 09:00:39 -0000
@@ -19,8 +19,10 @@ lib/kamailio/kamctl/kamdbctl.dbtext
@lib lib/kamailio/libtrie.so.${LIBtrie_VERSION}
lib/kamailio/modules/
lib/kamailio/modules/acc.so
+lib/kamailio/modules/acc_diameter.so
lib/kamailio/modules/alias_db.so
lib/kamailio/modules/app_jsdt.so
+lib/kamailio/modules/app_sqlang.so
lib/kamailio/modules/async.so
lib/kamailio/modules/auth.so
lib/kamailio/modules/auth_db.so
@@ -32,6 +34,7 @@ lib/kamailio/modules/avpops.so
lib/kamailio/modules/benchmark.so
lib/kamailio/modules/blst.so
lib/kamailio/modules/call_control.so
+lib/kamailio/modules/call_obj.so
lib/kamailio/modules/cfg_db.so
lib/kamailio/modules/cfg_rpc.so
lib/kamailio/modules/cfgt.so
@@ -56,6 +59,7 @@ lib/kamailio/modules/domain.so
lib/kamailio/modules/domainpolicy.so
lib/kamailio/modules/drouting.so
lib/kamailio/modules/enum.so
+lib/kamailio/modules/evrexec.so
lib/kamailio/modules/exec.so
lib/kamailio/modules/group.so
lib/kamailio/modules/htable.so
@@ -64,6 +68,7 @@ lib/kamailio/modules/http_client.so
lib/kamailio/modules/imc.so
lib/kamailio/modules/ipops.so
lib/kamailio/modules/jsonrpcs.so
+lib/kamailio/modules/keepalive.so
lib/kamailio/modules/kex.so
lib/kamailio/modules/lcr.so
lib/kamailio/modules/log_custom.so
@@ -103,6 +108,7 @@ lib/kamailio/modules/sca.so
lib/kamailio/modules/sdpops.so
lib/kamailio/modules/seas.so
lib/kamailio/modules/sipcapture.so
+lib/kamailio/modules/sipdump.so
lib/kamailio/modules/sipt.so
lib/kamailio/modules/siptrace.so
lib/kamailio/modules/siputils.so
@@ -159,8 +165,10 @@ share/doc/kamailio/INSTALL
share/doc/kamailio/README
share/doc/kamailio/modules/
share/doc/kamailio/modules/README.acc
+share/doc/kamailio/modules/README.acc_diameter
share/doc/kamailio/modules/README.alias_db
share/doc/kamailio/modules/README.app_jsdt
+share/doc/kamailio/modules/README.app_sqlang
share/doc/kamailio/modules/README.async
share/doc/kamailio/modules/README.auth
share/doc/kamailio/modules/README.auth_db
@@ -172,6 +180,7 @@ share/doc/kamailio/modules/README.avpops
share/doc/kamailio/modules/README.benchmark
share/doc/kamailio/modules/README.blst
share/doc/kamailio/modules/README.call_control
+share/doc/kamailio/modules/README.call_obj
share/doc/kamailio/modules/README.cfg_db
share/doc/kamailio/modules/README.cfg_rpc
share/doc/kamailio/modules/README.cfgt
@@ -196,6 +205,7 @@ share/doc/kamailio/modules/README.domain
share/doc/kamailio/modules/README.domainpolicy
share/doc/kamailio/modules/README.drouting
share/doc/kamailio/modules/README.enum
+share/doc/kamailio/modules/README.evrexec
share/doc/kamailio/modules/README.exec
share/doc/kamailio/modules/README.group
share/doc/kamailio/modules/README.htable
@@ -204,6 +214,7 @@ share/doc/kamailio/modules/README.http_c
share/doc/kamailio/modules/README.imc
share/doc/kamailio/modules/README.ipops
share/doc/kamailio/modules/README.jsonrpcs
+share/doc/kamailio/modules/README.keepalive
share/doc/kamailio/modules/README.kex
share/doc/kamailio/modules/README.lcr
share/doc/kamailio/modules/README.log_custom
@@ -243,6 +254,7 @@ share/doc/kamailio/modules/README.sca
share/doc/kamailio/modules/README.sdpops
share/doc/kamailio/modules/README.seas
share/doc/kamailio/modules/README.sipcapture
+share/doc/kamailio/modules/README.sipdump
share/doc/kamailio/modules/README.sipt
share/doc/kamailio/modules/README.siptrace
share/doc/kamailio/modules/README.siputils
@@ -288,8 +300,6 @@ share/doc/kamailio/modules/README.xprint
share/examples/kamailio/
@sample ${SYSCONFDIR}/kamailio/
@comment share/examples/kamailio/dictionary.kamailio
-share/examples/kamailio/kamailio-advanced.cfg
-share/examples/kamailio/kamailio-basic.cfg
share/examples/kamailio/kamailio.cfg
@sample ${SYSCONFDIR}/kamailio/kamailio.cfg
share/examples/kamailio/kamctlrc
Hi ports@,
This is update kamailio port.
Changelog:
- update to version 5.1.2
- sync pathes
- sync WANTLIB
- switch to compile with system malloc
Tested on current amd64.
Ok? Comments?
Subscribe to:
Posts (Atom)