CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 23:46:15 Modified files: productivity/gnucash: Makefile Log message: Don't pick up gmkdir.
Re: i3status: report wireless signal quality
* Jon Bernard wrote:
> * joshua stein wrote:
> > On Tue, 17 Jul 2018 at 21:42:46 -0400, Jon Bernard wrote:
> > > Hi ports,
> > >
> > > Here's a small patch to i3status to report wireless signal quality. If
> > > you're using the default configuration, you should see the '?' change to
> > > the current signal quality percentage.
> > >
> > > If this looks good I'll submit it upstream.
> > >
> > > OK?
> >
> > I'm already getting wireless signal quality with i3status, is this
> > not the same thing? My i3status.conf has:
> >
> > wireless iwm0 {
> > format_up = "up|%signal|%essid"
> > format_down = "down"
> > }
> >
> > which reports:
> >
> > [{"name":"wireless","instance":"iwm0","markup":"none","full_text":"up|
> > 76%|xxx"},...
>
> I think you're right. I thought signal was the raw value but it appears
> that i3status computes the percentage for %signal based on the max. The
> manpage doesn't even mention the signal field so that's fun. Thanks for
> looking at this, sorry for the noise.
This patch might make more sense then, it updates the openbsd default
configuration to use signal (which we support) instead of quality which
will always yield a '?'.
--
Jon
Index: x11/i3status/patches/patch-i3status_conf
===
RCS file: /cvs/ports/x11/i3status/patches/patch-i3status_conf,v
retrieving revision 1.16
diff -u -p -r1.16 patch-i3status_conf
--- x11/i3status/patches/patch-i3status_conf31 Jan 2017 18:47:56 -
1.16
+++ x11/i3status/patches/patch-i3status_conf18 Jul 2018 03:35:59 -
@@ -2,8 +2,9 @@ $OpenBSD: patch-i3status_conf,v 1.16 201
Adjust config file to be reasonably useful on OpenBSD out of the box.
i3status.conf.orig Tue Jan 31 19:44:46 2017
-+++ i3status.conf Tue Jan 31 19:46:10 2017
+Index: i3status.conf
+--- i3status.conf.orig
i3status.conf
@@ -7,6 +7,7 @@
# If the above line is not correctly displayed, fix your editor first!
@@ -30,7 +31,8 @@ Adjust config file to be reasonably usef
+}
+
wireless _first_ {
- format_up = "W: (%quality at %essid) %ip"
+-format_up = "W: (%quality at %essid) %ip"
++format_up = "W: (%signal at %essid) %ip"
format_down = "W: down"
}
Re: i3status: report wireless signal quality
* joshua stein wrote:
> On Tue, 17 Jul 2018 at 21:42:46 -0400, Jon Bernard wrote:
> > Hi ports,
> >
> > Here's a small patch to i3status to report wireless signal quality. If
> > you're using the default configuration, you should see the '?' change to
> > the current signal quality percentage.
> >
> > If this looks good I'll submit it upstream.
> >
> > OK?
>
> I'm already getting wireless signal quality with i3status, is this
> not the same thing? My i3status.conf has:
>
> wireless iwm0 {
> format_up = "up|%signal|%essid"
> format_down = "down"
> }
>
> which reports:
>
> [{"name":"wireless","instance":"iwm0","markup":"none","full_text":"up|
> 76%|xxx"},...
I think you're right. I thought signal was the raw value but it appears
that i3status computes the percentage for %signal based on the max. The
manpage doesn't even mention the signal field so that's fun. Thanks for
looking at this, sorry for the noise.
--
Jon
Re: i3status: report wireless signal quality
On Tue, 17 Jul 2018 at 21:42:46 -0400, Jon Bernard wrote:
> Hi ports,
>
> Here's a small patch to i3status to report wireless signal quality. If
> you're using the default configuration, you should see the '?' change to
> the current signal quality percentage.
>
> If this looks good I'll submit it upstream.
>
> OK?
I'm already getting wireless signal quality with i3status, is this
not the same thing? My i3status.conf has:
wireless iwm0 {
format_up = "up|%signal|%essid"
format_down = "down"
}
which reports:
[{"name":"wireless","instance":"iwm0","markup":"none","full_text":"up|
76%|xxx"},...
i3status: report wireless signal quality
Hi ports, Here's a small patch to i3status to report wireless signal quality. If you're using the default configuration, you should see the '?' change to the current signal quality percentage. If this looks good I'll submit it upstream. OK? -- Jon Index: x11/i3status/patches/patch-src_print_wireless_info_c === RCS file: /cvs/ports/x11/i3status/patches/patch-src_print_wireless_info_c,v retrieving revision 1.13 diff -u -p -r1.13 patch-src_print_wireless_info_c --- x11/i3status/patches/patch-src_print_wireless_info_c12 May 2018 14:03:46 - 1.13 +++ x11/i3status/patches/patch-src_print_wireless_info_c18 Jul 2018 01:28:42 - @@ -1,6 +1,7 @@ $OpenBSD: patch-src_print_wireless_info_c,v 1.13 2018/05/12 14:03:46 jasper Exp $ -warning: implicit declaration of function 'free' is invalid in C99 +* warning: implicit declaration of function 'free' is invalid in C99 +* report wireless signal quality Index: src/print_wireless_info.c --- src/print_wireless_info.c.orig @@ -12,3 +13,15 @@ Index: src/print_wireless_info.c #include #include #include +@@ -454,6 +455,11 @@ error1: + info->signal_level_max = nr.nr_max_rssi; + + info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; ++ ++info->quality = IEEE80211_NODEREQ_RSSI(); ++info->quality_max = 100; ++info->quality_average = 50; ++info->flags |= WIRELESS_INFO_FLAG_HAS_QUALITY; + } + } + }
[NEW] devel/py-progressbar2 and devel/py-python_utils
Had these submitted awhile ago and made some updates to them. Did not take MAINTAINER as they are my first few ports so I did not feel comfortable. These are needed for a few other applications I use so figured I would share with the community. Any changes needed or are these ok to merge? Thank you -- Edward Lopez-Acosta py-progressbar2_3.38.tar.gz Description: application/gzip py-python_utils_2.3.0.tar.gz Description: application/gzip
[NEW] www/mkdocs and www/py-livereload
Had these submitted awhile back and made requested changes to them. mkdocs has an alpha release out so I chose the last stable. Did not take MAINTAINER as these are some of my first ports. While I can learn from this I didn't think it was ideal at the moment. Any further changes needed or can these be merged? -- Edward Lopez-Acosta mkdocs_0.17.5.tar.gz Description: application/gzip py-livereload_2.5.2.tar.gz Description: application/gzip
MATE meta package
Is anyone working on this? If not I will give it a shot using the xfce meta package as an example. Figured I would ask before getting too far along with it. -- Edward Lopez-Acosta
Re: cad/xtrkcad
this thing never dies? Sent from my toaster > On 17. Jul 2018, at 09:57, Antoine Jacoutot wrote: > >> On Sun, Jul 15, 2018 at 01:04:29PM +0200, Klemens Nanni wrote: >>> On Sun, Jul 15, 2018 at 12:50:17PM +0200, Antoine Jacoutot wrote: >>> I would like to remove www/webkit from the tree. >>> As the pkg/MESSAGE tells you: >>> !!! WARNING: WebKitGTK+ 2.4 is known to have many security vulnerabilities >>> that >>> !!! will NOT be fixed. Avoid browsing with it. >>> >>> It's unmaintained code that takes a huge amount of time to build and which >>> only >>> consumer is... cad/xtrkcad. >> I'd like to see it go. >> >>> It looks like the most recent xtrkcad version from last May still uses the >>> *old* >>> webkit, so updating won't help. >>> >>> Should we just remove it until they move to webkitgtk4 (which is >>> maintained)? >> Sounds good to me. > > Anyone else? Should I just go ahead and remove it? > > -- > Antoine >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/07/17 10:32:10 Modified files: multimedia/mediainfo: Makefile distinfo Log message: maintenance update to 18.05
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/07/17 08:20:05 Added files: multimedia/x265/patches: patch-source_common_param_cpp Log message: fix build on non-x86, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: i...@cvs.openbsd.org2018/07/17 08:14:37 Modified files: sysutils/htop : Makefile sysutils/htop/patches: patch-openbsd_Platform_c Log message: Fix zero-index array bound bug
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 08:06:50 Modified files: security/py-cryptography: Tag: OPENBSD_6_3 Makefile Log message: only needs gcc not g++
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 08:06:24 Modified files: security/py-cryptography: Makefile Log message: only needs gcc not g++
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 07:59:25 Modified files: security/py-cryptography: Tag: OPENBSD_6_3 Makefile Log message: MFC compiler switch for gcc arches
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 07:53:25 Modified files: net/net-snmp : Makefile distinfo Log message: update to net-snmp 5.8 final release
Re: [maintainer update] Necessity to flavor net/toxic
On 2018/07/17 16:41, Leonid Bobrov wrote:
> From s...@spacehopper.org Tue Jul 17 10:28:21 2018
>
> On 2018/07/17 05:47, Leonid Bobrov wrote:
> > > Keep this with GH_TAGNAME=v0.8.2 and no PKGNAME and no V.
> >
> > If I don't set PKGNAME, then I get this:
> > $ env FLAVOR="no_x11" make show=FULLPKGNAME
> > toxic-0.8.2-no_x11p1
> > So I fixed that by taking a look at editors/vim
>
> Congratulations, you found a bug in GH_* handling :-)
>
> vim uses multi-packages so it's a different situation.
>
> This helps for net/toxic, but I need to do more testing.
>
> Good, I see that's committed to ports@, here's a fresh diff without two
> new patch files (but still that would look nice):
Thanks, committed with small tweaks:
- mention no_x11 in DESCR
- move the .if here to surround the "post-install:" line as well
> +
> +post-install:
> +.if ${FLAVOR:Mno_x11}
> + rm -Rf ${PREFIX}/share/applications/
> +.endif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 07:49:41 Modified files: net: Makefile Log message: hook toxic,no_x11 to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 07:49:23 Modified files: net/toxic : Makefile net/toxic/pkg : DESCR PLIST Added files: net/toxic/pkg : PFRAG.no-no_x11 Log message: add a "no_x11" flavour to net/toxic, from maintainer Leonid Bobrov with small tweaks
Re: [maintainer update] Necessity to flavor net/toxic
From s...@spacehopper.org Tue Jul 17 10:28:21 2018 On 2018/07/17 05:47, Leonid Bobrov wrote: > > Keep this with GH_TAGNAME=v0.8.2 and no PKGNAME and no V. > > If I don't set PKGNAME, then I get this: > $ env FLAVOR="no_x11" make show=FULLPKGNAME > toxic-0.8.2-no_x11p1 > So I fixed that by taking a look at editors/vim Congratulations, you found a bug in GH_* handling :-) vim uses multi-packages so it's a different situation. This helps for net/toxic, but I need to do more testing. Good, I see that's committed to ports@, here's a fresh diff without two new patch files (but still that would look nice): Index: Makefile === RCS file: /cvs/ports/net/Makefile,v retrieving revision 1.1078 diff -u -p -u -p -r1.1078 Makefile --- Makefile11 Jul 2018 20:58:13 - 1.1078 +++ Makefile17 Jul 2018 13:37:34 - @@ -711,6 +711,7 @@ SUBDIR += totd SUBDIR += toxcore SUBDIR += toxic + SUBDIR += toxic,no_x11 SUBDIR += trafshow SUBDIR += transmission SUBDIR += trickle Index: toxic/Makefile === RCS file: /cvs/ports/net/toxic/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- toxic/Makefile 27 Jun 2018 21:04:00 - 1.2 +++ toxic/Makefile 17 Jul 2018 13:37:34 - @@ -5,7 +5,7 @@ COMMENT = ncurses-based Tox client GH_ACCOUNT = Jfreegman GH_PROJECT = toxic GH_TAGNAME = v0.8.2 -REVISION = 0 +REVISION = 1 CATEGORIES = net @@ -14,27 +14,42 @@ MAINTAINER =Leonid Bobrov Index: toxic/pkg/PFRAG.no-no_x11 === RCS file: toxic/pkg/PFRAG.no-no_x11 diff -N toxic/pkg/PFRAG.no-no_x11 --- /dev/null 1 Jan 1970 00:00:00 - +++ toxic/pkg/PFRAG.no-no_x11 17 Jul 2018 13:37:34 - @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.no-no_x11,v$ +share/applications/toxic.desktop +@tag update-desktop-database Index: toxic/pkg/PLIST === RCS file: /cvs/ports/net/toxic/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- toxic/pkg/PLIST 27 Jun 2018 21:04:00 - 1.2 +++ toxic/pkg/PLIST 17 Jul 2018 13:37:34 - @@ -1,8 +1,8 @@ @comment $OpenBSD: PLIST,v 1.2 2018/06/27 21:04:00 espie Exp $ +!%%no_x11%% @bin bin/toxic @man man/man1/toxic.1 @man man/man5/toxic.conf.5 -share/applications/toxic.desktop share/toxic/ share/toxic/nameservers share/toxic/sounds/ @@ -15,4 +15,3 @@ share/toxic/sounds/ToxicRecvMessage.wav share/toxic/sounds/ToxicTransferComplete.wav share/toxic/sounds/ToxicTransferStart.wav share/toxic/toxic.conf.example -@tag update-desktop-database
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 07:22:45 Modified files: mail/neomutt : Makefile distinfo mail/neomutt/patches: patch-newsrc_c Log message: update to neomutt-20180716
Re: [diff] www/nextcloud: README root strip leftover
On [17/07/18] [09:41P], Clemens Gößnitzer wrote:
Am 2018-07-17 11:21, schrieb Klemens Nanni:
On Tue, Jul 17, 2018 at 11:03:27AM +0200, Clemens Gößnitzer wrote:
That turns it into the exact two lines which are used in the next
`location "/*"' block as well. Would it be worth to somehow combine
these? Just wondering.
done.
diff attached
Please send diffs inline instead of attaching them.
--- ports/www/nextcloud/pkg/README.orig 2018-07-17
09:21:51.171310863 +0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 10:54:36.180614774 +0200
@@ -34,6 +34,9 @@
server "domain.tld" {
listen on egress tls port 443
+root "/nextcloud"
+request strip 1
+
tls {
certificate "/etc/ssl/domain.tld_fullchain.pem"
key "/etc/ssl/private/domain.tld_private.pem"
@@ -62,14 +65,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
fastcgi socket "/run/php-fpm.sock"
}
-
-location "/*" {
-root "/nextcloud"
-request strip 1
-}
}
You now moved this above `location "/console*"', did you confirm this
path still works and is not stripped with that configuration?
I can't confirm on -current, I only have -stable servers at hand, and
the
'location "foo" { block }' directives still work when moving "root
strip 1" to
the top of the server definition on -stable. Maybe someone with a
-current
system can confirm that this does not break the '{ block }' directives?
Or we just correct the root -> request issue for now:
--- ports/www/nextcloud/Makefile.orig 2018-07-17 10:55:01.400888144
+0200
+++ ports/www/nextcloud/Makefile2018-07-17 10:55:06.880947541
+0200
@@ -5,7 +5,7 @@
V= 13.0.4
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 1
+REVISION= 2
CATEGORIES=www
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
+0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 11:38:54.317266559
+0200
@@ -62,7 +62,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
+root "/nextcloud"
+request strip 1
fastcgi socket "/run/php-fpm.sock"
}
Better and less complex diff for Nextcloud, while here, also fix for Owncloud.
--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile19 Jun 2018 13:47:54 - 1.20
+++ Makefile17 Jul 2018 13:14:12 -
@@ -5,7 +5,7 @@ COMMENT=easy and universal access to s
V= 13.0.4
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 1
+REVISION= 2
CATEGORIES=www
Index: pkg/README
===
RCS file: /cvs/ports/www/nextcloud/pkg/README,v
retrieving revision 1.5
diff -u -p -r1.5 README
--- pkg/README 19 Jun 2018 13:47:54 - 1.5
+++ pkg/README 17 Jul 2018 13:14:14 -
@@ -32,44 +32,49 @@ httpd(8) example configuration for Nextc
---8<---
server "domain.tld" {
-listen on egress tls port 443
+ listen on * tls port 443
+ #listen on * port 80
+ alias "www.domain.tld"
-tls {
-certificate "/etc/ssl/domain.tld_fullchain.pem"
-key "/etc/ssl/private/domain.tld_private.pem"
-}
-
-# First deny access to the specified files
-location "/db_structure.xml"{ block }
-location "/.ht*"{ block }
-location "/README" { block }
-location "/data*" { block }
-location "/config*" { block }
-location "/build*" { block }
-location "/tests*" { block }
-location "/config*" { block }
-location "/lib*"{ block }
-location "/3rdparty*" { block }
-location "/templates*" { block }
-location "/data*" { block }
-location "/.ht*"{ block }
-location "/.user*" { block }
-location "/autotest*" { block }
-location "/occ*"{ block }
-location "/issue*" { block }
-location "/indie*" { block }
-location "/db_*"{ block }
-location "/console*"{ block }
-
-location "/*.php*" {
-root { "/nextcloud", strip 1 }
-fastcgi socket "/run/php-fpm.sock"
-}
-
-location "/*" {
-root "/nextcloud"
-request strip 1
-}
+ directory index "index.php"
+ root "/nextcloud"
+ request strip 1
+
+ hsts max-age 15768000
+
+ tls {
+ certificate
Re: enable python3 in libfwnt
On 2018/07/17 13:37, Remi Pointel wrote:
> Hi,
>
> this is the diff to build libfwnt with python 3.6 too, to anticipate the
> plaso version compatible with python 3.
Not a big fan of py2+py3 in the same "libfwnt" package .. is this useful
for anything other than plaso + dependencies? I'm wondering if you can get
away with just switching it to py3..
> Ok?
>
> Cheers,
>
> Remi.
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/libfwnt/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile
> --- Makefile 1 Feb 2018 13:24:15 - 1.2
> +++ Makefile 17 Jul 2018 11:18:23 -
> @@ -5,6 +5,7 @@ COMMENT = library for Windows NT data ty
> VERSION =20180117
> DISTNAME = libfwnt-alpha-${VERSION}
> PKGNAME =${DISTNAME:S/-alpha//}
> +REVISION = 0
>
> SHARED_LIBS += fwnt 0.0 # 1.0
>
> @@ -19,14 +20,22 @@ MAINTAINER = Remi Pointel # LGPLv3+
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += m pthread util ${MODPY_WANTLIB}
> +WANTLIB += iconv intl m pthread util
> +WANTLIB += python${MODPY_DEFAULT_VERSION_2} python${MODPY_DEFAULT_VERSION_3}m
>
> CONFIGURE_STYLE =gnu
> -CONFIGURE_ARGS +=--enable-python
> +CONFIGURE_ARGS +=--enable-python2 \
> + --enable-python3
> +
> +SUBST_VARS +=MODPY_DEFAULT_VERSION_2 MODPY_DEFAULT_VERSION_3
>
> WRKDIST =${WRKDIR}/${PKGNAME}
>
> -MODULES += lang/python
> +MODULES =lang/python
> +
> +BUILD_DEPENDS = ${RUN_DEPENDS}
> +RUN_DEPENDS =lang/python/${MODPY_DEFAULT_VERSION_2} \
> + lang/python/${MODPY_DEFAULT_VERSION_3}
>
> TEST_DEPENDS += shells/bash
>
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/libfwnt/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 12 Feb 2017 06:46:18 - 1.1.1.1
> +++ pkg/PLIST 17 Jul 2018 11:18:23 -
> @@ -10,7 +10,10 @@ lib/libfwnt.a
> lib/libfwnt.la
> @lib lib/libfwnt.so.${LIBfwnt_VERSION}
> lib/pkgconfig/libfwnt.pc
> -lib/python${MODPY_VERSION}/site-packages/pyfwnt.a
> -lib/python${MODPY_VERSION}/site-packages/pyfwnt.la
> -lib/python${MODPY_VERSION}/site-packages/pyfwnt.so
> +lib/python${MODPY_DEFAULT_VERSION_2}/site-packages/pyfwnt.a
> +lib/python${MODPY_DEFAULT_VERSION_2}/site-packages/pyfwnt.la
> +lib/python${MODPY_DEFAULT_VERSION_2}/site-packages/pyfwnt.so
> +lib/python${MODPY_DEFAULT_VERSION_3}/site-packages/pyfwnt.a
> +lib/python${MODPY_DEFAULT_VERSION_3}/site-packages/pyfwnt.la
> +lib/python${MODPY_DEFAULT_VERSION_3}/site-packages/pyfwnt.so
> @man man/man3/libfwnt.3
enable python3 in libfwnt
Hi,
this is the diff to build libfwnt with python 3.6 too, to anticipate the
plaso version compatible with python 3.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/libfwnt/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 1 Feb 2018 13:24:15 - 1.2
+++ Makefile 17 Jul 2018 11:18:23 -
@@ -5,6 +5,7 @@ COMMENT = library for Windows NT data ty
VERSION = 20180117
DISTNAME = libfwnt-alpha-${VERSION}
PKGNAME = ${DISTNAME:S/-alpha//}
+REVISION = 0
SHARED_LIBS += fwnt 0.0 # 1.0
@@ -19,14 +20,22 @@ MAINTAINER = Remi Pointel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 05:18:03 Modified files: x11/gnome/tracker-miners: Makefile Added files: x11/gnome/tracker-miners/patches: patch-src_libtracker-extract_tracker-module-manager_c Log message: Fix a couple of segfaults.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2018/07/17 05:16:05 Modified files: net/tor: Tag: OPENBSD_6_3 Makefile distinfo Log message: Update to tor 0.3.2.11. New bridge authority. OK pascal@ (MAINTAINER).
Re: [diff] www/nextcloud: README root strip leftover
On [17/07/18] [09:03P], Clemens Gößnitzer wrote:
Am 2018-07-17 10:49, schrieb Klemens Nanni:
On Tue, Jul 17, 2018 at 09:27:43AM +0200, Clemens Gößnitzer wrote:
www/nextcloud still has "root strip 1" in README for httpd.conf
example
Thanks. Since you are changing the package's content, do note that this
warrants a REVISION bump.
done.
--- ports/www/nextcloud/pkg/README.orig 2018-07-17
09:21:51.171310863 +0200
+++ ports/www/nextcloud/pkg/README 2018-07-17
09:22:21.211676159 +0200
@@ -62,7 +62,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
+root "/nextcloud"
+request strip 1
fastcgi socket "/run/php-fpm.sock"
}
That turns it into the exact two lines which are used in the next
`location "/*"' block as well. Would it be worth to somehow combine
these? Just wondering.
done.
diff attached
What about this one attached.
--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile19 Jun 2018 13:47:54 - 1.20
+++ Makefile17 Jul 2018 10:38:41 -
@@ -5,7 +5,7 @@ COMMENT=easy and universal access to s
V= 13.0.4
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 1
+REVISION= 2
CATEGORIES=www
Index: pkg/README
===
RCS file: /cvs/ports/www/nextcloud/pkg/README,v
retrieving revision 1.5
diff -u -p -r1.5 README
--- pkg/README 19 Jun 2018 13:47:54 - 1.5
+++ pkg/README 17 Jul 2018 10:38:42 -
@@ -32,44 +32,52 @@ httpd(8) example configuration for Nextc
---8<---
server "domain.tld" {
-listen on egress tls port 443
+ listen on * tls port 443
+ #listen on * port 80
+ alias "www.domain.tld"
-tls {
-certificate "/etc/ssl/domain.tld_fullchain.pem"
-key "/etc/ssl/private/domain.tld_private.pem"
-}
-
-# First deny access to the specified files
-location "/db_structure.xml"{ block }
-location "/.ht*"{ block }
-location "/README" { block }
-location "/data*" { block }
-location "/config*" { block }
-location "/build*" { block }
-location "/tests*" { block }
-location "/config*" { block }
-location "/lib*"{ block }
-location "/3rdparty*" { block }
-location "/templates*" { block }
-location "/data*" { block }
-location "/.ht*"{ block }
-location "/.user*" { block }
-location "/autotest*" { block }
-location "/occ*"{ block }
-location "/issue*" { block }
-location "/indie*" { block }
-location "/db_*"{ block }
-location "/console*"{ block }
-
-location "/*.php*" {
-root { "/nextcloud", strip 1 }
-fastcgi socket "/run/php-fpm.sock"
-}
-
-location "/*" {
-root "/nextcloud"
-request strip 1
-}
+ directory index "index.php"
+ root "/nextcloud"
+
+ hsts max-age 15768000
+
+ tls {
+ certificate "/etc/ssl/acme/domain.tld_fullchain.pem"
+ key "/etc/ssl/acme/private/domain.tld_privkey.pem"
+ }
+
+ tcp nodelay
+ connection { max requests 500, timeout 3600 }
+
+ # Set max upload size to 513M (in bytes)
+ # Your php.ini needs the same limits
+ connection max request body 51300
+
+ # First deny access to the specified files
+ location "/db_structure.xml"{ block }
+ location "/.ht*"{ block }
+ location "/README" { block }
+ location "/data*" { block }
+ location "/config*" { block }
+ location "/build*" { block }
+ location "/tests*" { block }
+ location "/config*" { block }
+ location "/lib*"{ block }
+ location "/3rdparty*" { block }
+ location "/templates*" { block }
+ location "/data*" { block }
+ location "/.ht*"{ block }
+ location "/.user*" { block }
+ location "/autotest*" { block }
+ location "/occ*"{ block }
+ location "/issue*" { block }
+ location "/indie*" { block }
+ location "/db_*"
Re: [diff] www/nextcloud: README root strip leftover
thanks, I have a similar diff on my tree waiting for the relase.
On [17/07/18] [07:27P], Clemens Gößnitzer wrote:
www/nextcloud still has "root strip 1" in README for httpd.conf example
Clemens
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
+0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 09:22:21.211676159
+0200
@@ -62,7 +62,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
+root "/nextcloud"
+request strip 1
fastcgi socket "/run/php-fpm.sock"
}
--
Sending from my toaster.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 04:09:42 Modified files: net/mtr: Makefile Log message: bump EPOCH, broken PKGNAME for the no_x11 flavour
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/07/17 04:08:55 Modified files: infrastructure/mk: bsd.port.mk Log message: Set DISTNAME earlier for GH_* ports, to avoid bogus PKGNAME construction when REVISION/EPOCH are used. Issue spotted by Leonid Bobrov, ok espie@
Re: [diff] www/nextcloud: README root strip leftover
Am 2018-07-17 11:21, schrieb Klemens Nanni:
On Tue, Jul 17, 2018 at 11:03:27AM +0200, Clemens Gößnitzer wrote:
> That turns it into the exact two lines which are used in the next
> `location "/*"' block as well. Would it be worth to somehow combine
> these? Just wondering.
done.
diff attached
Please send diffs inline instead of attaching them.
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
+0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 10:54:36.180614774 +0200
@@ -34,6 +34,9 @@
server "domain.tld" {
listen on egress tls port 443
+root "/nextcloud"
+request strip 1
+
tls {
certificate "/etc/ssl/domain.tld_fullchain.pem"
key "/etc/ssl/private/domain.tld_private.pem"
@@ -62,14 +65,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
fastcgi socket "/run/php-fpm.sock"
}
-
-location "/*" {
-root "/nextcloud"
-request strip 1
-}
}
You now moved this above `location "/console*"', did you confirm this
path still works and is not stripped with that configuration?
I can't confirm on -current, I only have -stable servers at hand, and
the
'location "foo" { block }' directives still work when moving "root strip
1" to
the top of the server definition on -stable. Maybe someone with a
-current
system can confirm that this does not break the '{ block }' directives?
Or we just correct the root -> request issue for now:
--- ports/www/nextcloud/Makefile.orig 2018-07-17 10:55:01.400888144
+0200
+++ ports/www/nextcloud/Makefile2018-07-17 10:55:06.880947541
+0200
@@ -5,7 +5,7 @@
V= 13.0.4
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 1
+REVISION= 2
CATEGORIES=www
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
+0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 11:38:54.317266559
+0200
@@ -62,7 +62,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
+root "/nextcloud"
+request strip 1
fastcgi socket "/run/php-fpm.sock"
}
Re: [diff] www/nextcloud: README root strip leftover
On Tue, Jul 17, 2018 at 11:03:27AM +0200, Clemens Gößnitzer wrote:
> > That turns it into the exact two lines which are used in the next
> > `location "/*"' block as well. Would it be worth to somehow combine
> > these? Just wondering.
> done.
>
> diff attached
Please send diffs inline instead of attaching them.
> --- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
> +0200
> +++ ports/www/nextcloud/pkg/README2018-07-17 10:54:36.180614774 +0200
> @@ -34,6 +34,9 @@
> server "domain.tld" {
> listen on egress tls port 443
>
> +root "/nextcloud"
> +request strip 1
> +
> tls {
> certificate "/etc/ssl/domain.tld_fullchain.pem"
> key "/etc/ssl/private/domain.tld_private.pem"
> @@ -62,14 +65,8 @@
> location "/console*"{ block }
>
> location "/*.php*" {
> -root { "/nextcloud", strip 1 }
> fastcgi socket "/run/php-fpm.sock"
> }
> -
> -location "/*" {
> -root "/nextcloud"
> -request strip 1
> -}
> }
You now moved this above `location "/console*"', did you confirm this
path still works and is not stripped with that configuration?
Re: [diff] www/nextcloud: README root strip leftover
Am 2018-07-17 10:49, schrieb Klemens Nanni:
On Tue, Jul 17, 2018 at 09:27:43AM +0200, Clemens Gößnitzer wrote:
www/nextcloud still has "root strip 1" in README for httpd.conf
example
Thanks. Since you are changing the package's content, do note that this
warrants a REVISION bump.
done.
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
+0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 09:22:21.211676159
+0200
@@ -62,7 +62,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
+root "/nextcloud"
+request strip 1
fastcgi socket "/run/php-fpm.sock"
}
That turns it into the exact two lines which are used in the next
`location "/*"' block as well. Would it be worth to somehow combine
these? Just wondering.
done.
diff attached
--- ports/www/nextcloud/Makefile.orig 2018-07-17 10:55:01.400888144 +0200
+++ ports/www/nextcloud/Makefile 2018-07-17 10:55:06.880947541 +0200
@@ -5,7 +5,7 @@
V= 13.0.4
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 1
+REVISION= 2
CATEGORIES= www
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863 +0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 10:54:36.180614774 +0200
@@ -34,6 +34,9 @@
server "domain.tld" {
listen on egress tls port 443
+root "/nextcloud"
+request strip 1
+
tls {
certificate "/etc/ssl/domain.tld_fullchain.pem"
key "/etc/ssl/private/domain.tld_private.pem"
@@ -62,14 +65,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
fastcgi socket "/run/php-fpm.sock"
}
-
-location "/*" {
-root "/nextcloud"
-request strip 1
-}
}
---8<---
Re: [diff] www/nextcloud: README root strip leftover
On Tue, Jul 17, 2018 at 09:27:43AM +0200, Clemens Gößnitzer wrote:
> www/nextcloud still has "root strip 1" in README for httpd.conf example
Thanks. Since you are changing the package's content, do note that this
warrants a REVISION bump.
> --- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863 +0200
> +++ ports/www/nextcloud/pkg/README 2018-07-17 09:22:21.211676159 +0200
> @@ -62,7 +62,8 @@
> location "/console*"{ block }
>
> location "/*.php*" {
> -root { "/nextcloud", strip 1 }
> +root "/nextcloud"
> +request strip 1
> fastcgi socket "/run/php-fpm.sock"
> }
That turns it into the exact two lines which are used in the next
`location "/*"' block as well. Would it be worth to somehow combine
these? Just wondering.
[diff] www/nextcloud: README root strip leftover
www/nextcloud still has "root strip 1" in README for httpd.conf example
Clemens
--- ports/www/nextcloud/pkg/README.orig 2018-07-17 09:21:51.171310863
+0200
+++ ports/www/nextcloud/pkg/README 2018-07-17 09:22:21.211676159
+0200
@@ -62,7 +62,8 @@
location "/console*"{ block }
location "/*.php*" {
-root { "/nextcloud", strip 1 }
+root "/nextcloud"
+request strip 1
fastcgi socket "/run/php-fpm.sock"
}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 02:01:01 Modified files: security/gnutls: Makefile distinfo Log message: Update to gnutls-3.5.19.
Re: cad/xtrkcad
On Sun, Jul 15, 2018 at 01:04:29PM +0200, Klemens Nanni wrote: > On Sun, Jul 15, 2018 at 12:50:17PM +0200, Antoine Jacoutot wrote: > > I would like to remove www/webkit from the tree. > > As the pkg/MESSAGE tells you: > > !!! WARNING: WebKitGTK+ 2.4 is known to have many security vulnerabilities > > that > > !!! will NOT be fixed. Avoid browsing with it. > > > > It's unmaintained code that takes a huge amount of time to build and which > > only > > consumer is... cad/xtrkcad. > I'd like to see it go. > > > It looks like the most recent xtrkcad version from last May still uses the > > *old* > > webkit, so updating won't help. > > > > Should we just remove it until they move to webkitgtk4 (which is > > maintained)? > Sounds good to me. Anyone else? Should I just go ahead and remove it? -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/07/17 01:56:44 Modified files: games/eduke32/patches: patch-GNUmakefile Log message: I'm getting fed up of fixing that stuff make *sure* the internal includes are first, so that we don't pick up system-wide different enet or something like that.
Re: Mark www/vimb broken
From: Rafael Sadowski On Tue Jul 17, 2018 at 01:55:42AM -0400, Brian Callahan wrote: > > On 07/17/18 00:46, Leonid Bobrov wrote: > > Hi! > > > > After recent snapshot updates I'm no longer able to use this port, > > not sure this is problem of port update, because I was able to use > > 3.2.0 before updating snaphot. When I start this browser, I have to > > wait one minute and it stops responding, I can't even kill it using > > CM-x in CWM. > > It works fine here on the latest snapshot and package set. Same here on amd64. > > ~Brian > > > Index: Makefile > > === > > RCS file: /cvs/ports/www/vimb/Makefile,v > > retrieving revision 1.16 > > diff -u -p -u -p -r1.16 Makefile > > --- Makefile27 Jun 2018 21:04:06 - 1.16 > > +++ Makefile17 Jul 2018 04:39:14 - > > @@ -1,11 +1,13 @@ > > # $OpenBSD: Makefile,v 1.16 2018/06/27 21:04:06 espie Exp $ > > +BROKEN = not responding at runtime > > + > > COMMENT = modal webkit-based browser inspired by vim > > GH_ACCOUNT = fanglingsu > > GH_PROJECT = vimb > > GH_TAGNAME = 3.2.0 > > -REVISION = 0 > > +REVISION = 1 > > CATEGORIES = www x11 > > > This is weird, I'm running latest snapshot on amd64, after I removed files generated by Vimb in my home directory, it still doesn't respond at runtime. Other browsers based on www/webkitgtk4 run fine.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:38:38 Modified files: audio/pulseaudio: Makefile distinfo Log message: Update to pulseaudio-12.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2018/07/17 01:35:55 Modified files: sysutils/libregf: Makefile Log message: use libfwnt in ports, spotted by espie@ (thanks).
Re: UPDATE net/tor: new bridge authority, patch for -current and -stable
On Mon, 16 Jul 2018 19:12:57 +0200, Juan Francisco Cantero Hurtado wrote: > The new versions add a new bridge authority. > https://github.com/torproject/tor/blob/master/ReleaseNotes > > Both pass the tests. OK? OK for the stable version. > > Current: > > Index: Makefile > === > --- Makefile (revision 130631) > +++ Makefile (working copy) > @@ -2,10 +2,9 @@ > > COMMENT= anonymity service using onion routing > > -DISTNAME=tor-0.3.3.8 > +DISTNAME=tor-0.3.3.9 > CATEGORIES= net > HOMEPAGE=https://www.torproject.org/ > -REVISION=1 > > MAINTAINER= Pascal Stumpf > > Index: distinfo > === > --- distinfo (revision 130631) > +++ distinfo (working copy) > @@ -1,2 +1,2 @@ > -SHA256 (tor-0.3.3.8.tar.gz) = PPW0/qJJHL/voQd78bKFXhaQUtOBvZIM1Xqpv6/2s6U= > -SIZE (tor-0.3.3.8.tar.gz) = 6564878 > +SHA256 (tor-0.3.3.9.tar.gz) = hTRrTQJuagQcjjJtLMZLX1NhsDIHXInFhU8W28Avzm8= > +SIZE (tor-0.3.3.9.tar.gz) = 6563091 > > Stable: > > > Index: Makefile > === > RCS file: /cvs/ports/net/tor/Makefile,v > retrieving revision 1.111 > diff -u -p -r1.111 Makefile > --- Makefile 4 Mar 2018 14:05:06 - 1.111 > +++ Makefile 16 Jul 2018 17:03:46 - > @@ -2,7 +2,7 @@ > > COMMENT= anonymity service using onion routing > > -DISTNAME=tor-0.3.2.10 > +DISTNAME=tor-0.3.2.11 > CATEGORIES= net > HOMEPAGE=https://www.torproject.org/ > > Index: distinfo > === > RCS file: /cvs/ports/net/tor/distinfo,v > retrieving revision 1.91 > diff -u -p -r1.91 distinfo > --- distinfo 4 Mar 2018 14:05:06 - 1.91 > +++ distinfo 16 Jul 2018 17:03:46 - > @@ -1,2 +1,2 @@ > -SHA256 (tor-0.3.2.10.tar.gz) = YN93wx3PlP3WhsjKjDTztwJDszpzROzAtxnVyiYXy+4= > -SIZE (tor-0.3.2.10.tar.gz) = 6421984 > +SHA256 (tor-0.3.2.11.tar.gz) = pq0hbX5dtjzNy4p6PobGnFcJ3c8I7ORMtVme7UL6IPA= > +SIZE (tor-0.3.2.11.tar.gz) = 6463761
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:05:17 Modified files: mail/evolution-ews: Makefile distinfo Log message: Update to evolution-ews-3.28.4.
Re: Mark www/vimb broken
On Tue Jul 17, 2018 at 01:55:42AM -0400, Brian Callahan wrote: > > On 07/17/18 00:46, Leonid Bobrov wrote: > > Hi! > > > > After recent snapshot updates I'm no longer able to use this port, > > not sure this is problem of port update, because I was able to use > > 3.2.0 before updating snaphot. When I start this browser, I have to > > wait one minute and it stops responding, I can't even kill it using > > CM-x in CWM. > > It works fine here on the latest snapshot and package set. Same here on amd64. > > ~Brian > > > Index: Makefile > > === > > RCS file: /cvs/ports/www/vimb/Makefile,v > > retrieving revision 1.16 > > diff -u -p -u -p -r1.16 Makefile > > --- Makefile27 Jun 2018 21:04:06 - 1.16 > > +++ Makefile17 Jul 2018 04:39:14 - > > @@ -1,11 +1,13 @@ > > # $OpenBSD: Makefile,v 1.16 2018/06/27 21:04:06 espie Exp $ > > +BROKEN = not responding at runtime > > + > > COMMENT = modal webkit-based browser inspired by vim > > GH_ACCOUNT = fanglingsu > > GH_PROJECT = vimb > > GH_TAGNAME = 3.2.0 > > -REVISION = 0 > > +REVISION = 1 > > CATEGORIES = www x11 > > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:05:02 Modified files: mail/evolution : Makefile distinfo Removed files: mail/evolution/patches: patch-help_de_de_po patch-src_calendar_gui_e-calendar-view_c patch-src_calendar_gui_e-meeting-time-sel_c patch-src_calendar_gui_e-meeting-time-sel_h patch-src_calendar_gui_print_c patch-src_e-util_e-spell-dictionary_c patch-src_modules_tnef-attachment_e-mail-parser-tnef-attachment_c Log message: Update to evolution-3.28.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:04:41 Modified files: databases/evolution-data-server: Makefile distinfo Log message: Update to evolution-data-server-3.28.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:03:37 Modified files: x11/gnome/devhelp: Makefile distinfo x11/gnome/devhelp/pkg: PLIST Log message: Update to devhelp-3.30.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:03:02 Modified files: x11/gnome/tepl : Makefile distinfo x11/gnome/tepl/pkg: PLIST Log message: Update to tepl-4.2.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:03:16 Modified files: x11/gnome/latex: Makefile distinfo Log message: Update to gnome-latex-3.30.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:02:37 Modified files: x11/gnome : Makefile Log message: +amtk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/07/17 01:02:05 Log message: Import amtk-5.0.0. Amtk is the acronym for "Actions, Menus and Toolbars Kit". It is a basic GtkUIManager replacement based on GAction. It is suitable for both a traditional UI or a modern UI with a GtkHeaderBar. ok jasper@ Status: Vendor Tag: ajacoutot Release Tags: ajacoutot_20180717 N ports/x11/gnome/amtk/Makefile N ports/x11/gnome/amtk/distinfo N ports/x11/gnome/amtk/pkg/DESCR N ports/x11/gnome/amtk/pkg/PLIST No conflicts created by this import
Re: [maintainer update] Necessity to flavor net/toxic
On 2018/07/17 05:47, Leonid Bobrov wrote:
> > Keep this with GH_TAGNAME=v0.8.2 and no PKGNAME and no V.
>
> If I don't set PKGNAME, then I get this:
> $ env FLAVOR="no_x11" make show=FULLPKGNAME
> toxic-0.8.2-no_x11p1
> So I fixed that by taking a look at editors/vim
Congratulations, you found a bug in GH_* handling :-)
vim uses multi-packages so it's a different situation.
This helps for net/toxic, but I need to do more testing.
Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1426
diff -u -p -r1.1426 bsd.port.mk
--- bsd.port.mk 16 Jul 2018 09:11:31 - 1.1426
+++ bsd.port.mk 17 Jul 2018 06:56:18 -
@@ -596,6 +596,16 @@ BUILD_DEPENDS += textproc/groff>=1.21
_PKG_ARGS += -DUSE_GROFF=1
.endif
+# github related variables
+GH_TAGNAME ?=
+GH_COMMIT ?=
+GH_ACCOUNT ?=
+GH_PROJECT ?=
+
+.if !empty(GH_PROJECT) && !empty(GH_TAGNAME)
+DISTNAME ?=${GH_PROJECT}-${GH_TAGNAME:C/^v//}
+.endif
+
PKGNAME ?= ${DISTNAME}
FULLPKGNAME ?= ${PKGNAME}${FLAVOR_EXT}
_MASTER ?=
@@ -818,12 +828,6 @@ _WRKDIRS = ${WRKOBJDIR_${PKGPATH}}/${_WR
_WRKDIRS += ${WRKOBJDIR}/${_WRKDIR_STEM}
_WRKDIRS += ${WRKOBJDIR_MFS}/${_WRKDIR_STEM}
-# github related variables
-GH_TAGNAME ?=
-GH_COMMIT ?=
-GH_ACCOUNT ?=
-GH_PROJECT ?=
-
.if !empty(GH_TAGNAME)
WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
.elif !empty(GH_COMMIT)
@@ -834,10 +838,6 @@ WRKDIST ?= ${WRKDIR}
. else
WRKDIST ?= ${WRKDIR}/${DISTNAME}
. endif
-.endif
-
-.if !empty(GH_PROJECT) && !empty(GH_TAGNAME)
-DISTNAME ?=${GH_PROJECT}-${GH_TAGNAME:C/^v//}
.endif
WRKSRC ?= ${WRKDIST}
Re: Update textproc/wkhtmltopdf-0.12.4
On Mon, Jul 16, 2018, at 16:10, Brian Callahan wrote:
>
> It looks like you may have forgotten to cvs add a number of patches.
>
> ~Brian
>
Thanks, I hadn't noticed. Attached a complete and working patch, tested with a
clean checkout.
Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 10 Jul 2018 12:24:24 - 1.19
+++ Makefile 17 Jul 2018 06:14:35 -
@@ -9,8 +9,8 @@ COMMENT = convert HTML to PDF using Web
GH_ACCOUNT = wkhtmltopdf
GH_PROJECT = wkhtmltopdf
-GH_TAGNAME = 0.12.4
-QT_COMMIT = c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME = 0.12.5
+QT_COMMIT = 5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/
DISTFILES = ${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 10 Jul 2018 12:24:24 - 1.5
+++ distinfo 17 Jul 2018 06:14:35 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+SHA256 (wkhtmltopdf-0.12.5.tar.gz) = hh1uYeL1vrLY2qreLNWoW4QGXun6wNbYUADYp3EqRiE=
+SHA256 (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = tD6GRyvKy0seNzXfnJr9CQ+gEWl0oD8BqScf8CkRU2w=
+SIZE (wkhtmltopdf-0.12.5.tar.gz) = 511181
+SIZE (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = 173051127
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure 2 Mar 2017 10:12:02 - 1.1
+++ patches/patch-qt_configure 17 Jul 2018 06:14:35 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
qt/configure.orig Wed Mar 1 20:53:04 2017
-+++ qt/configure Wed Mar 1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
qt/configure
+@@ -3427,7 +3427,7 @@ else
CFG_FRAMEWORK=no
fi
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp 10 Jul 2018 12:24:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
===
RCS file: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
diff -N patches/patch-qt_src_network_ssl_qsslcertificate_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-qt_src_network_ssl_qsslcertificate_cpp 17 Jul 2018 06:14:35 -
@@ -0,0 +1,78 @@
+$OpenBSD$
+
+Index: qt/src/network/ssl/qsslcertificate.cpp
+--- qt/src/network/ssl/qsslcertificate.cpp.orig
qt/src/network/ssl/qsslcertificate.cpp
+@@ -259,10 +259,10 @@ void QSslCertificate::clear()
+ QByteArray QSslCertificate::version() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+-if (d->versionString.isEmpty() && d->x509) {
++if (d->versionString.isEmpty() && d->x509)
+ d->versionString =
+- QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
+-}
++QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
++
+ return d->versionString;
+ }
+
+@@ -276,7 +276,7 @@ QByteArray QSslCertificate::serialNumber() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+ if (d->serialNumberString.isEmpty() && d->x509) {
+-
