Re: update x11/slock

[Gleydson Soares]

please, go for it
OK gsoares@


> 
> On 4 May 2024, at 08:08, Solene Rapenne  wrote:
> 
> the changelog can be found on https://git.suckless.org/slock/log.html
> 
> between 2022-10-04 17:45bump version to 1.5
> and 2016-11-20 00:07bump version
> 
> tested on amd64
> 
> ok?
> 
> diff --git a/x11/slock/Makefile b/x11/slock/Makefile
> index d32ca4616d2..33b2d85ecf0 100644
> --- a/x11/slock/Makefile
> +++ b/x11/slock/Makefile
> @@ -1,6 +1,6 @@
> COMMENT=simple X screen locker
> 
> -DISTNAME=slock-1.4
> +DISTNAME=slock-1.5
> 
> CATEGORIES=x11
> 
> diff --git a/x11/slock/distinfo b/x11/slock/distinfo
> index 12625e724a7..73323314391 100644
> --- a/x11/slock/distinfo
> +++ b/x11/slock/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (slock-1.4.tar.gz) = tThJ28YBCamH16SbjaGXMFwpMH/XTBLcGK8NMEQ5Lmo=
> -SIZE (slock-1.4.tar.gz) = 6889
> +SHA256 (slock-1.5.tar.gz) = ruHj+/aid/tiWjg4BzuXm2SD57rKTOgvVt4f8ZLbDk0=
> +SIZE (slock-1.5.tar.gz) = 6898
> 

Re: [update] enable plan9port on arm64

[Gleydson Soares]

it enables plan9port on arm64 and brings it to latest GH_ commit.  while
here noticed portcheck spots out some bits, so tidied up Makefile

tested / works for me on either amd64 or arm64

OK?

Index: Makefile
===
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile13 Oct 2023 09:28:49 -  1.44
+++ Makefile26 Mar 2024 16:19:07 -
@@ -1,12 +1,12 @@
-ONLY_FOR_ARCHS =   amd64 i386 powerpc powerpc64
+ONLY_FOR_ARCHS =   aarch64 amd64 i386 powerpc powerpc64
 
 COMMENT =  Plan 9 from user space
 
-DISTNAME = plan9port-20230913
+DISTNAME = plan9port-20240109
 
 GH_ACCOUNT =   9fans
 GH_PROJECT =   plan9port
-GH_COMMIT =984c2824e3569479bace65bdaf9e78a2eb36dd58
+GH_COMMIT =be7c68f6954f7dcaa53403e0f600716f65a13d32
 
 CATEGORIES =   plan9
 
@@ -35,14 +35,14 @@ pre-configure:
bin/macedit
 
 do-build:
-   cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" NPROC=${MAKE_JOBS} 
./INSTALL -b
+   cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" NPROC=${MAKE_JOBS} \
+   ./INSTALL -b
 
 do-install:
-   rm -f ${WRKSRC}/.travis.yml
-   cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
+   cd ${WRKSRC} && sed -i 's#${PREFIX}#${TRUEPREFIX}#' \
`cat lib/moveplan9.files`
-   find ${WRKSRC} \( -name .gitignore -o -name .gitkeep -o \
-   -name \*.orig -o -name \*.beforesubst \) -delete
+   find ${WRKSRC} \( -name .github -o -name .gitignore -o -name .gitkeep 
\) \
+   -exec rm -rf {} \;
${INSTALL_DATA_DIR} ${PLAN9}
cd ${WRKSRC} && pax -rw . ${PLAN9}
cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9
Index: distinfo
===
RCS file: /cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo13 Oct 2023 09:28:49 -  1.19
+++ distinfo26 Mar 2024 16:19:07 -
@@ -1,2 +1,2 @@
-SHA256 (plan9port-20230913-984c2824.tar.gz) = 
o8iQrQUw9WFwHDdyf6N5hUBSmRH4P6/ua5r2zBpB5uM=
-SIZE (plan9port-20230913-984c2824.tar.gz) = 23411044
+SHA256 (plan9port-20240109-be7c68f6.tar.gz) = 
MYqKoJMw9lUgmvN8fI0okvxzDclPq30W/wtD3e8XkW0=
+SIZE (plan9port-20240109-be7c68f6.tar.gz) = 23413541
Index: pkg/PLIST
===
RCS file: /cvs/ports/plan9/plan9port/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST
--- pkg/PLIST   31 Jan 2023 10:26:17 -  1.18
+++ pkg/PLIST   26 Mar 2024 16:19:13 -
@@ -179,6 +179,7 @@ plan9/bin/man
 plan9/bin/mk9660
 @bin plan9/bin/mkdir
 @bin plan9/bin/mklatinkbd
+@bin plan9/bin/mntgen
 @comment plan9/bin/mount
 @bin plan9/bin/mtime
 @bin plan9/bin/namespace
@@ -4555,6 +4556,7 @@ plan9/man/man4/INDEX
 @man plan9/man/man4/fontsrv.4
 @man plan9/man/man4/fossil.4
 @man plan9/man/man4/import.4
+@man plan9/man/man4/mntgen.4
 @man plan9/man/man4/plumber.4
 @man plan9/man/man4/ramfs.4
 @man plan9/man/man4/smugfs.4
@@ -5971,6 +5973,7 @@ plan9/src/cmd/mnihongo/README
 plan9/src/cmd/mnihongo/mkfile
 plan9/src/cmd/mnihongo/mnihongo.c
 plan9/src/cmd/mnihongo/tmac.nihongo
+plan9/src/cmd/mntgen.c
 plan9/src/cmd/mpm/
 plan9/src/cmd/mpm/README
 plan9/src/cmd/mpm/misc.cc

update luasec to 1.3.2

[Gleydson Soares]

update luasec to 1.3.2
upstream moved to lunarmodules
ok?

Index: Makefile
===
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile7 Sep 2023 21:19:16 -   1.27
+++ Makefile8 Dec 2023 18:52:06 -
@@ -1,12 +1,12 @@
 COMMENT=   lua binding to OpenSSL to provide TLS/SSL communication
 
-GH_ACCOUNT=brunoos
+GH_ACCOUNT=lunarmodules
 GH_PROJECT=luasec
-GH_TAGNAME=v1.2.0
+GH_TAGNAME=v1.3.2
 
 CATEGORIES=security
 
-HOMEPAGE=  https://github.com/brunoos/luasec/wiki
+HOMEPAGE=  https://github.com/lunarmodules/luasec/wiki
 
 MAINTAINER=Gleydson Soares 
 
Index: distinfo
===
RCS file: /cvs/ports/security/luasec/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo8 Jan 2023 20:50:30 -   1.10
+++ distinfo8 Dec 2023 18:52:06 -
@@ -1,2 +1,2 @@
-SHA256 (luasec-1.2.0.tar.gz) = LobvjzSG3Bu+zXUtFnQaWaAWMyefrN/lYx8ztu7Rowo=
-SIZE (luasec-1.2.0.tar.gz) = 53379
+SHA256 (luasec-1.3.2.tar.gz) = lykwkro4WrOQ3stmeLyMvv/ViZv7xJ6370qgD14xw9Q=
+SIZE (luasec-1.3.2.tar.gz) = 54925
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/luasec/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST   11 Mar 2022 19:53:33 -  1.10
+++ pkg/PLIST   8 Dec 2023 18:52:06 -
@@ -67,6 +67,9 @@ share/examples/${FULLPKGNAME}/multicert/
 share/examples/${FULLPKGNAME}/oneshot/
 share/examples/${FULLPKGNAME}/oneshot/client.lua
 share/examples/${FULLPKGNAME}/oneshot/server.lua
+share/examples/${FULLPKGNAME}/psk/
+share/examples/${FULLPKGNAME}/psk/client.lua
+share/examples/${FULLPKGNAME}/psk/server.lua
 share/examples/${FULLPKGNAME}/sni/
 share/examples/${FULLPKGNAME}/sni/client.lua
 share/examples/${FULLPKGNAME}/sni/server.lua

Re: UPDATE x11/specctrwm-3.5.0

[Gleydson Soares]

Builds and runs fine.
OK gsoares@

Re: chromium display

[Gleydson Soares]

Hello Jon,
   
It seems to be a known issue and workaround would be purging the GPUCache
 
~/.config/chromium/Default/GPUCache
 
Relates to  
https://bugs.chromium.org/p/chromium/issues/detail?id=1442633

- gsoares

On Sat, Jul 15, 2023 at 08:37:49AM -0400, Jon Fineman wrote:
> I am having trouble with chromium-114.0.5735.198p2 displaying jpeg, etc for
> example in Instagram or Youtube the graphics are blank. Also when I click
> the three buttons in the top right the menu is corrupted.
> 
> If a view a jpeg from the filesystem it will display it. But when I x out of
> the tab and chromium reverts to displaying the prior tab it will show half
> of the pic on that tab.
> 
> If I click on a pdf and then go back half of the pdf is still displayed on
> the prior page.
> 
> I am also seeing some display flickering at times.
> 
> Any thoughts on how to debug this?
> 
> 
> kern.version=OpenBSD 7.3-current (GENERIC.MP) #1287: Fri Jul 14 13:18:53 MDT 
> 2023
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
> 
> 
> ,BMI2,RDSEED,ADX,SMAP,CLFLUSHOPT,SHA,IBPB,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
> cpu2: 32KB 64b/line 8-way D-cache, 64KB 64b/line 4-way I-cache, 512KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu2: smt 0, core 2, package 0
> cpu3 at mainbus0: apid 8 (application processor)
> cpu3: AMD Ryzen 5 1600 Six-Core Processor, 3200.00 MHz, 17-01-01
> cpu3: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,RDSEED,ADX,SMAP,CLFLUSHOPT,SHA,IBPB,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
> cpu3: 32KB 64b/line 8-way D-cache, 64KB 64b/line 4-way I-cache, 512KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu3: smt 0, core 4, package 0
> cpu4 at mainbus0: apid 10 (application processor)
> cpu4: AMD Ryzen 5 1600 Six-Core Processor, 3200.00 MHz, 17-01-01
> cpu4: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,RDSEED,ADX,SMAP,CLFLUSHOPT,SHA,IBPB,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
> cpu4: 32KB 64b/line 8-way D-cache, 64KB 64b/line 4-way I-cache, 512KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu4: smt 0, core 5, package 0
> cpu5 at mainbus0: apid 12 (application processor)
> cpu5: AMD Ryzen 5 1600 Six-Core Processor, 3200.00 MHz, 17-01-01
> cpu5: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,RDSEED,ADX,SMAP,CLFLUSHOPT,SHA,IBPB,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
> cpu5: 32KB 64b/line 8-way D-cache, 64KB 64b/line 4-way I-cache, 512KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu5: smt 0, core 6, package 0
> cpu6 at mainbus0: apid 1 (application processor)
> cpu6: AMD Ryzen 5 1600 Six-Core Processor, 3200.00 MHz, 17-01-01
> cpu6: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,RDSEED,ADX,SMAP,CLFLUSHOPT,SHA,IBPB,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
> cpu6: 32KB 64b/line 8-way D-cache, 64KB 64b/line 4-way I-cache, 512KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu6: smt 1, core 0, package 0
> cpu7 at mainbus0: apid 3 (application processor)
> cpu7: AMD Ryzen 5 1600 Six-Core Processor, 3200.00 MHz, 17-01-01
> cpu7: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,RDSEED,ADX,SMAP,CLFLUSHOPT,SHA,IBPB,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
> cpu7: 32KB 64b/line 8-way D-cache, 64KB 64b/line 4-way I-cache, 512KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu7: smt 1, core 1, package 0
> cpu8 at mainbus0: apid 

Re: plan9/plan9port: honour MAKE_JOBS

[Gleydson Soares]

On Thu, May 11, 2023 at 02:26:11PM +, Klemens Nanni wrote:
> mk(1) says to set NPROC in the environment, INSTALL does that itself,
> but only on foreign platforms.
> 
> Now I see cascades of 'clang -DPLAN9PORT ...' procs in top(1).
> OK?

OK gsoares@

update: spectrwm-3.4.1.20230507

[Gleydson Soares]

update spectrwm to latest commit which includes a fix that addresses a
crash found hardway while running ssh-askpass(1):

- Fix possible crash when a window claims to be transient for itself. 
Index: Makefile
===
RCS file: /cvs/ports/x11/spectrwm/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile23 Apr 2023 13:19:10 -  1.41
+++ Makefile7 May 2023 13:57:37 -
@@ -2,8 +2,8 @@ COMMENT=small tiling window manager
 
 GH_ACCOUNT=conformal
 GH_PROJECT=spectrwm
-GH_COMMIT= efc458efa5730680a5ff3805f6cf9d88dc88748b
-DISTNAME=  ${GH_PROJECT}-3.4.1.20230310
+GH_COMMIT= 06e3733175969c307a6fd47240a7a37b29d60513
+DISTNAME=  ${GH_PROJECT}-3.4.1.20230507
 
 SHARED_LIBS=   swmhack 1.0
 
Index: distinfo
===
RCS file: /cvs/ports/x11/spectrwm/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo23 Apr 2023 13:19:10 -  1.28
+++ distinfo7 May 2023 13:57:37 -
@@ -1,2 +1,2 @@
-SHA256 (spectrwm-3.4.1.20230310-efc458ef.tar.gz) = 
8hjhkgcC+mA+PlGZxDIRmNXAOMMWLPLCtPuGlF2ghyw=
-SIZE (spectrwm-3.4.1.20230310-efc458ef.tar.gz) = 172141
+SHA256 (spectrwm-3.4.1.20230507-06e37331.tar.gz) = 
1stB8RPoDDQYPHbg5BNgFYRdbqK8wvlyaKO8QMriJng=
+SIZE (spectrwm-3.4.1.20230507-06e37331.tar.gz) = 172202

Re: update plan9/plan9port

[Gleydson Soares]

builds and runs fine for me.
OK gsoares@

Re: plan9port works on i386 and powerpc

[Gleydson Soares]

> > Unfortunately, building at least on sparc64 does not complete.
> > Curiously it also does not fail, it just stops after 'mk' is compiled.
> > So I think ONLY_FOR_ARCHES may need to be retained, with the platforms
> > we have tested.

sure, it fails on aarch64 as well, requires a couple of tweaks to make it
build, will check it afterwards as soon as I prepare a diff to bring it
to latest github commit.

> Thank you for trying multiple archs.  I have committed the below diff,
> which retains ONLY_FOR_ARCHES.

thanks!
- gsoares

Re: UPDATE: mail/imapfilter

[Gleydson Soares]

> Update imapfilter to 2.7.5. OK?

builds fine on arm64 and amd64

The next imapfilter's update may get rid of patches/patch-src_auth_c
since upstream has deprecated CRAM-MD5 authentication mechanism
as per commit [1]

OK gsoares, thanks!

[1] 
https://github.com/lefcha/imapfilter/commit/20865804d12bfdbd3dc18d569a416d9b42708792

Re: [UPDATE] security/stunnel to 5.62

[Gleydson Soares]

> I think that may be an upstream bug, OpenSSL can return NULL for
> RAND_get_rand_method too.
>
> 351 NOEXPORT int prng_init(GLOBAL_OPTIONS *global) {
> 352 int totbytes=0;
> 353 char filename[256];
> 354 const RAND_METHOD *meth=RAND_get_rand_method();
> 355 
> 356 /* skip PRNG initialization when no seeding methods are available */
> 357 if(meth->status==NULL || meth->add==NULL) {
> 358 s_log(LOG_DEBUG, "No PRNG seeding methods");
> 359 return 0; /* success */
> 360 }
> 361 
> 362 if(RAND_status()) {
> 363 s_log(LOG_DEBUG, "No PRNG seeding was required");
> 364 return 0; /* success */
> 365 }

Makes sense, I agree, I have addressed it upstream.

> With stunnel it really feels like the dev is going out of his way to
> make the software as annoying as possible to build against LibreSSL.
> Which makes me definitely think we should keep building against LibreSSL! :)

Diff inline below updated including the RAND_get_rand_method() changes.

Thanks for your review,
gsoares
Index: Makefile
===
RCS file: /cvs/ports/security/stunnel/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile12 Jul 2019 20:49:37 -  1.93
+++ Makefile3 Mar 2022 20:05:00 -
@@ -2,9 +2,8 @@
 
 COMMENT=   SSL encryption wrapper for standard network daemons
 
-DISTNAME=  stunnel-5.44
+DISTNAME=  stunnel-5.62
 CATEGORIES=security
-REVISION=  2
 
 MAINTAINER=Gleydson Soares 
 
@@ -13,12 +12,11 @@ PERMIT_PACKAGE= Yes
 
 WANTLIB += c crypto pthread ssl util
 
-HOMEPAGE=  http://www.stunnel.org/
+HOMEPAGE=  https://www.stunnel.org/
 
 MASTER_SITES=  https://www.stunnel.org/downloads/archive/5.x/ \
-   http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/ \
-   http://mirror.bit.nl/stunnel/archive/5.x/ \
-   ftp://ftp.stunnel.org/stunnel/archive/5.x/
+   https://ftp.nluug.nl/pub/networking/stunnel/ \
+   https://www.usenix.org.uk/mirrors/stunnel/
 
 SEPARATE_BUILD=Yes
 CONFIGURE_STYLE=   gnu
Index: distinfo
===
RCS file: /cvs/ports/security/stunnel/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo1 Dec 2017 00:08:44 -   1.45
+++ distinfo3 Mar 2022 20:05:00 -
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.44.tar.gz) = mQoyXbtH132Idy3QL7vSfZGx/qPs52yf9EYeypPxIpk=
-SIZE (stunnel-5.44.tar.gz) = 699117
+SHA256 (stunnel-5.62.tar.gz) = nPW7lJAiqmbHNsEyZVTMon0GQWBaY3AnTtxJUetb0zk=
+SIZE (stunnel-5.62.tar.gz) = 862456
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/security/stunnel/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in   1 Dec 2017 00:08:44 -   1.15
+++ patches/patch-Makefile_in   3 Mar 2022 20:05:00 -
@@ -1,13 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.15 2017/12/01 00:08:44 gsoares Exp $
+$OpenBSD$
+
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -364,7 +364,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+@@ -371,7 +371,7 @@ top_srcdir = @top_srcdir@
+ with_bashcompdir = @with_bashcompdir@
+ AM_DISTCHECK_CONFIGURE_FLAGS = 
--with-bashcompdir='$$(datarootdir)/bash-completion/completions'
  ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = src doc tools tests
 +SUBDIRS = src doc tests
- EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS INSTALL.W32 INSTALL.WCE \
-   INSTALL.FIPS build-android.sh .travis.yml
- doc_DATA = INSTALL README TODO COPYING AUTHORS ChangeLog PORTS BUGS \
+ doc_DATA = README.md TODO.md COPYING.md AUTHORS.md NEWS.md PORTS.md \
+   BUGS.md COPYRIGHT.md CREDITS.md INSTALL.W32.md INSTALL.WCE.md \
+   INSTALL.FIPS.md
Index: patches/patch-src_client_c
===
RCS file: patches/patch-src_client_c
diff -N patches/patch-src_client_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_client_c  3 Mar 2022 20:05:00 -
@@ -0,0 +1,30 @@
+Index: src/client.c
+--- src/client.c.orig
 src/client.c
+@@ -750,7 +750,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiat
+ NOEXPORT void transfer(CLI *c) {
+ int timeout; /* s_poll_wait timeout in seconds */
+ int pending; /* either processed on unprocessed TLS data */
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ int has_pending=0, prev_has_pending;
+ #endif
+ int watchdog=0; /* a counter to detect an infinite loop */
+@@ -797,7 +797,7 @@ NOEXPORT void transfer(CLI *c) {
+ 
+ /*

Re: [UPDATE] security/stunnel to 5.62

[Gleydson Soares]

Hello,

I have managed to make stunnel build against libressl.

While working on it, i've triggered a segfault:

openbsd-arm64$ stunnel
Segmentation fault (core dumped)
openbsd-arm64$

...
So looked at the coredump to find clues:

Program received signal SIGSEGV, Segmentation fault.
prng_init (global=0xfb13b5ce8 )
at /usr/ports/pobj/stunnel-5.62/stunnel-5.62/src/ssl.c:357
357 if(meth->status==NULL || meth->add==NULL) {
(gdb)

Breakpoint 5, prng_init (global=0x8c4385ce8 )
at /usr/ports/pobj/stunnel-5.62/stunnel-5.62/src/ssl.c:354
354 const RAND_METHOD *meth=RAND_get_rand_method();

It has been fixed by wrapping the code path with
!defined(LIBRESSL_VERSION_NUMBER), RAND_*_rand_method() exist just for
ABI compatibility, the code fallback to "/dev/urandom" afterwards, but
would be great to use arc4random(3) instead, something like our
RAND_pseudo_bytes().

It builds and runs, been slighttly tested though, i don't have a fancy
setup so tests welcome.diff inline below
Index: Makefile
===
RCS file: /cvs/ports/security/stunnel/Makefile,v
retrieving revision 1.93
diff -u -p -u -p -r1.93 Makefile
--- Makefile12 Jul 2019 20:49:37 -  1.93
+++ Makefile2 Mar 2022 23:53:06 -
@@ -2,9 +2,8 @@
 
 COMMENT=   SSL encryption wrapper for standard network daemons
 
-DISTNAME=  stunnel-5.44
+DISTNAME=  stunnel-5.62
 CATEGORIES=security
-REVISION=  2
 
 MAINTAINER=Gleydson Soares 
 
@@ -13,12 +12,11 @@ PERMIT_PACKAGE= Yes
 
 WANTLIB += c crypto pthread ssl util
 
-HOMEPAGE=  http://www.stunnel.org/
+HOMEPAGE=  https://www.stunnel.org/
 
 MASTER_SITES=  https://www.stunnel.org/downloads/archive/5.x/ \
-   http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/ \
-   http://mirror.bit.nl/stunnel/archive/5.x/ \
-   ftp://ftp.stunnel.org/stunnel/archive/5.x/
+   https://ftp.nluug.nl/pub/networking/stunnel/ \
+   https://www.usenix.org.uk/mirrors/stunnel/
 
 SEPARATE_BUILD=Yes
 CONFIGURE_STYLE=   gnu
Index: distinfo
===
RCS file: /cvs/ports/security/stunnel/distinfo,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 distinfo
--- distinfo1 Dec 2017 00:08:44 -   1.45
+++ distinfo2 Mar 2022 23:53:06 -
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.44.tar.gz) = mQoyXbtH132Idy3QL7vSfZGx/qPs52yf9EYeypPxIpk=
-SIZE (stunnel-5.44.tar.gz) = 699117
+SHA256 (stunnel-5.62.tar.gz) = nPW7lJAiqmbHNsEyZVTMon0GQWBaY3AnTtxJUetb0zk=
+SIZE (stunnel-5.62.tar.gz) = 862456
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/security/stunnel/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in   1 Dec 2017 00:08:44 -   1.15
+++ patches/patch-Makefile_in   2 Mar 2022 23:53:06 -
@@ -1,13 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.15 2017/12/01 00:08:44 gsoares Exp $
+$OpenBSD$
+
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -364,7 +364,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+@@ -371,7 +371,7 @@ top_srcdir = @top_srcdir@
+ with_bashcompdir = @with_bashcompdir@
+ AM_DISTCHECK_CONFIGURE_FLAGS = 
--with-bashcompdir='$$(datarootdir)/bash-completion/completions'
  ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = src doc tools tests
 +SUBDIRS = src doc tests
- EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS INSTALL.W32 INSTALL.WCE \
-   INSTALL.FIPS build-android.sh .travis.yml
- doc_DATA = INSTALL README TODO COPYING AUTHORS ChangeLog PORTS BUGS \
+ doc_DATA = README.md TODO.md COPYING.md AUTHORS.md NEWS.md PORTS.md \
+   BUGS.md COPYRIGHT.md CREDITS.md INSTALL.W32.md INSTALL.WCE.md \
+   INSTALL.FIPS.md
Index: patches/patch-src_client_c
===
RCS file: patches/patch-src_client_c
diff -N patches/patch-src_client_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_client_c  2 Mar 2022 23:53:06 -
@@ -0,0 +1,30 @@
+Index: src/client.c
+--- src/client.c.orig
 src/client.c
+@@ -750,7 +750,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiat
+ NOEXPORT void transfer(CLI *c) {
+ int timeout; /* s_poll_wait timeout in seconds */
+ int pending; /* either processed on unprocessed TLS data */
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ int has_pending=0, prev_has_pending;
+ #endif
+ int watchdog=0; /* a counter to detect an infinite loop */
+@@ -797,7 +797,7 @@ NOEXPORT void transfer(CLI *c) {
+ 
+ /** wait for an event */
+ pending=SSL_pending(c->ssl);
+-#if OPENSSL_VERSI

Re: [UPDATE] security/stunnel to 5.62

[Gleydson Soares]

> Updates security/stunnel to 5.62
> 
> Lots of changes, some of which are marked with urgency 'HIGH' and which
> might affect OpenBSD users as well: https://www.stunnel.org/NEWS.html
> 
> Upstream seems to be opposed to having stunnel linked with LibreSSL, and the
> changes between 5.44 (currently in ports) and 5.62 would need a substantial
> amount of patches just to make it compile. Since I don't have the insight
> necessary not to introduce a bug by doing so, I built it against OpenSSL
> from ports, and thought I'd just throw it out there for discussion.

Yes, it's needed some LIBRESSL_VERSION_NUMBER dance to make it compile.

I have already a patch that makes it compile against libressl, slight
tested though, I will tidy up and provide here yet today or tomorrow.

> * Kept the sections for pop3s, imaps and ssmtp commented out in the default
> /etc/stunnel.conf, since I personally can't think of a reason why I'd want
> stunnel to listen on those ports by default

ok

> * Update mirror sites to those documented at
> https://www.stunnel.org/downloads.html
...
> 
> * Changed homepage and mirrors to use https
> 

fine for both.

Thanks for your work on it.
gsoares

Re: mpv: add youtube-dl to RUN_DEPENDS

[Gleydson Soares]

>yt-dlp would probably be a better choice (mpv prefers it over
>youtube-dl).

sure, i couldn't agree more about it.
diff updated, ok?

Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile29 Jan 2022 12:30:14 -  1.79
+++ Makefile27 Feb 2022 18:34:42 -
@@ -6,6 +6,8 @@ GH_ACCOUNT =mpv-player
 GH_PROJECT =   mpv
 GH_TAGNAME =   v0.34.1
 
+REVISION = 0
+
 SHARED_LIBS += mpv 0.2 # 1.109
 
 CATEGORIES =   multimedia x11
@@ -54,6 +56,7 @@ LIB_DEPENDS = archivers/libarchive \
 
 MODPY_RUNDEP = No
 RUN_DEPENDS =  devel/desktop-file-utils \
+   www/yt-dlp \
x11/gtk+3,-guic
 
 SEPARATE_BUILD =   Yes

mpv: add youtube-dl to RUN_DEPENDS

[Gleydson Soares]

the following patch adds youtube-dl to mpv's RUN_DEPENDS.

$ mpv --no-video https://www.youtube.com/watch?v=...
[ytdl_hook]
[ytdl_hook] youtube-dl failed: not found or not enough permissions
Failed to recognize file format.

OK?

Thanks,
gsoares
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile29 Jan 2022 12:30:14 -  1.79
+++ Makefile27 Feb 2022 13:06:35 -
@@ -6,6 +6,8 @@ GH_ACCOUNT =mpv-player
 GH_PROJECT =   mpv
 GH_TAGNAME =   v0.34.1
 
+REVISION = 0
+
 SHARED_LIBS += mpv 0.2 # 1.109
 
 CATEGORIES =   multimedia x11
@@ -54,6 +56,7 @@ LIB_DEPENDS = archivers/libarchive \
 
 MODPY_RUNDEP = No
 RUN_DEPENDS =  devel/desktop-file-utils \
+   www/youtube-dl \
x11/gtk+3,-guic
 
 SEPARATE_BUILD =   Yes

Re: lang/crystal: unbreak, update to 1.0.0

[Gleydson Soares]

On Mon, Jun 07, 2021 at 08:11:31AM -0500, joshua stein wrote:
> I sent an earlier version to the maintainer and pinged them on IRC 
> but got no response.

it seems that maintainer timeouts.
since it works for you, go for it, OK gsoares

> 
> 
> diff --git lang/crystal/Makefile lang/crystal/Makefile
> index 406341bee4a..99e0d5c4fc3 100644
> --- lang/crystal/Makefile
> +++ lang/crystal/Makefile
> @@ -1,12 +1,11 @@
>  # $OpenBSD: Makefile,v 1.10 2021/05/13 23:52:00 jca Exp $
>  
> -BROKEN = needs an update to support llvm-11
> -
>  # Hopefully ${CLANG_ARCHS} at some point.
>  ONLY_FOR_ARCHS=  amd64
>  
> -V =  0.30.1
> -V_SHARDS =   0.9.0
> +V =  1.0.0
> +V_SHARDS =   0.14.1
> +V_MOLINILLO =0.2.0
>  COMMENT =statically typed object oriented language
>  DISTNAME =   crystal-${V}
>  CATEGORIES = lang
> @@ -18,18 +17,27 @@ MAINTAINER =  Wesley Moxam 
>  PERMIT_PACKAGE = Yes
>  
>  WANTLIB += ${COMPILER_LIBCXX} c event_core event_extra gc iconv
> -WANTLIB += m pcre yaml
> +WANTLIB += m pcre crypto ssl yaml-0 z
> +
> +#
> +# crystal-X-OpenBSDX.X.tar.gz is an archive of a bootstrap compiler object
> +# (crystal.o) which can be cross-compiled on another platform by installing 
> the
> +# current version of Crystal there, then checking out the source for that
> +# version and running:
> +#
> +#make crystal FLAGS="--cross-compile --target amd64-unknown-openbsd6.9"
> +#
> +# The result will be built at .build/crystal.o
> +#
>  
> -# Requires a bootstrap compiler object (crystal.o) which can be built by:
> -# .build/crystal build --cross-compile \
> -#--target amd64-unknown-openbsd`uname -r` src/compiler/crystal.cr \
> -#-D i_know_what_im_doing
>  MASTER_SITES =   https://github.com/crystal-lang/crystal/archive/
> -MASTER_SITES0 =  https://wmoxam.com/public/
> +MASTER_SITES0 =  https://jcs.org/distfiles/
>  MASTER_SITES1 =  https://github.com/crystal-lang/shards/archive/
> +MASTER_SITES2 =  
> https://github.com/crystal-lang/crystal-molinillo/archive/
>  DISTFILES =  crystal-${V}{${V}}.tar.gz \
> - crystal-${V}-OpenBSD6.5.tar.gz:0 \
> - shards-${V}{v${V_SHARDS}}.tar.gz:1
> + crystal-${V}-OpenBSD6.9.tar.gz:0 \
> + shards-${V}{v${V_SHARDS}}.tar.gz:1 \
> + crystal-molinillo-${V}{v${V_MOLINILLO}}.tar.gz:2
>  
>  # Build requires llvm-config from ports, not from base
>  COMPILER =   ports-clang
> @@ -49,6 +57,10 @@ ALL_TARGET =   crystal release=1
>  
>  NO_TEST =Yes
>  
> +post-extract:
> + mv ${WRKDIR}/shards-${V_SHARDS} ${WRKSRC}/
> + mv ${WRKDIR}/crystal-molinillo-${V_MOLINILLO} ${WRKSRC}/
> +
>  do-build:
>   mkdir -p ${WRKSRC}/.build
>   # Link the compiler from the pre-built bootstrap object
> @@ -57,27 +69,21 @@ do-build:
>   cd ${WRKSRC} && ${CXX} -rdynamic -o ${WRKBUILD}/.build/crystal \
>   ${WRKSRC}/../crystal.o \
>   ${WRKSRC}/src/llvm/ext/llvm_ext.o \
> - ${WRKSRC}/src/ext/sigfault.o \
> + ${WRKSRC}/src/ext/libcrystal.a \
>   -L${LOCALBASE}/lib \
>   `(${LLVM_CONFIG} --libs --system-libs --ldflags 2> /dev/null)` \
>   -lz -lpcre -lgc -lpthread -levent_core -levent_extra -lssl \
> - -lcrypto -liconv
> - # Use the compiler to re-compile the compiler
> - touch ${WRKSRC}/src/compiler/crystal.cr
> - cd ${WRKSRC}; \
> - ulimit -s 5120 -d 4096000 && \
> - CRYSTAL_CONFIG_PATH="lib:${TRUEPREFIX}/lib/crystal" \
> - CXX=${CXX} LLVM_CONFIG=${LLVM_CONFIG} \
> - ${MAKE_PROGRAM} ${ALL_TARGET}
> - cd ${WRKSRC}/../shards-${V_SHARDS} && \
> - ${MAKE_PROGRAM} CRYSTAL=${WRKSRC}/.build/crystal \
> - CRYSTAL_PATH=${WRKSRC}/src CRFLAGS=--release
> + -lcrypto -liconv -lc++abi
> + cd ${WRKSRC}/shards-${V_SHARDS} && \
> + env CRYSTAL_PATH=lib:${WRKSRC}/src \
> + CRYSTAL=${WRKSRC}/.build/crystal \
> + ${MAKE_PROGRAM}
>  
>  do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/lib/crystal
>   ${INSTALL_PROGRAM} ${WRKSRC}/.build/crystal ${PREFIX}/bin
>   cd ${WRKSRC}/src && pax -rw . ${PREFIX}/lib/crystal/
> - ${INSTALL_PROGRAM} ${WRKSRC}/../shards-${V_SHARDS}/bin/shards \
> + ${INSTALL_PROGRAM} ${WRKSRC}/shards-${V_SHARDS}/bin/shards \
>   ${PREFIX}/bin
>  
>  .include 
> diff --git lang/crystal/distinfo lang/crystal/distinfo
> index 5cf9a544801..3d3e9e90d8c 100644
> --- lang/crystal/distinfo
> +++ lang/crystal/distinfo
> @@ -1,6 +1,8 @@
> -SHA256 (crystal-0.30.1-OpenBSD6.5.tar.gz) = 
> xbFY8RkhoDFnsK++X5C3YFsSNS7arkwwu1yBsrCR6vY=
> -SHA256 (crystal-0.30.1.tar.gz) = D/wA+lSSnCUzvAvLieCwAd06vEcMzIfjV2BHpc2vwGI=
> -SHA256 (shards-0.30.1.tar.gz) = kPIwyHzHuUyoReb+NPJSPtyttWLXFdqvmGA+36KpTWU=
> -SIZE (crystal-0.30.1-OpenBSD6.5.tar.gz) = 7035204
> -SIZE (crystal-0.30.1.tar.gz) = 2153037
> -SIZE (shards-0.30.1.tar.gz) = 41280

Re: Remove devel/mk

[Gleydson Soares]

> > markus? gsoares?
> > 
> > Without objection, I'll remove those unversioned ports in favour of
> > plan9port soon.
> 
> markus mailed gsoares and myself but not the list
> 'they are replaced by plan9port and can be removed'.

no objection to this, please go ahead
OK gsoares@

Re: move games/ski to python3

[Gleydson Soares]

> your tree is out of date; this is a standalone port so FLAVOR isn't used here.

you are right, my tree is missing this commit:
https://marc.info/?l=openbsd-ports-cvs&m=161411788212618&w=2

OK gsoares@

Re: move games/ski to python3

[Gleydson Soares]

> According to NEWS, games/ski was ported to python3 as of version 6.10.
>
> Diff below updates to latest version and moves the port over to python3.
>
> ok?

`make install' still tries to pick up python 2

===> ski-6.13 depends on: python->=2.7,<2.8 - not found

Since you removed the MODPY_DEFAULT_VERSION_2 you should use FLAVOR
instead, it's is missing setting FLAVOR to python 3 by adding
the a following lines:

FLAVORS =   python3
FLAVOR =python3

Otherwise, OK gsoares@

- gsoares

Re: remove emulators/pcsxr

[Gleydson Soares]

> pcsxr has always been buggy on OpenBSD, and the upstream is dead and
> gone.

It seems a strong reason for removal. OK gsoares@

Re: update plan9/plan9port

[Gleydson Soares]

On Sat, Jan 30, 2021 at 03:29:16PM +1100, Jonathan Gray wrote:
> update plan9port to a newer snapshot
> 
> fixes clang 11 build by using -fcommon:
> https://github.com/9fans/plan9port/commit/69439fae6705a125047246c889384ed3aeb4d104

ok gsoares

UPDATE: mail/imapfilter to 2.7.5

[Gleydson Soares]

Find attached a diff that updates imapfilter to latest release 2.7.5.
Builds now with pcre2 and needs a patch for linking against libressl.

Nathanael, could you check it works for you?

feedback and OKs are welcome,

Thanks,
- gsoares
Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:47:28 -  1.24
+++ Makefile23 Jan 2021 11:17:52 -
@@ -2,7 +2,7 @@
 
 COMMENT=   remote IMAP filtering utility
 
-V= 2.6.11
+V= 2.7.5
 DISTNAME=  imapfilter-${V}
 
 GH_TAGNAME=v${V}
@@ -16,12 +16,12 @@ MAINTAINER= Gleydson Soares = 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+   SSL_set_hostflags(ssn->sslconn,
+   X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+   if (!SSL_set1_host(ssn->sslconn, ssn->server)) {

Re: UPDATE: Nono-0.1.4

[Gleydson Soares]

On Fri, Nov 20, 2020 at 05:01:14PM +0100, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> And yet another version of Nono with some fixes:
> 
> http://www.pastel-flower.jp/~isaki/nono/
> 
> OK? Comments?
> 
> Cheers.-

I think it should go in, it's a bugfix release.
OK gsoares@

Re: UPDATE net/profanity 0.9.3 and take MAINTAINER

[Gleydson Soares]

On Thu, Jun 25, 2020 at 03:01:47AM +, Lucas wrote:
> Hello ports,
> 
> This is a simple update to 0.9.3, with some bug fixes since 0.9.0.
> 
>   * Make legacy auth optional (0.9.1)
>   * Dont manipulate pointer from getenv (0.9.2)
>   * Fix reading/writing linked files (0.9.2)
>   * Use gnu99 C standard (0.9.2)
>   * Fix expansion in eval_password (0.9.3)
> 
> While there, take maintainership. Rafael asked privately to do it in
> the past and was my intention after 0.9.0 release, but he beated me to
> send the patch. ^^

looks fine, it's missing `make update-patches' though.

diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac  18 Jun 2020 20:44:16 -  1.5
+++ patches/patch-configure_ac  25 Jun 2020 14:19:12 -

Re: UPDATE: security/luasec-0.9

[Gleydson Soares]

> Deployed this on my server and I don't see any issue so far. In fact,
> prosody is communicating over TLS without problems, so I'd it's OK
> from prosody side.

thanks for testing, i have just committed the luasec update.

> Regarding setting NO_TEST, bsd.port.mk(5) says it should be set to Yes
> "only for ports with no regression test", so I'm not sure if using Yes
> here would be an abuse.

yes, right. 
maybe we should add a comment showing that failure is kwown.
? prosofy.diff
Index: Makefile
===
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile2 Jun 2020 07:22:46 -   1.57
+++ Makefile23 Jun 2020 11:16:39 -
@@ -20,7 +20,10 @@ MODLUA_RUN_DEPENDS+= databases/luadbi \
devel/luafs \
security/luasec \
textproc/luaexpat>=1.3.0
+
+# fails, depends on busted not yet in
 TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
+
 WANTLIB+=  crypto idn
 
 CONFIGURE_STYLE=simple

UPDATE: security/luasec-0.9

[Gleydson Soares]

the following diff updates luasec to 0.9.

the only consumer of luasec on ports is net/prosody
looks like regress is broken though, see:

===>  Regression tests for prosody-0.11.5
busted --lua=lua51
/bin/sh: busted: not found

seems lua-busted is not in ports yet, so maybe we should
set NO_TEST until busted is in.
? luasec-0.9.diff
Index: Makefile
===
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile12 Jul 2019 20:49:05 -  1.22
+++ Makefile21 Jun 2020 20:45:41 -
@@ -4,8 +4,7 @@ COMMENT=lua binding to OpenSSL to provi
 
 GH_ACCOUNT=brunoos
 GH_PROJECT=luasec
-GH_TAGNAME=luasec-0.7
-DISTNAME=  ${GH_TAGNAME}
+GH_TAGNAME=v0.9
 
 CATEGORIES=security
 
Index: distinfo
===
RCS file: /cvs/ports/security/luasec/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo8 Sep 2018 17:21:14 -   1.7
+++ distinfo21 Jun 2020 20:45:41 -
@@ -1,2 +1,2 @@
-SHA256 (luasec-0.7.tar.gz) = IXbpWx0qcqMjXt5dKqmDgFD+7lXa3o/b3kvn/cZvOjE=
-SIZE (luasec-0.7.tar.gz) = 47965
+SHA256 (luasec-0.9.tar.gz) = a2uU6FF79rr1RfrSmiES+ax5V62FtKro4HJ77HfXoyU=
+SIZE (luasec-0.9.tar.gz) = 52163
Index: patches/patch-src_Makefile
===
RCS file: /cvs/ports/security/luasec/patches/patch-src_Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_Makefile
--- patches/patch-src_Makefile  8 Sep 2018 17:21:14 -   1.6
+++ patches/patch-src_Makefile  21 Jun 2020 20:45:41 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_Makefile,v 1.6 2018/
 Index: src/Makefile
 --- src/Makefile.orig
 +++ src/Makefile
-@@ -12,8 +12,8 @@ LIBS=-lssl -lcrypto -lluasocket
+@@ -13,8 +13,8 @@ LIBS=-lssl -lcrypto -lluasocket
  
  WARN=-Wall -pedantic
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/luasec/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   8 Sep 2018 17:21:14 -   1.8
+++ pkg/PLIST   21 Jun 2020 20:45:41 -
@@ -1,9 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.8 2018/09/08 17:21:14 gsoares Exp $
-lib/lua/${MODLUA_VERSION}/ssl.so
+@so lib/lua/${MODLUA_VERSION}/ssl.so
 share/examples/${FULLPKGNAME}/
 share/examples/${FULLPKGNAME}/README
+share/examples/${FULLPKGNAME}/alpn/
+share/examples/${FULLPKGNAME}/alpn/client.lua
+share/examples/${FULLPKGNAME}/alpn/server.lua
 share/examples/${FULLPKGNAME}/certs/
 share/examples/${FULLPKGNAME}/certs/all.bat
+share/examples/${FULLPKGNAME}/certs/all.sh
 share/examples/${FULLPKGNAME}/certs/clientA.bat
 share/examples/${FULLPKGNAME}/certs/clientA.cnf
 share/examples/${FULLPKGNAME}/certs/clientA.sh
@@ -29,6 +33,8 @@ share/examples/${FULLPKGNAME}/chain/util
 share/examples/${FULLPKGNAME}/curve-negotiation/
 share/examples/${FULLPKGNAME}/curve-negotiation/client.lua
 share/examples/${FULLPKGNAME}/curve-negotiation/server.lua
+share/examples/${FULLPKGNAME}/dane/
+share/examples/${FULLPKGNAME}/dane/client.lua
 share/examples/${FULLPKGNAME}/dhparam/
 share/examples/${FULLPKGNAME}/dhparam/client.lua
 share/examples/${FULLPKGNAME}/dhparam/params.sh
@@ -54,6 +60,11 @@ share/examples/${FULLPKGNAME}/loop/serve
 share/examples/${FULLPKGNAME}/luaossl/
 share/examples/${FULLPKGNAME}/luaossl/client.lua
 share/examples/${FULLPKGNAME}/luaossl/server.lua
+share/examples/${FULLPKGNAME}/multicert/
+share/examples/${FULLPKGNAME}/multicert/client-ecdsa.lua
+share/examples/${FULLPKGNAME}/multicert/client-rsa.lua
+share/examples/${FULLPKGNAME}/multicert/gencerts.sh
+share/examples/${FULLPKGNAME}/multicert/server.lua
 share/examples/${FULLPKGNAME}/oneshot/
 share/examples/${FULLPKGNAME}/oneshot/client.lua
 share/examples/${FULLPKGNAME}/oneshot/server.lua

Re: UPDATE: net/castget 2.0.1

[Gleydson Soares]

Hi Caspar,

> Thanks for your feedback. I updated the HOMEPAGE, thanks. I would be
> fine with taking over maintainership. The updated diff below reflects
> that.

committed, thanks.

Re: UPDATE: net/castget 2.0.1

[Gleydson Soares]

Hi Caspar,

At first glance it looks fine, just a slight tweak in your diff, HOMEPAGE= 
should be updated to https://castget.johndal.com/

I’m no longer using this port, Would you like to take over maintainership? 

Thanks for the patch.
gsoares 

> On 12 Jun 2020, at 16:19, Caspar Schutijser  wrote:
> 
> Hi,
> 
> Below is a diff that updates net/castget to 2.0.1. Briefly tested on
> amd64, seems to work fine here. This version accepts RSS URLs that start
> with "https://"; (the old version thinks it should look for a file unless
> the URL starts with "http://";). The shared library is gone (proof at
> [1]).
> 
> Thanks,
> Caspar Schutijser
> 
> [1] 
> https://github.com/mlj/castget/commit/6241ea22ab4c8bad216eec1cf4d5605eb74839ad
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/castget/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile12 Jul 2019 20:48:23 -1.25
> +++ Makefile12 Jun 2020 19:06:44 -
> @@ -2,14 +2,14 @@
> 
> COMMENT=command-line podcast downloader
> 
> -DISTNAME=castget-1.0.1
> -REVISION=11
> -SHARED_LIBS +=castget  0.0  # .0.0
> +DISTNAME=castget-2.0.1
> CATEGORIES=net
> 
> HOMEPAGE=http://www.nongnu.org/castget
> 
> MASTER_SITES=  ${MASTER_SITE_SAVANNAH:=castget/}
> +
> +EXTRACT_SUFX=.tar.bz2
> 
> MAINTAINER=Gleydson Soares 
> 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/castget/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo18 Jan 2015 03:14:37 -1.3
> +++ distinfo12 Jun 2020 19:06:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (castget-1.0.1.tar.gz) = RKIB079vlaWA0qPERvNZXztdGpJ3AgbTEcroqwXmgOo=
> -SIZE (castget-1.0.1.tar.gz) = 355696
> +SHA256 (castget-2.0.1.tar.bz2) = Q4tffsfjGkXtN1ZjD+RH9CAVrNpT7AkgL0hihya16HU=
> +SIZE (castget-2.0.1.tar.bz2) = 320226
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/castget/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST16 Mar 2015 18:07:51 -1.3
> +++ pkg/PLIST12 Jun 2020 19:06:44 -
> @@ -1,9 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:51 naddy Exp $
> @bin bin/castget
> -include/libcastget.h
> -lib/libcastget.a
> -lib/libcastget.la
> -@lib lib/libcastget.so.${LIBcastget_VERSION}
> @man man/man1/castget.1
> @man man/man5/castgetrc.5
> share/examples/castget/

Re: UPDATE: plan9port-20200519

[Gleydson Soares]

On Sun, May 24, 2020 at 12:27:25PM -0300, Gleydson Soares wrote:
> Hi,
> 
> here is an update [1] for plan9port, bringing it to latest github commit.
> 
> i have removed some heavy optional run_dependencies to slim down it, since 
> it does not affect the plan9port usability itself. if one wants to read .ps 
> file or whatever you should just install pkg_add ghostscript/etc and use your
> plumber pattern to reach them ;-)
> 
> I have removed the following extra files what are not part of plan9port,
> it looks like out-of-date i doubt someone will note it is out:
> 
> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
> - cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz
> 
> while here get rid of MAP_STACK patch has been merged upstream [2]
> 
> i tidy up the port, it requires some additional cleanup i will do afterwards
> though,
> 
> works fine here, if you are a plan9port user please raise your hands
> 
> [1] https://trusted.com.br/gsoares/plan9port-20200519.diff
> [2] 
> https://github.com/9fans/plan9port/commit/8c573cab6819c69142389d36b978b3c683771afe

Neither feedback nor objetions. I'll commit it tomorrow unless 
someone objects until there.

UPDATE: plan9port-20200519

[Gleydson Soares]

Hi,

here is an update [1] for plan9port, bringing it to latest github commit.

i have removed some heavy optional run_dependencies to slim down it, since 
it does not affect the plan9port usability itself. if one wants to read .ps 
file or whatever you should just install pkg_add ghostscript/etc and use your
plumber pattern to reach them ;-)

I have removed the following extra files what are not part of plan9port,
it looks like out-of-date i doubt someone will note it is out:

- cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
- cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
- cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz

while here get rid of MAP_STACK patch has been merged upstream [2]

i tidy up the port, it requires some additional cleanup i will do afterwards
though,

works fine here, if you are a plan9port user please raise your hands

[1] https://trusted.com.br/gsoares/plan9port-20200519.diff
[2] 
https://github.com/9fans/plan9port/commit/8c573cab6819c69142389d36b978b3c683771afe
? plan9port-20200519.diff
Index: Makefile
===
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile20 Mar 2020 16:44:27 -  1.32
+++ Makefile24 May 2020 15:02:53 -
@@ -5,12 +5,11 @@ BROKEN-powerpc =  threading issues
 
 COMMENT =  Plan 9 from user space
 
-DISTNAME = plan9port-20190619
-REVISION = 0
+DISTNAME = plan9port-20200519
 
 GH_ACCOUNT =   9fans
 GH_PROJECT =   plan9port
-GH_COMMIT =e995a0c101863688d5f14649ae3de45a7c43789c
+GH_COMMIT =bfe4377e409ce271c479665e6ef966a7b6008626
 
 CATEGORIES =   plan9
 
@@ -24,16 +23,6 @@ PERMIT_PACKAGE = Yes
 
 WANTLIB =  X11 Xext c m pthread util fontconfig freetype z
 
-DISTFILES =${GH_COMMIT}.tar.gz pgw.tar.bz2:1 \
-   roget.tar.bz2:0 scat.tgz:1
-DIST_SUBDIR =  plan9port
-MASTER_SITES0 =http://pdos.lcs.mit.edu/~rsc/software/plan9/
-MASTER_SITES1 =http://pdos.lcs.mit.edu/~rsc/
-
-BUILD_DEPENDS =archivers/bzip2
-RUN_DEPENDS =  print/ghostscript/gnu \
-   print/gv
-
 WRKDIST =  ${WRKDIR}/plan9port-${GH_COMMIT}
 
 PLAN9 =${PREFIX}/plan9
@@ -43,19 +32,15 @@ NO_TEST =   Yes
 SUBST_VARS +=  CC
 UPDATE_PLIST_ARGS += -i CC
 
-post-extract:
-   cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
-   cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
-   cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz
-
 post-patch:
-   cd ${WRKSRC}/src/libthread && cp Darwin-x86_64-swapcontext.c \
-   OpenBSD-x86_64.c && cp Darwin-x86_64-asm.s \
+   cd ${WRKSRC}/src/libthread && cp Darwin-x86_64-asm.s \
OpenBSD-x86_64-asm.S && mv OpenBSD-386-asm.s \
OpenBSD-386-asm.S
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/INSTALL ${WRKSRC}/bin/{9c,9l}
+   cd ${WRKSRC} && sed -i 's,#!/bin/bash,#!/bin/sh,' \
+   bin/{macedit,wintext}
 
 do-build:
cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" ./INSTALL -b
@@ -66,6 +51,7 @@ do-install:
 .endfor
cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
`cat lib/moveplan9.files`
+
${INSTALL_DATA_DIR} ${PLAN9}
cd ${WRKSRC} && pax -rw . ${PLAN9}
cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9
Index: distinfo
===
RCS file: /cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo11 Sep 2019 00:40:54 -  1.12
+++ distinfo24 May 2020 15:02:53 -
@@ -1,8 +1,2 @@
-SHA256 (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = 
Y54LsBco/9fMF1Husb/HMUYV2I1vp/TN4hAzrZdiJiQ=
-SHA256 (plan9port/pgw.tar.bz2) = WMdWEelUjG7muSL6OsgnCmPsJMn88b1OPtEYQn8TVtw=
-SHA256 (plan9port/roget.tar.bz2) = sk8FE1Tavljx2CXinbOGCRyErsmBJdvkma3spRoyqDY=
-SHA256 (plan9port/scat.tgz) = qZX1JUSnEvK9uH9TFjjUyEYiT6khLQNOO9joCcuZvh4=
-SIZE (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = 23439831
-SIZE (plan9port/pgw.tar.bz2) = 9404968
-SIZE (plan9port/roget.tar.bz2) = 482956
-SIZE (plan9port/scat.tgz) = 5145346
+SHA256 (plan9port-20200519-bfe4377e.tar.gz) = 
TvWs9bPicRSZYfAU3TwBs1a/iCe743v8BQEpotRyGjk=
+SIZE (plan9port-20200519-bfe4377e.tar.gz) = 23447210
Index: patches/patch-INSTALL
===
RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v
retrieving revision 1.7
diff -u -p -r1.7 patch-INSTALL
--- patches/patch-INSTALL   11 Sep 2019 00:40:54 -  1.7
+++ patches/patch-INSTALL   24 May 2020 15:02:53 -
@@ -3,33 +3,33 @@ $OpenBSD: patch-INSTALL,v 1.7 2019/09/11
 Index: INSTALL
 --- I

Re: slock 1.4 / bsd-auth

[Gleydson Soares]

On Sun, May 24, 2020 at 02:15:58AM +0200, Theo Buehler wrote:
> > Actually, i3 has a feature for dealing with it though, --release:
> > try better: bindsym --release $mod+Mod1+l exec "slock"
> 
> That works, thanks. I'm fine with this going in if the port's copy of
> explicit_bzero is disabled with "COMPATSRC=".

sthen@
You have my OK either way, with or w/o COMPATSRC stuff tweak
requested by tb@

Re: slock 1.4 / bsd-auth

[Gleydson Soares]

On Thu, May 21, 2020 at 01:49:36PM +0200, Theo Buehler wrote:
> On Thu, May 21, 2020 at 11:58:37AM +0100, Stuart Henderson wrote:
> > I've written a patch to add bsd-auth support back to slock 1.4 which
> > I've been using for a while. Tidied the make variable handling a bit
> > as well, no need to patch to use ?=, they can just be overridden with
> > MAKE_FLAGS. OK?
> 
> I would prefer if this used the libc version of explicit_bzero instead
> of the local copy. For this, set COMPATSRC to empty in compat.mk (why do
> you add a COPTSFLAG=-Os via a patch?).
> 
> While the updated slock seems to work fine from the command line, it
> doesn't lock at all if I use it from a i3 binding.  I have been using
> 
>   bindsym $mod+Mod1+l exec "slock"

It happens with some X11 apps that request the mouse pointer right away, 
but it is grabbed so it fails, 

You can fix it changing your bindkey to something like:
"bindsym --release $mod+Mod1+l exec "sleep 0.5 ; slock"

Actually, i3 has a feature for dealing with it though, --release:
try better: bindsym --release $mod+Mod1+l exec "slock"

Re: slock 1.4 / bsd-auth

[Gleydson Soares]

On Thu, May 21, 2020 at 11:58:37AM +0100, Stuart Henderson wrote:
> I've written a patch to add bsd-auth support back to slock 1.4 which
> I've been using for a while. Tidied the make variable handling a bit
> as well, no need to patch to use ?=, they can just be overridden with
> MAKE_FLAGS. OK?

OK gsoares@

Re: deluge: Remove obsolete x11/py-gtk2 dependency

[Gleydson Soares]

On Sat, Apr 25, 2020 at 03:28:53AM +0200, Klemens Nanni wrote:
> 
> rsadowski's last update of deluge moved it to Python 3.  GTK+2 is no
> longer in use, deluge-gtk uses GTK+3.
> 
> Builds and runs fine without x11/py-gtk2 installed, which is Python 2
> only and therefore kept pulling it in.
> 
> OK?

ok gsoares@

Re: Remove devel/py-iniparse ?

[Gleydson Soares]

On Thu, Apr 23, 2020 at 11:14:44PM -0400, Kurt Mosiejczuk wrote:
> This was originally imported because tortoisehg needed it. Well,
> tortoisehg is gone. Let it go as well? It hasn't been updated in
> 8 years and has no consumers.

kill it with fire!

Re: UPDATE: Nextcloud-18.0.3

[Gleydson Soares]

On Sun, Mar 29, 2020, at 5:50 AM, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Update for Nextcloud to 18.0.3:
> 
> https://nextcloud.com/changelog
> 
> OK? 

This is a bugfix release that includes a security update, please go ahead.
OK gsoares@

> 
> Cheers.-
> 
> -- 
> 
>   - gonzalo
> 
> Attachments:
> * nextcloud-18.0.3.diff

Re: [Update] net/wireguard-tools : Update to 1.0.20191226

[Gleydson Soares]

On Fri, Dec 27, 2019 at 06:46:47PM +0100, Klemens Nanni wrote:
> On Fri, Dec 27, 2019 at 05:38:20PM +0100, Jason A. Donenfeld wrote:
> > -V =0.0.20191212
> > -DISTNAME = WireGuard-$V
> > +V =1.0.20191226
> > +DISTNAME = wireguard-tools-$V
> >  PKGNAME =  wireguard-tools-$V
> Now they're the same, so PKGNAME can go as it defaults to DISTNAME.

good catch, with that tweak it is ok gsoares@ 

Re: [update] OfflineIMAP version 7.3.2

[Gleydson Soares]

On Thu, Dec 26, 2019 at 11:14:19AM +0100, Remi Locherer wrote:
> Hi,
> 
> this updates our OfflineIMAP package to version 7.3.2.
> This release doesn't contain many changes.
> 
> Changelog can be found here:
> https://github.com/OfflineIMAP/offlineimap/blob/v7.3.2/Changelog.md
> (see changes for 7.3.1 and 7.3.2)
> 
> OK?

change homepage/master_sites to https, otherwise OK gsoares@


> 
> Remi
> 
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/offlineimap/Makefile,v
> retrieving revision 1.56
> diff -u -p -r1.56 Makefile
> --- Makefile  5 Sep 2019 20:22:41 -   1.56
> +++ Makefile  26 Dec 2019 09:58:53 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= powerful IMAP/Maildir synchronization and reader support
>  
> -MODPY_EGG_VERSION = 7.3.0
> +MODPY_EGG_VERSION = 7.3.2
>  DISTNAME =   offlineimap-v${MODPY_EGG_VERSION}
>  PKGNAME =offlineimap-${MODPY_EGG_VERSION}
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/offlineimap/distinfo,v
> retrieving revision 1.42
> diff -u -p -r1.42 distinfo
> --- distinfo  5 Sep 2019 20:22:41 -   1.42
> +++ distinfo  26 Dec 2019 09:59:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (offlineimap-v7.3.0.tar.gz) = 
> MKX+O9UkiW6u/pzTojQa2gUuzEnjN9dQ9Rla+YUjO28=
> -SIZE (offlineimap-v7.3.0.tar.gz) = 739413
> +SHA256 (offlineimap-v7.3.2.tar.gz) = 
> ZyCh2l04+24PKzwnvOdPzgv3FLXHDS8PC6xlT0uilCM=
> +SIZE (offlineimap-v7.3.2.tar.gz) = 740338
> 

Re: TEST_POD [was Re: [Update] net/p5-Net-BGP : Update to 0.17]

[Gleydson Soares]

> On 18 Sep 2019, at 12:26, Stuart Henderson  wrote:
> 
>> On 2019/09/18 05:48, Gleydson Soares wrote:
>> 
>> 
>>>> On 18 Sep 2019, at 04:40, Stuart Henderson  wrote:
>>>> 
>>>> On 2019/09/18 02:15, wen heping wrote:
>>>> Hi, ports@:
>>>> 
>>>>  Here is a patch for net/p5-Net-BGP:
>>>>  i) Update to 0.17
>>>>  ii) Add TEST_POD=yes
>>> 
>>> I've been wondering for a while... what's the point in using TEST_POD
>>> in ports? Isn't that more of an "author test" kind of thing?
>>> 
>> 
>> Some p5- ports fails on regress since it depends on p5- pod packages you 
>> mean disabling pod tests?
> 
> I mean, what's the point in enabling POD tests for things that don't
> normally do them?
> 

sure, adding no-op dependencies is wrong...

Re: TEST_POD [was Re: [Update] net/p5-Net-BGP : Update to 0.17]

[Gleydson Soares]

> On 18 Sep 2019, at 04:40, Stuart Henderson  wrote:
> 
>> On 2019/09/18 02:15, wen heping wrote:
>> Hi, ports@:
>> 
>>   Here is a patch for net/p5-Net-BGP:
>>   i) Update to 0.17
>>   ii) Add TEST_POD=yes
> 
> I've been wondering for a while... what's the point in using TEST_POD
> in ports? Isn't that more of an "author test" kind of thing?
> 

Some p5- ports fails on regress since it depends on p5- pod packages you mean 
disabling pod tests?

Re: NEW: net/doh

[Gleydson Soares]

> On 14 Sep 2019, at 20:28, Stuart Henderson  wrote:
> 
>> On 2019/09/13 12:57, Gleydson Soares wrote:
>> i have fixed the segfault by adding a patch and also i put the pkg-readme.
>> pull request done, upstream aware.
>> 
>> this one is OK gsoares@
> 
> I don't like hand-copying README.md to pkg/README at all.
> 
> README.md could be installed to PREFIX/share/doc/doh but it doesn't seem
> very useful as it's right there on HOMEPAGE anyway, plus it's such a
> simple utility ...
> 

Either as it turns out or removing readme from pkg/ OK gsoares@

Looks like upstream merged a fix addressing the segfault, the PR was closed 
such that GH_COMMIT should be updated + get rid of patch-doh-c.

BR,
Gleydson.

Re: NEW: net/doh

[Gleydson Soares]

i have fixed the segfault by adding a patch and also i put the pkg-readme.
pull request done, upstream aware.

this one is OK gsoares@


doh-revised.tgz
Description: application/tar-gz

Re: NEW: net/doh

[Gleydson Soares]

On Fri, Sep 13, 2019 at 02:48:22PM +0100, Stuart Henderson wrote:
> ---
> doh is a simple tool that uses libcurl to resolve a host name
> using a POST request to a DNS-over-HTTPS (DoH) server.
> ---
> 
> ok to import? (the syntax is friendlier than sdig for simple tests)
> 

buids and works fine here:

openbsd-dev$ doh trusted.com.br
trusted.com.br from https://dns.cloudflare.com/dns-query
TTL: 3064 seconds
A: 45.76.92.19

Noticed a bug though, seems argc is not well-handled:

openbsd-dev$ doh -t
Segmentation fault (core dumped)

Also, Would be useful installing the README as pkg-readme.


If DOH URL is left out, the Cloudflare DOH server will be used. See also
[list
of public
servers](https://github.com/curl/curl/wiki/DNS-over-HTTPS#publicly-available-servers)


:-)

Re: [Update] net/p5-Net-Frame : Update to 1.21

[Gleydson Soares]

On Mon, Aug 26, 2019 at 06:36:00AM +, wen heping wrote:
> Hi,
> 
>Here is a patch for net/p5-Net-Frame:
>i) Update to 1.21
>ii) Remove BUILD_DEPENDS which is not needed.
>iii) Add TEST_POD=yes to MAKE_ENV
> 
>It build well and passed all tests on amd64-head system.
> 
>Three ports depends on net/p5-Net-Frame:
>   net/p5-Net-Frame-Dump

it was missing regen the plist
+share/examples/p5-Net-Frame/resolv-ipv6.pl

committed !

>   net/p5-Net-Frame-Layer-ICMPv6

committed!

>   net/p5-Net-Frame-Layer-IPv6

fixed TEST_POD by passing it to MAKE_ENV= 
committed!

Re: ????: [Update] net/p5-Net-Frame-Layer-IPv6 : Update to 1.08

[Gleydson Soares]

commited, thanks.

Re: UPDATE: devel/cppcheck 1.87 -> 1.88

[Gleydson Soares]

On Tue, Sep 03, 2019 at 06:00:15PM +1000, Jonathan Gray wrote:
> On Tue, Aug 27, 2019 at 06:53:16PM +0200, Hiltjo Posthuma wrote:
> > Hi,
> > 
> > The patch below updates cppcheck from 1.87 to 1.88.
> > 
> > Briefly tested on amd64.
> 
> here is 1.89
> 
> default output format changed, for previous style --template=cppcheck1

Testing Complete
Number of tests: 3438
Number of todos: 179
Tests failed: 0

OK gsoares@

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/cppcheck/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- Makefile  12 Jul 2019 20:44:06 -  1.55
> +++ Makefile  3 Sep 2019 07:13:22 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =C/C++ static checker
>  
> -DISTNAME =   cppcheck-1.87
> +DISTNAME =   cppcheck-1.89
>  
>  CATEGORIES = devel
>  
> @@ -27,10 +27,10 @@ TEST_TARGET = test
>  TEST_DEPENDS =   ${FULLPKGNAME}:${BUILD_PKGPATH}
>  
>  # -Ilib before PREFIX/include to avoid picking up header from devel/check
> -MAKE_FLAGS = BIN=${PREFIX}/bin SRCDIR=build \
> - CFGDIR=${PREFIX}/share/cppcheck/cfg \
> +MAKE_FLAGS = BIN=${PREFIX}/bin HAVE_RULES=yes \
> + FILESDIR=${PREFIX}/share/cppcheck \
>   CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -std=c++11" \
> - CPPFLAGS="-DHAVE_RULES -DTIXML_USE_STL -Ilib 
> -I${PREFIX}/include" \
> + CPPFLAGS="-DTIXML_USE_STL -Ilib -I${PREFIX}/include" \
>   LDFLAGS="-L${PREFIX}/lib -lpcre -lexecinfo"
>  
>  MODULES =lang/python
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/cppcheck/distinfo,v
> retrieving revision 1.41
> diff -u -p -r1.41 distinfo
> --- distinfo  5 Mar 2019 00:19:27 -   1.41
> +++ distinfo  3 Sep 2019 07:01:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (cppcheck-1.87.tar.gz) = l3Kvafz4K6U0IZLHXh5hBXtHMlvS0veM6k49Np/QCDw=
> -SIZE (cppcheck-1.87.tar.gz) = 2243258
> +SHA256 (cppcheck-1.89.tar.gz) = 7GuJLyiPqIJr3aJUkSEhoFigZSYiKoErNibFpl2XMH4=
> +SIZE (cppcheck-1.89.tar.gz) = 2455141
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/cppcheck/pkg/PLIST,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST
> --- pkg/PLIST 5 Mar 2019 00:19:27 -   1.13
> +++ pkg/PLIST 3 Sep 2019 07:07:36 -
> @@ -8,18 +8,27 @@ share/cppcheck/cfg/boost.cfg
>  share/cppcheck/cfg/bsd.cfg
>  share/cppcheck/cfg/cppcheck-cfg.rng
>  share/cppcheck/cfg/cppcheck-lib.cfg
> +share/cppcheck/cfg/cppunit.cfg
> +share/cppcheck/cfg/daca.cfg
>  share/cppcheck/cfg/embedded_sql.cfg
>  share/cppcheck/cfg/gnu.cfg
>  share/cppcheck/cfg/googletest.cfg
>  share/cppcheck/cfg/gtk.cfg
> +share/cppcheck/cfg/libcerror.cfg
> +share/cppcheck/cfg/libcurl.cfg
> +share/cppcheck/cfg/lua.cfg
>  share/cppcheck/cfg/microsoft_sal.cfg
>  share/cppcheck/cfg/motif.cfg
> +share/cppcheck/cfg/nspr.cfg
> +share/cppcheck/cfg/opengl.cfg
> +share/cppcheck/cfg/openmp.cfg
>  share/cppcheck/cfg/posix.cfg
>  share/cppcheck/cfg/python.cfg
>  share/cppcheck/cfg/qt.cfg
>  share/cppcheck/cfg/ruby.cfg
>  share/cppcheck/cfg/sdl.cfg
>  share/cppcheck/cfg/sfml.cfg
> +share/cppcheck/cfg/sqlite3.cfg
>  share/cppcheck/cfg/std.cfg
>  share/cppcheck/cfg/tinyxml2.cfg
>  share/cppcheck/cfg/windows.cfg

Re: [update] plan9/plan9port 20180117 -> 20190619

[Gleydson Soares]

committed, thanks!

Re: [update] plan9/plan9port 20180117 -> 20190619

[Gleydson Soares]

On Sun, Aug 11, 2019 at 03:42:09PM -0400, Patrick Marchand wrote:
> Hi Gleydson / ports,
> 
> Here is a revised patch for plan9port. I had messed up quite a few
> things in my first try, but I now think I understand the ports
> system much better.
> 
> Main changes I've seen include:
>  - Plumb allows @ in filenames
>  - Web patch was upstreamed
>  - Import of paint program from 9front
>  - Acme drops trailing spaces on Put when in auto-indent mode
>  - Various fixes
> 
> Let me know if I'm missing something or messed up the diff.

Hi Patrick,

makesum complais here, the extra stuff wasnt moved yet into
new MASTER_SITES, ill ask Russ Cox for providing it over 
there.


{x220} /usr/ports/plan9/plan9port $ make makesum
===>  Checking files for plan9port-20190619
`/usr/ports/distfiles/plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz'
is up to date.
>> Fetch https://swtch.com/~rsc/pgw.tar.bz2
ftp: Error retrieving file: 404 Not Found
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2993
'/usr/ports/distfiles/plan9port/pgw.tar.bz2': @lock=pgw.tar.bz2.dist;
/usr/...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2272
'_internal-fetch-all')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2447
'fetch-all')
*** Error 1 in /usr/ports/plan9/plan9port
(/usr/ports/infrastructure/mk/bsd.port.mk:2090 'makesum')


so,we should keep the following for now:

-MASTER_SITES0 = http://pdos.lcs.mit.edu/~rsc/software/plan9/
-MASTER_SITES1 =http://pdos.lcs.mit.edu/~rsc/

Thanks,
Gleydson.

Re: plan9port: win(1) hang on acme(1) window

[Gleydson Soares]

> Gleydson, could you take a look at my diff that updates the port
> to the latest git commit? I'ts my first time contributing to a port
> and I'd like to know if my diff is okay.

Your diff reads ok, but it didn't apply clearly here, could you work 
on fixing it and resend the patch ? 
also, since you are updating the port it doesn't require REVISION= bump, 
you can zap it.

Re: plan9port: win(1) hang on acme(1) window

[Gleydson Soares]

Hi,

I will have a look at it tonight. Even though I’m running acme/win with no 
issues. Will try reproduce it on a newer snapshot.

> On 16 Jul 2019, at 04:25, a...@gmx.com wrote:
> 
> Hi
> 
>> I also opened up an issue on the github repository of the project:
>> https://github.com/9fans/plan9port/issues/275
> 
> Great, thanks! I'll follow it
> 
> Regards.
> 

Re: NEW: Tacacs+ port - shrubbery.net version

[Gleydson Soares]

Hi sthen,

> Slightly tweaked version attached, this one's ok with me:
> 
> - https homepage
> - PERMIT_*_CDROM is not used for new ports
> - whitespace nit in Makefile
> - tweak comment in patch
> - place @extraunexec above the @sample line, that way pkg_delete -c doesn't
> complain about a missing dir. (pkg_delete without -c will complain about
> not being able to remove the dir, that is no problem).
> - regen plist to include pkg-readme
> - adjust pkg-readme to set uid/gid on the files
> - change group ownership of log dir to wheel, easier for admins

thanks for the review, gonna commit this one.

Re: NEW: Tacacs+ port - shrubbery.net version

[Gleydson Soares]

Try with the change below and Let us know if it works for you, 

Thank you 

sent from my mobile device

On Fri, May 24, 2019, at 7:43 AM, Gleydson Soares wrote:
> it requires _tacacs user due to privdrop, so you need to uncomment the 
> folllwing line:
> {x250} /usr/ports $ grep -rn tacacs /usr/ports/infrastructure/*
> /usr/ports/infrastructure/db/user.list:22:#511 _tacacs _tacacs net/tacacs+
> 
> i'm with limited internet access till tomorrow morning, i will take look at 
> this port and diffs tomorrow 
> 
> 
> 
> On Fri, May 24, 2019, at 7:37 AM, Ampie Niemand wrote:
> > Hi, all.
> > 
> > Thanks for reviving this awesome service.
> > 
> > I'm failing at the last hurdle with both macppc and amd64:
> > 
> > ..
> > ..
> > ===> Building package for tacacs+-4.0.4.28v0
> > Create /usr/ports/packages/powerpc/all/tacacs+-4.0.4.28v0.tgz
> > Creating package tacacs+-4.0.4.28v0
> > Error: newgroup _tacacs: not registered in
> > /usr/ports/infrastructure/db/user.list
> > Error: newuser _tacacs: not registered in
> > /usr/ports/infrastructure/db/user.list
> > Fatal error: can't continue
> > at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1675.
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2026
> > '/usr/ports/packages/powerpc/all/tacacs+-4.0.4.28v0.tgz')
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2487
> > '_internal-package')
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2466
> > 'package')
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2039
> > '/var/db/pkg/tacacs+-4.0.4.28v0/+CONTENTS')
> > *** Error 1 in /usr/ports/mystuff/net/tacacs+
> > (/usr/ports/infrastructure/mk/bsd.port.mk:2466
> > 'install')
> > 
> > .
> > 
> > On Mon, 20 May 2019 at 21:56, Gleydson Soares  
> > wrote:
> > >
> > > Hi Jan,
> > >
> > > thank you for your effort on this port.
> > > i've pushed it to openbsd-wip at
> > > https://github.com/jasperla/openbsd-wip/tree/master/net/tacacs%2B
> > > it addresses the joint work of you and sthen@
> > >
> > > are you still ok regarding of taking maintanership?
> > >
> > > i will give some extra tests and double review next days.
> > >
> > > Thank you,
> > > Gleydson.
> > >
> >
> 
> 

Re: NEW: Tacacs+ port - shrubbery.net version

[Gleydson Soares]

it requires _tacacs user due to privdrop, so you need to uncomment the 
folllwing line:
{x250} /usr/ports $ grep -rn tacacs /usr/ports/infrastructure/*
/usr/ports/infrastructure/db/user.list:22:#511 _tacacs  _tacacs 
net/tacacs+

i'm with limited internet access till tomorrow morning, i will take look at 
this port and diffs tomorrow 



On Fri, May 24, 2019, at 7:37 AM, Ampie Niemand wrote:
> Hi, all.
> 
> Thanks for reviving this awesome service.
> 
> I'm failing at the last hurdle with both macppc and amd64:
> 
> ..
> ..
> ===>  Building package for tacacs+-4.0.4.28v0
> Create /usr/ports/packages/powerpc/all/tacacs+-4.0.4.28v0.tgz
> Creating package tacacs+-4.0.4.28v0
> Error: newgroup _tacacs: not registered in
> /usr/ports/infrastructure/db/user.list
> Error: newuser _tacacs: not registered in
> /usr/ports/infrastructure/db/user.list
> Fatal error: can't continue
>  at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1675.
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2026
> '/usr/ports/packages/powerpc/all/tacacs+-4.0.4.28v0.tgz')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2487
> '_internal-package')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2466
> 'package')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2039
> '/var/db/pkg/tacacs+-4.0.4.28v0/+CONTENTS')
> *** Error 1 in /usr/ports/mystuff/net/tacacs+
> (/usr/ports/infrastructure/mk/bsd.port.mk:2466
> 'install')
> 
> .
> 
> On Mon, 20 May 2019 at 21:56, Gleydson Soares  wrote:
> >
> > Hi Jan,
> >
> > thank you for your effort on this port.
> > i've pushed it to openbsd-wip at
> > https://github.com/jasperla/openbsd-wip/tree/master/net/tacacs%2B
> > it addresses the joint work of you and sthen@
> >
> > are you still ok regarding of taking maintanership?
> >
> > i will give some extra tests and double review next days.
> >
> > Thank you,
> > Gleydson.
> >
>

Re: NEW: Tacacs+ port - shrubbery.net version

[Gleydson Soares]

> Can you use the standard locations for doc/examples please rather
> than /usr/local/share/tacacs?

Yep.

> Needs @extraunexec rm -f /var/log/tac_plus/* for pkg_delete -c.

Done.
Thanks for the feedback, i'm pushing it to openbsd-wip.

PS.: I'm running it and works just fine  It has a dozen of Cisco Nexus switches 
already connected. 
privdrop (_tacacs) fine.

I will add some changes to example files provided by  Jan Vlach, for pointing 
out how to use tac_plus on the fly on OpenBSD.(like features available with and 
without privdrop / etc).

Also should be nice sent patches upstream. Jan Vlach, what do you think about?

Cheers,

Re: NEW: Tacacs+ port - shrubbery.net version

[Gleydson Soares]

Hi Jan,

thank you for your effort on this port.
i've pushed it to openbsd-wip at
https://github.com/jasperla/openbsd-wip/tree/master/net/tacacs%2B
it addresses the joint work of you and sthen@

are you still ok regarding of taking maintanership?

i will give some extra tests and double review next days.

Thank you,
Gleydson.

Re: [hppa] FIX: devel/libowfat

[Gleydson Soares]

Hi Brian,
If it works for you on your hppa machine it should be OK on 
enabling it again, as you said after unlock. 

OK gsoares@ 

On Mon, Apr 08, 2019 at 12:35:14AM -0400, Brian Callahan wrote:
> Hi ports --
> 
> Obviously for after unlock. devel/libowfat is marked BROKEN-hppa. But it
> seems like this is no longer necessary; I just built/installed it no problem
> on my hppa machine with base-gcc. Doesn't seem to use atomics.
> 
> ~Brian
> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libowfat/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  17 May 2018 09:53:02 -  1.7
> +++ Makefile  8 Apr 2019 04:32:57 -
> @@ -1,7 +1,6 @@
>  # $OpenBSD: Makefile,v 1.7 2018/05/17 09:53:02 espie Exp $
>  
>  COMMENT =library of general purpose APIs
> -BROKEN-hppa =missing atomic ops
>  
>  SO_VERSION = 0.0
>  SHARED_LIBS +=   owfat ${SO_VERSION}

Re: NEW: x11/i3-gaps

[Gleydson Soares]

Builds and runs fine here, even though I’m not an i3 user so slight tested!
If it works for you please, put it in. ok with me.

On Sun, Mar 3, 2019, at 7:40 AM, Rafael Sadowski wrote:
> Hi ports@
> 
> Inserted by x11/i3-mousedrag, please find attached a i3 fork port with
> gaps support. I use it over 2 weeks without issues. I added a README
> with an imported hint.
> 
> Feedback / OK?!
> 
> RS
> 
> $ pkg_info i3-gaps
> 
> Information for inst:i3-gaps-4.16.1
> 
> Comment:
> improved dynamic tiling window manager, fork with gaps
> 
> Description:
> i3 is an improved dynamic, tiling window manager originally inspired by wmii.
> 
> This fork adds support for gaps, smart gaps, smart borders and hide edge
> borders.
> 
> Maintainer: The OpenBSD ports mailing-list 
> 
> WWW: https://i3wm.org/
> 
> 
> 
> *Attachments:*
>  * i3-gaps.tar.gz

Re: [update] www/luakit to 2.1

[Gleydson Soares]

On Thu, Jan 31, 2019 at 07:31:48PM -0700, Aaron Bieber wrote:
> Hello!
> 
> This diff does a few things:
> 
> - Bump epoch because upstream has actual releases now.
> - Regen WANTLIB.
> - Stop trying to run tests that don't exist.
> - Fix MAKE_FLAGS and include html docs.
> 
> Tests fine for me on amd64. OK?

builds and runs fine here. OK gsoares@

UPDATE: net/ii-1.8

[Gleydson Soares]

Attached is a diff for updating net/ii to 1.8.

I've removed support for (ssl and ucspi) patches, I think We should not maintain
those suckless patches on ports, if one wants to add extra features then should
get the source, apply the customizations and build it oneself, that's the
philosophy of the suckless project. the patches just add complexity and makes
things tough to maintain up-to-date.  there're dozen patches at:
https://tools.suckless.org/ii/patches

While here, i've patched net/ii for using unveil(2).

also: 
- remove query.sh script, since it's no longer maintained upstream; 
- switch master_sites/homepage to https; 
- added pkg/README file with instructions on how setup ii/tls by using relayd(8)
take from upstream: https://git.suckless.org/ii/file/README.html

btw since i'm removing the ucspi FLAVOR, dunno if there's someone here using
ii-ucspi for handling IPv6, ii-1.8 release has native IPv6 support in, also
supports to connect directly to a UNIX domain socket, useful for tunneling
connections.
Index: Makefile
===
RCS file: /cvs/ports/net/ii/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile8 Dec 2017 12:19:41 -   1.15
+++ Makefile22 Sep 2018 03:20:32 -
@@ -2,15 +2,12 @@
 
 COMMENT=   minimalist IRC client
 
-DISTNAME=  ii-1.7
-REVISION=  3
+DISTNAME=  ii-1.8
 CATEGORIES=net
 FIX_EXTRACT_PERMISSIONS=Yes
 
-
-HOMEPAGE=  http://tools.suckless.org/ii
-MASTER_SITES=  http://dl.suckless.org/tools/
-MASTER_SITES0= ${HOMEPAGE}/patches/
+HOMEPAGE=  https://tools.suckless.org/ii/
+MASTER_SITES=  https://dl.suckless.org/tools/
 
 MAINTAINER=Gleydson Soares 
 
@@ -22,32 +19,11 @@ WANTLIB=c
 
 NO_TEST=   Yes
 
-FLAVORS=   ucspi
-FLAVOR?=
-
-# patches from http://tools.suckless.org/ii/patches
-PATCH_DIST_STRIP=  -p1
-
-.if ${FLAVOR} == "ucspi"
-# adds unix client server programming interface support
-PATCHFILES+=   ${DISTNAME}-ucspi.diff:0
-PATCH_LIST=patch-* ucspipatch-*
-RUN_DEPENDS=   net/ucspi-tools
-.else
-# adds ssl encryption support
-PATCHFILES+=   ${DISTNAME}-ssl.diff:0
-PATCH_LIST=patch-* sslpatch-*
-WANTLIB+=  crypto ssl
-.endif
-
-SUPDISTFILES+= ${DISTNAME}-ssl.diff:0
-SUPDISTFILES+= ${DISTNAME}-ucspi.diff:0
-
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ii ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/ii.1 ${PREFIX}/man/man1/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ii
-   ${INSTALL_DATA} ${WRKSRC}/{README,FAQ,query.sh} ${PREFIX}/share/doc/ii
+   ${INSTALL_DATA} ${WRKSRC}/{README,FAQ} ${PREFIX}/share/doc/ii
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/ii/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo21 May 2016 05:31:38 -  1.6
+++ distinfo22 Sep 2018 03:20:32 -
@@ -1,6 +1,2 @@
-SHA256 (ii-1.7-ssl.diff) = 8arZ/XrHGLHsiIrg5aj/z/fmb0mRScdj5yvIZjrN448=
-SHA256 (ii-1.7-ucspi.diff) = +teAZTglx5YRD+OX6noPVewnwlnJQAIRfbSJdK3xqyY=
-SHA256 (ii-1.7.tar.gz) = OnKsZgbVVgtiXAYscfE1gg4iFP7QmObWJPxAYy3HzJw=
-SIZE (ii-1.7-ssl.diff) = 7631
-SIZE (ii-1.7-ucspi.diff) = 5161
-SIZE (ii-1.7.tar.gz) = 10174
+SHA256 (ii-1.8.tar.gz) = udnh6uJeYwcZYOkhr4sherGr5kIQvSkJlKyheKjcaNI=
+SIZE (ii-1.8.tar.gz) = 12326
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile  2 Mar 2011 15:06:04 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2011/03/02 15:06:04 jasper Exp $
-
-Don't do "silent builds".
-
 Makefile.orig  Wed Mar  2 16:04:54 2011
-+++ Makefile   Wed Mar  2 16:05:05 2011
-@@ -20,7 +20,7 @@ options:
- 
- .c.o:
-   @echo CC $<
--  @${CC} -c ${CFLAGS} $<
-+  ${CC} -c ${CFLAGS} $<
- 
- dist: clean
-   @mkdir -p ii-${VERSION}
-@@ -32,7 +32,7 @@ dist: clean
- 
- ii: ${OBJ}
-   @echo LD $@
--  @${CC} -o $@ ${OBJ} ${LDFLAGS}
-+  ${CC} -o $@ ${OBJ} ${LDFLAGS}
- 
- install: all
-   @mkdir -p ${DESTDIR}${DOCDIR}
Index: patches/patch-config_mk
===
RCS file: patches/patch-config_mk
diff -N patches/patch-config_mk
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-config_mk 22 Sep 2018 03:20:32 -
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Index: config.mk
+--- config.mk.orig
 config.mk
+@@ -9,11 +9,11 @@ MAN1DIR  = ${MANDIR}/man1
+ DOCDIR   = ${PREFIX}/share/doc/ii
+ 
+ # includes and libs
+-INCLUDES = -I. -I/usr/inclu

Re: UPDATE: Spectrwm-3.2.0

[Gleydson Soares]

On Sat, Sep 08, 2018 at 11:50:54PM +0200, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Update for Spectrwm to 3.2.0:
> 
> https://github.com/conformal/spectrwm/releases
> 
> OK? Comments?

works fine here. 
the patch-Makefile is missing rcs id.
otherwise, OK gsoares@
? 1.patch
Index: Makefile
===
RCS file: /cvs/ports/x11/spectrwm/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile5 Oct 2017 14:14:48 -   1.24
+++ Makefile9 Sep 2018 01:03:30 -
@@ -4,7 +4,7 @@ COMMENT=small tiling window manager
 
 SHARED_LIBS=   swmhack 1.0
 
-V= 3.1.0
+V= 3.2.0
 GH_TAGNAME=SPECTRWM_${V:S/./_/g}
 GH_ACCOUNT=conformal
 GH_PROJECT=spectrwm
Index: distinfo
===
RCS file: /cvs/ports/x11/spectrwm/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo5 Oct 2017 14:14:48 -   1.21
+++ distinfo9 Sep 2018 01:03:30 -
@@ -1,2 +1,2 @@
-SHA256 (spectrwm-3.1.0.tar.gz) = t6XiT+bZI6rauUfTVP9ErXQrch2q8zRYTo7qnhVknZo=
-SIZE (spectrwm-3.1.0.tar.gz) = 147206
+SHA256 (spectrwm-3.2.0.tar.gz) = +4AEQmIPdi3miiNu+acnjYuO9tpcG27bwMibHm6V73w=
+SIZE (spectrwm-3.2.0.tar.gz) = 150691
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/spectrwm/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile  16 Apr 2017 19:42:28 -  1.7
+++ patches/patch-Makefile  9 Sep 2018 01:03:30 -
@@ -1,5 +1,8 @@
 Makefile.orig  Mon May 23 17:45:08 2016
-+++ Makefile   Sun Apr 16 20:41:24 2017
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
 Makefile
 @@ -12,7 +12,7 @@ CFLAGS+=-std=c99 -Wmissing-prototypes -Wall -Wextra -W
  # Uncomment define below to disallow user settable clock format string
  #CFLAGS+=-DSWM_DENY_CLOCK_FORMAT
Index: patches/patch-spectrwm_c
===
RCS file: /cvs/ports/x11/spectrwm/patches/patch-spectrwm_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-spectrwm_c
--- patches/patch-spectrwm_c5 Oct 2017 14:14:48 -   1.8
+++ patches/patch-spectrwm_c9 Sep 2018 01:03:30 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-spectrwm_c,v 1.8 2017/10
 Index: spectrwm.c
 --- spectrwm.c.orig
 +++ spectrwm.c
-@@ -275,7 +275,7 @@ uint32_t   swm_debug = 0
+@@ -291,7 +291,7 @@ uint32_t   swm_debug = 0
  #define SWM_CONF_KEYMAPPING   (1)
  
  #ifndef SWM_LIB

Re: UPDATE: security/luasec-0.7

[Gleydson Soares]

On Sat, Sep 08, 2018 at 05:36:46PM +0100, Stuart Henderson wrote:
> On 2018/09/08 13:24, Gleydson Soares wrote:
> > > the following diff updates luasec to 0.7.
> > > 
> > > changelog:
> > > https://github.com/brunoos/luasec/blob/master/CHANGELOG
> > 
> > +regen patches
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/luasec/Makefile,v
> > retrieving revision 1.20
> > diff -u -p -r1.20 Makefile
> > --- Makefile16 Oct 2016 23:21:23 -  1.20
> > +++ Makefile8 Sep 2018 16:23:19 -
> > @@ -2,10 +2,12 @@
> >  
> >  COMMENT=   lua binding to OpenSSL to provide TLS/SSL communication
> >  
> > -VERSION=   0.6
> > -REVISION=  0
> > +VERSION=   0.7
> >  DISTNAME=  luasec-${VERSION}
> >  
> > +GH_ACCOUNT=brunoos
> > +GH_PROJECT=luasec
> > +
> 
> If you're using these, you also need GH_TAGNAME (or GH_COMMIT, but it
> would be GH_TAGNAME here - and no need for DISTNAME/VERSION).

done. ok?
thanks,
Index: Makefile
===
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile16 Oct 2016 23:21:23 -  1.20
+++ Makefile8 Sep 2018 16:43:08 -
@@ -2,9 +2,9 @@
 
 COMMENT=   lua binding to OpenSSL to provide TLS/SSL communication
 
-VERSION=   0.6
-REVISION=  0
-DISTNAME=  luasec-${VERSION}
+GH_ACCOUNT=brunoos
+GH_PROJECT=luasec
+GH_TAGNAME=0.7
 
 CATEGORIES=security
 
@@ -29,7 +29,7 @@ MAKE_ENV+=INC_PATH="-I${MODLUA_INCL_DIR
 
 NO_TEST=   Yes
 
-WRKDIST=   ${WRKDIR}/luasec-luasec-${VERSION}
+WRKDIST=   ${WRKDIR}/luasec-luasec-${GH_TAGNAME}
 
 ALL_TARGET=bsd
 
Index: distinfo
===
RCS file: /cvs/ports/security/luasec/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Mar 2016 01:04:51 -  1.6
+++ distinfo8 Sep 2018 16:43:08 -
@@ -1,2 +1,2 @@
-SHA256 (luasec-0.6.tar.gz) = zvOjXBi+uKVNnIzmJgpMq72aOG3ocRMg0ITa/60K7V0=
-SIZE (luasec-0.6.tar.gz) = 51071
+SHA256 (luasec-0.7.tar.gz) = IXbpWx0qcqMjXt5dKqmDgFD+7lXa3o/b3kvn/cZvOjE=
+SIZE (luasec-0.7.tar.gz) = 47965
Index: patches/patch-src_Makefile
===
RCS file: /cvs/ports/security/luasec/patches/patch-src_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_Makefile
--- patches/patch-src_Makefile  14 Apr 2014 01:20:10 -  1.5
+++ patches/patch-src_Makefile  8 Sep 2018 16:43:08 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_Makefile,v 1.5 2014/04/14 01:20:10 jturner Exp $
 src/Makefile.orig  Wed Jan 29 15:43:33 2014
-+++ src/Makefile   Sun Apr 13 21:13:13 2014
-@@ -10,8 +10,8 @@ LIBS=-lssl -lcrypto -lluasocket
+Index: src/Makefile
+--- src/Makefile.orig
 src/Makefile
+@@ -12,8 +12,8 @@ LIBS=-lssl -lcrypto -lluasocket
  
  WARN=-Wall -pedantic
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/luasec/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   20 May 2016 02:24:30 -  1.7
+++ pkg/PLIST   8 Sep 2018 16:43:08 -
@@ -1,81 +1,87 @@
-@comment $OpenBSD: PLIST,v 1.7 2016/05/20 02:24:30 gsoares Exp $
+@comment $OpenBSD: PLIST,v$
 lib/lua/${MODLUA_VERSION}/ssl.so
-share/examples/${FULLPKGNAME}/
-share/examples/${FULLPKGNAME}/README
-share/examples/${FULLPKGNAME}/certs/
-share/examples/${FULLPKGNAME}/certs/all.bat
-share/examples/${FULLPKGNAME}/certs/clientA.bat
-share/examples/${FULLPKGNAME}/certs/clientA.cnf
-share/examples/${FULLPKGNAME}/certs/clientA.sh
-share/examples/${FULLPKGNAME}/certs/clientB.bat
-share/examples/${FULLPKGNAME}/certs/clientB.cnf
-share/examples/${FULLPKGNAME}/certs/clientB.sh
-share/examples/${FULLPKGNAME}/certs/rootA.bat
-share/examples/${FULLPKGNAME}/certs/rootA.cnf
-share/examples/${FULLPKGNAME}/certs/rootA.sh
-share/examples/${FULLPKGNAME}/certs/rootB.bat
-share/examples/${FULLPKGNAME}/certs/rootB.cnf
-share/examples/${FULLPKGNAME}/certs/rootB.sh
-share/examples/${FULLPKGNAME}/certs/serverA.bat
-share/examples/${FULLPKGNAME}/certs/serverA.cnf
-share/examples/${FULLPKGNAME}/certs/serverA.sh
-share/examples/${FULLPKGNAME}/certs/serverB.bat
-share/examples/${FULLPKGNAME}/certs/serverB.cnf
-share/examples/${FULLPKGNAME}/certs/serverB.sh
-share/examples/${FULLPKGNAME}/chain/
-share/examples/${FULLPKGNAME}/chain/client.lua
-share/examples/${FULLPKGNAME}/chain/server.lua
-share/examples/${FULLPKGNAME}/chain/util.lua
-share/examples/${FULLPKGNAME}/dhparam/
-share/examples/${FULLPKGNAME}/dhparam/client.lua
-share/examples/${FULLPKGNAME}/dhparam/params.sh
-share/examples/${FULLPKGNAME}/dhpa

Re: UPDATE: security/luasec-0.7

[Gleydson Soares]

> the following diff updates luasec to 0.7.
> 
> changelog:
> https://github.com/brunoos/luasec/blob/master/CHANGELOG

+regen patches
Index: Makefile
===
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile16 Oct 2016 23:21:23 -  1.20
+++ Makefile8 Sep 2018 16:23:19 -
@@ -2,10 +2,12 @@
 
 COMMENT=   lua binding to OpenSSL to provide TLS/SSL communication
 
-VERSION=   0.6
-REVISION=  0
+VERSION=   0.7
 DISTNAME=  luasec-${VERSION}
 
+GH_ACCOUNT=brunoos
+GH_PROJECT=luasec
+
 CATEGORIES=security
 
 HOMEPAGE=  https://github.com/brunoos/luasec/wiki
@@ -16,8 +18,6 @@ MAINTAINER=   Gleydson Soares https://github.com/brunoos/luasec/archive/
 
 MODULES=   lang/lua
 MODLUA_RUN_DEPENDS+=   net/luasocket
Index: distinfo
===
RCS file: /cvs/ports/security/luasec/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Mar 2016 01:04:51 -  1.6
+++ distinfo8 Sep 2018 16:23:19 -
@@ -1,2 +1,2 @@
-SHA256 (luasec-0.6.tar.gz) = zvOjXBi+uKVNnIzmJgpMq72aOG3ocRMg0ITa/60K7V0=
-SIZE (luasec-0.6.tar.gz) = 51071
+SHA256 (luasec-0.7.tar.gz) = IXbpWx0qcqMjXt5dKqmDgFD+7lXa3o/b3kvn/cZvOjE=
+SIZE (luasec-0.7.tar.gz) = 47965
Index: patches/patch-src_Makefile
===
RCS file: /cvs/ports/security/luasec/patches/patch-src_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_Makefile
--- patches/patch-src_Makefile  14 Apr 2014 01:20:10 -  1.5
+++ patches/patch-src_Makefile  8 Sep 2018 16:23:19 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_Makefile,v 1.5 2014/04/14 01:20:10 jturner Exp $
 src/Makefile.orig  Wed Jan 29 15:43:33 2014
-+++ src/Makefile   Sun Apr 13 21:13:13 2014
-@@ -10,8 +10,8 @@ LIBS=-lssl -lcrypto -lluasocket
+Index: src/Makefile
+--- src/Makefile.orig
 src/Makefile
+@@ -12,8 +12,8 @@ LIBS=-lssl -lcrypto -lluasocket
  
  WARN=-Wall -pedantic
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/luasec/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   20 May 2016 02:24:30 -  1.7
+++ pkg/PLIST   8 Sep 2018 16:23:19 -
@@ -1,81 +1,87 @@
-@comment $OpenBSD: PLIST,v 1.7 2016/05/20 02:24:30 gsoares Exp $
+@comment $OpenBSD: PLIST,v$
 lib/lua/${MODLUA_VERSION}/ssl.so
-share/examples/${FULLPKGNAME}/
-share/examples/${FULLPKGNAME}/README
-share/examples/${FULLPKGNAME}/certs/
-share/examples/${FULLPKGNAME}/certs/all.bat
-share/examples/${FULLPKGNAME}/certs/clientA.bat
-share/examples/${FULLPKGNAME}/certs/clientA.cnf
-share/examples/${FULLPKGNAME}/certs/clientA.sh
-share/examples/${FULLPKGNAME}/certs/clientB.bat
-share/examples/${FULLPKGNAME}/certs/clientB.cnf
-share/examples/${FULLPKGNAME}/certs/clientB.sh
-share/examples/${FULLPKGNAME}/certs/rootA.bat
-share/examples/${FULLPKGNAME}/certs/rootA.cnf
-share/examples/${FULLPKGNAME}/certs/rootA.sh
-share/examples/${FULLPKGNAME}/certs/rootB.bat
-share/examples/${FULLPKGNAME}/certs/rootB.cnf
-share/examples/${FULLPKGNAME}/certs/rootB.sh
-share/examples/${FULLPKGNAME}/certs/serverA.bat
-share/examples/${FULLPKGNAME}/certs/serverA.cnf
-share/examples/${FULLPKGNAME}/certs/serverA.sh
-share/examples/${FULLPKGNAME}/certs/serverB.bat
-share/examples/${FULLPKGNAME}/certs/serverB.cnf
-share/examples/${FULLPKGNAME}/certs/serverB.sh
-share/examples/${FULLPKGNAME}/chain/
-share/examples/${FULLPKGNAME}/chain/client.lua
-share/examples/${FULLPKGNAME}/chain/server.lua
-share/examples/${FULLPKGNAME}/chain/util.lua
-share/examples/${FULLPKGNAME}/dhparam/
-share/examples/${FULLPKGNAME}/dhparam/client.lua
-share/examples/${FULLPKGNAME}/dhparam/params.sh
-share/examples/${FULLPKGNAME}/dhparam/server.lua
-share/examples/${FULLPKGNAME}/digest/
-share/examples/${FULLPKGNAME}/digest/client.lua
-share/examples/${FULLPKGNAME}/digest/server.lua
-share/examples/${FULLPKGNAME}/ecdh/
-share/examples/${FULLPKGNAME}/ecdh/client.lua
-share/examples/${FULLPKGNAME}/ecdh/server.lua
-share/examples/${FULLPKGNAME}/info/
-share/examples/${FULLPKGNAME}/info/client.lua
-share/examples/${FULLPKGNAME}/info/server.lua
-share/examples/${FULLPKGNAME}/key/
-share/examples/${FULLPKGNAME}/key/genkey.sh
-share/examples/${FULLPKGNAME}/key/loadkey.lua
-share/examples/${FULLPKGNAME}/loop/
-share/examples/${FULLPKGNAME}/loop-gc/
-share/examples/${FULLPKGNAME}/loop-gc/client.lua
-share/examples/${FULLPKGNAME}/loop-gc/server.lua
-share/examples/${FULLPKGNAME}/loop/client.lua
-share/examples/${FULLPKGNAME}/loop/server.lua
-share/examples/${FULLPKGNAME}/oneshot/
-share/examples/${FULLPKGNAME}/oneshot/client.lua
-share/examples/${FULLPKGNAME}/oneshot/server.lua
-share/examples/${FULLPKGNAME}/sni/
-share/examples/${FULLPKGNAME}/sni/client.lua
-share/examples/${FULL

UPDATE: security/luasec-0.7

[Gleydson Soares]

the following diff updates luasec to 0.7.

changelog:
https://github.com/brunoos/luasec/blob/master/CHANGELOG

OK?
Index: Makefile
===
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile16 Oct 2016 23:21:23 -  1.20
+++ Makefile8 Sep 2018 15:56:09 -
@@ -2,10 +2,12 @@
 
 COMMENT=   lua binding to OpenSSL to provide TLS/SSL communication
 
-VERSION=   0.6
-REVISION=  0
+VERSION=   0.7
 DISTNAME=  luasec-${VERSION}
 
+GH_ACCOUNT=brunoos
+GH_PROJECT=luasec
+
 CATEGORIES=security
 
 HOMEPAGE=  https://github.com/brunoos/luasec/wiki
@@ -16,8 +18,6 @@ MAINTAINER=   Gleydson Soares https://github.com/brunoos/luasec/archive/
 
 MODULES=   lang/lua
 MODLUA_RUN_DEPENDS+=   net/luasocket
Index: distinfo
===
RCS file: /cvs/ports/security/luasec/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Mar 2016 01:04:51 -  1.6
+++ distinfo8 Sep 2018 15:56:09 -
@@ -1,2 +1,2 @@
-SHA256 (luasec-0.6.tar.gz) = zvOjXBi+uKVNnIzmJgpMq72aOG3ocRMg0ITa/60K7V0=
-SIZE (luasec-0.6.tar.gz) = 51071
+SHA256 (luasec-0.7.tar.gz) = IXbpWx0qcqMjXt5dKqmDgFD+7lXa3o/b3kvn/cZvOjE=
+SIZE (luasec-0.7.tar.gz) = 47965
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/luasec/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   20 May 2016 02:24:30 -  1.7
+++ pkg/PLIST   8 Sep 2018 15:56:09 -
@@ -1,81 +1,87 @@
-@comment $OpenBSD: PLIST,v 1.7 2016/05/20 02:24:30 gsoares Exp $
+@comment $OpenBSD: PLIST,v$
 lib/lua/${MODLUA_VERSION}/ssl.so
-share/examples/${FULLPKGNAME}/
-share/examples/${FULLPKGNAME}/README
-share/examples/${FULLPKGNAME}/certs/
-share/examples/${FULLPKGNAME}/certs/all.bat
-share/examples/${FULLPKGNAME}/certs/clientA.bat
-share/examples/${FULLPKGNAME}/certs/clientA.cnf
-share/examples/${FULLPKGNAME}/certs/clientA.sh
-share/examples/${FULLPKGNAME}/certs/clientB.bat
-share/examples/${FULLPKGNAME}/certs/clientB.cnf
-share/examples/${FULLPKGNAME}/certs/clientB.sh
-share/examples/${FULLPKGNAME}/certs/rootA.bat
-share/examples/${FULLPKGNAME}/certs/rootA.cnf
-share/examples/${FULLPKGNAME}/certs/rootA.sh
-share/examples/${FULLPKGNAME}/certs/rootB.bat
-share/examples/${FULLPKGNAME}/certs/rootB.cnf
-share/examples/${FULLPKGNAME}/certs/rootB.sh
-share/examples/${FULLPKGNAME}/certs/serverA.bat
-share/examples/${FULLPKGNAME}/certs/serverA.cnf
-share/examples/${FULLPKGNAME}/certs/serverA.sh
-share/examples/${FULLPKGNAME}/certs/serverB.bat
-share/examples/${FULLPKGNAME}/certs/serverB.cnf
-share/examples/${FULLPKGNAME}/certs/serverB.sh
-share/examples/${FULLPKGNAME}/chain/
-share/examples/${FULLPKGNAME}/chain/client.lua
-share/examples/${FULLPKGNAME}/chain/server.lua
-share/examples/${FULLPKGNAME}/chain/util.lua
-share/examples/${FULLPKGNAME}/dhparam/
-share/examples/${FULLPKGNAME}/dhparam/client.lua
-share/examples/${FULLPKGNAME}/dhparam/params.sh
-share/examples/${FULLPKGNAME}/dhparam/server.lua
-share/examples/${FULLPKGNAME}/digest/
-share/examples/${FULLPKGNAME}/digest/client.lua
-share/examples/${FULLPKGNAME}/digest/server.lua
-share/examples/${FULLPKGNAME}/ecdh/
-share/examples/${FULLPKGNAME}/ecdh/client.lua
-share/examples/${FULLPKGNAME}/ecdh/server.lua
-share/examples/${FULLPKGNAME}/info/
-share/examples/${FULLPKGNAME}/info/client.lua
-share/examples/${FULLPKGNAME}/info/server.lua
-share/examples/${FULLPKGNAME}/key/
-share/examples/${FULLPKGNAME}/key/genkey.sh
-share/examples/${FULLPKGNAME}/key/loadkey.lua
-share/examples/${FULLPKGNAME}/loop/
-share/examples/${FULLPKGNAME}/loop-gc/
-share/examples/${FULLPKGNAME}/loop-gc/client.lua
-share/examples/${FULLPKGNAME}/loop-gc/server.lua
-share/examples/${FULLPKGNAME}/loop/client.lua
-share/examples/${FULLPKGNAME}/loop/server.lua
-share/examples/${FULLPKGNAME}/oneshot/
-share/examples/${FULLPKGNAME}/oneshot/client.lua
-share/examples/${FULLPKGNAME}/oneshot/server.lua
-share/examples/${FULLPKGNAME}/sni/
-share/examples/${FULLPKGNAME}/sni/client.lua
-share/examples/${FULLPKGNAME}/sni/server.lua
-share/examples/${FULLPKGNAME}/verification/
-share/examples/${FULLPKGNAME}/verification/fail-string/
-share/examples/${FULLPKGNAME}/verification/fail-string/client.lua
-share/examples/${FULLPKGNAME}/verification/fail-string/server.lua
-share/examples/${FULLPKGNAME}/verification/fail-table/
-share/examples/${FULLPKGNAME}/verification/fail-table/client.lua
-share/examples/${FULLPKGNAME}/verification/fail-table/server.lua
-share/examples/${FULLPKGNAME}/verification/success/
-share/examples/${FULLPKGNAME}/verification/success/client.lua
-share/examples/${FULLPKGNAME}/verification/success/server.lua
-share/examples/${FULLPKGNAME}/verify/
-share/examples/${FULLPKGNAME}/verify/client.lua
-share/examples/${FULLPKGNAME}/verify/server.lua

Re: [update] security/gopass to 1.8.1

[Gleydson Soares]

On Fri, Jun 22, 2018 at 06:31:02AM -0600, Aaron Bieber wrote:
> Hola,
> 
> Here is an update to gopass. Quite a bit has changed since the last
> update: https://github.com/gopasspw/gopass/releases
> 
> Upstream location also changed.
> 
> I have been using this without issue for a number of days.
> 
> OK?


builds and runs fine,
ok gsoares@

> 
> diff --git a/security/gopass/Makefile b/security/gopass/Makefile
> index 5a0b1df1746..5c6c160d3f2 100644
> --- a/security/gopass/Makefile
> +++ b/security/gopass/Makefile
> @@ -2,9 +2,8 @@
>  
>  COMMENT =pass compatible password manager written in go
>  
> -V =  1.6.11
> +V =  1.8.1
>  DISTNAME =   gopass-${V}
> -REVISION =   0
>  
>  CATEGORIES = security
>  
> @@ -16,7 +15,7 @@ PERMIT_PACKAGE_CDROM =  Yes
>  # uses pledge()
>  WANTLIB += c pthread
>  
> -MASTER_SITES =   
> https://github.com/justwatchcom/gopass/releases/download/v${V}/
> +MASTER_SITES =   
> https://github.com/gopasspw/gopass/releases/download/v${V}/
>  
>  MODULES =lang/go
>  MODGO_TYPE = bin
> @@ -25,7 +24,7 @@ MODGO_LDFLAGS = -X "main.version=${V}"
>  RUN_DEPENDS =devel/git \
>   security/gnupg2
>  
> -ALL_TARGET = github.com/justwatchcom/gopass
> +ALL_TARGET = github.com/gopasspw/gopass
>  
>  # Tests require MODGO_ENV, but break in weird ways when it is set.
>  NO_TEST =Yes
> diff --git a/security/gopass/distinfo b/security/gopass/distinfo
> index ebe08b00e4d..98f37ea42d6 100644
> --- a/security/gopass/distinfo
> +++ b/security/gopass/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (gopass-1.6.11.tar.gz) = 3lsn+BZJVIKS3IPamOjka5uS2LC7ASeX3uRLMgcJDGc=
> -SIZE (gopass-1.6.11.tar.gz) = 4187380
> +SHA256 (gopass-1.8.1.tar.gz) = AjStN0kl4T+OWbmmOCCBnmm6GGtNdRLtT7yQk6Lcb3s=
> +SIZE (gopass-1.8.1.tar.gz) = 8701380
> 
> -- 
> PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE
> 

Re: [new] sysutils/fzf a commandline fuzzy finder

[Gleydson Soares]

On Tue, Jun 05, 2018 at 07:51:18PM -0600, Aaron Bieber wrote:
> Hi,
> 
> Here is a port of fzf ( https://github.com/junegunn/fzf ), a tool that
> can be used with vim and friends to quickly find files (really quick!).
> 
> I added a pledge(2) call (stdio rpath wpath cpath tty proc exec inet),
> which isn't ideal. My main goal is to use it as an entry point for when
> Go gets execpromises.
> 
> DESCR:
> Interactive Unix filter for command-line that can be used with any list; 
> files,
> command history, processes, hostnames, bookmarks, git commits, etc.
> 
> OK?
> 
> Cheers,
> Aaron
> 
> -- 
> PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE

it's pretty dang fast!

buids and works fine here! portscheck no complaints.

pledge bits should be wiped/tweaked as necessary afterwards.
OK gsoares@ (someone willing to give another ok/review?)

UPDATE: net/wget-1.9.5

[Gleydson Soares]

update to wget-1.9.5. This update addresses a vunerability CVE-2018-0494, along 
with
several bug fixes.

builds and runs fine, @amd64
OK?

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- Makefile5 Feb 2018 09:55:57 -   1.74
+++ Makefile7 May 2018 01:46:29 -
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.19.4
+DISTNAME = wget-1.19.5
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo5 Feb 2018 09:55:57 -   1.21
+++ distinfo7 May 2018 01:46:29 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.19.4.tar.gz) = k/uWsPSKIP9b4NnZ08SphrRpy4UxMfnV/kzJzsvItbU=
-SIZE (wget-1.19.4.tar.gz) = 4310657
+SHA256 (wget-1.19.5.tar.gz) = s5ISq+GnPyso9MbLIjxzhVnKrJHW5Bam2R1LnVXJ+u4=
+SIZE (wget-1.19.5.tar.gz) = 4455797
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.14
diff -u -p -r1.14 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 5 Feb 2018 09:55:57 -   1.14
+++ patches/patch-doc_wget_texi 7 May 2018 01:46:29 -
@@ -20,7 +20,7 @@ Index: doc/wget.texi
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -3145,9 +3145,8 @@ commands.
+@@ -3154,9 +3154,8 @@ commands.
  @cindex location of wgetrc
  
  When initializing, Wget will look for a @dfn{global} startup file,
@@ -32,7 +32,7 @@ Index: doc/wget.texi
  
  Then it will look for the user's file.  If the environmental variable
  @code{WGETRC} is set, Wget will try to load that file.  Failing that, no
-@@ -3157,7 +3156,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3166,7 +3165,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
  
  The fact that user's settings are loaded after the system-wide ones
  means that in case of collision user's wgetrc @emph{overrides} the

Re: UPDATE www/urlwatch

[Gleydson Soares]

On Mon, Apr 09, 2018 at 05:16:53PM +0200, Björn Ketelaars wrote:
> Enclosed diff brings urlwatch to 2.9. Changelog can be found at
> https://github.com/thp/urlwatch/blob/master/ChangeLog
> 
> 'make test' runs successfully. Tested ok on AMD64.
> 
> OK?

OK gsoares@

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/urlwatch/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile  24 Feb 2018 19:02:57 -  1.12
> +++ Makefile  9 Apr 2018 15:06:17 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= monitor webpages for updates
>  
> -MODPY_EGG_VERSION=   2.8
> +MODPY_EGG_VERSION=   2.9
>  DISTNAME=urlwatch-${MODPY_EGG_VERSION}
>  
>  CATEGORIES=  www
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/urlwatch/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo  24 Feb 2018 19:02:57 -  1.7
> +++ distinfo  9 Apr 2018 15:06:17 -
> @@ -1,2 +1,2 @@
> -SHA256 (urlwatch-2.8.tar.gz) = zt9hLZ88TEfKj/0qNnU7CGhyKhCBOSCPD70rV/bjQLM=
> -SIZE (urlwatch-2.8.tar.gz) = 32745
> +SHA256 (urlwatch-2.9.tar.gz) = DRWq7sZBIrOIq4i/vkAKp16Q9AoSLM2rzXPw8YgbZb8=
> +SIZE (urlwatch-2.9.tar.gz) = 33891
> 

Re: UPDATE ports/plan9/plan9port MAP_STACK patch

[Gleydson Soares]

rather than allocating memory for _Thread struct and stack together,
this diff[1] changes the allocation by pulling apart the stack of the
thread_t struct, so now only the stack segment has the MAP_STACK flag
for passing stack-register checking.

tested on amd64(MAP_STACK bits in). acme(1)/sam(1) works
fine!

[1] http://shutpandhack.org/~gsoares/plan9port_map_stack.diff

Index: Makefile
===
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile20 Jan 2018 03:29:56 -  1.24
+++ Makefile21 Mar 2018 02:02:26 -
@@ -4,6 +4,7 @@ ONLY_FOR_ARCHS =amd64 i386 powerpc
 BROKEN-powerpc =   threading issues
 
 COMMENT =  Plan 9 from user space
+REVISION = 0
 
 DISTNAME = plan9port-20180117
 
Index: patches/patch-src_libthread_thread_c
===
RCS file: patches/patch-src_libthread_thread_c
diff -N patches/patch-src_libthread_thread_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_libthread_thread_c21 Mar 2018 02:02:26 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Index: src/libthread/thread.c
+--- src/libthread/thread.c.orig
 src/libthread/thread.c
+@@ -107,12 +107,18 @@ threadalloc(void (*fn)(void*), void *arg, uint stack)
+   uint x, y;
+   ulong z;
+ 
+-  /* allocate the task and stack together */
+-  t = malloc(sizeof *t+stack);
++  /* allocate the task */
++  t = malloc(sizeof *t);
+   if(t == nil)
+   sysfatal("threadalloc malloc: %r");
+   memset(t, 0, sizeof *t);
+-  t->stk = (uchar*)(t+1);
++  /* allocate the real stack */
++  t->stk = mmap(NULL, stack, PROT_READ | PROT_WRITE,
++  MAP_PRIVATE | MAP_ANON | MAP_STACK, -1, 0);
++  if (t->stk == MAP_FAILED) {
++  free(t);
++  sysfatal("threadalloc malloc: %r");
++  }
+   t->stksize = stack;
+   t->id = incref(&threadidref);
+ //print("fn=%p arg=%p\n", fn, arg);
+@@ -133,8 +139,8 @@ threadalloc(void (*fn)(void*), void *arg, uint stack)
+ 
+   /* call makecontext to do the real work. */
+   /* leave a few words open on both ends */
+-  t->context.uc.uc_stack.ss_sp = (void*)(t->stk+8);
+-  t->context.uc.uc_stack.ss_size = t->stksize-64;
++  t->context.uc.uc_stack.ss_sp = t->stk;
++  t->context.uc.uc_stack.ss_size = t->stksize;
+ #if defined(__sun__) && !defined(__MAKECONTEXT_V2_SOURCE) /* sigh 
*/
+   /* can avoid this with __MAKECONTEXT_V2_SOURCE but only on SunOS 5.9 */
+   t->context.uc.uc_stack.ss_sp = 
+@@ -364,6 +370,7 @@ procscheduler(Proc *p)
+   delthreadinproc(p, t);
+   p->nthread--;
+ /*print("nthread %d\n", p->nthread); */
++  munmap(t->stk, t->stksize);
+   free(t);
+   }
+   }
Index: patches/patch-src_libthread_threadimpl_h
===
RCS file: patches/patch-src_libthread_threadimpl_h
diff -N patches/patch-src_libthread_threadimpl_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_libthread_threadimpl_h21 Mar 2018 02:02:26 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/libthread/threadimpl.h
+--- src/libthread/threadimpl.h.orig
 src/libthread/threadimpl.h
+@@ -10,6 +10,8 @@
+ # define _XOPEN_SOURCE/* for Snow Leopard */
+ # endif
+ # include 
++#elif defined(__OpenBSD__)
++# include 
+ #endif
+ #include 
+ #include "libc.h"

Re: UPDATE ports/plan9/plan9port MAP_STACK patch

[Gleydson Soares]

On Fri, Mar 09, 2018 at 06:42:25PM -0600, Aaron Poffenberger wrote:
> This patch updates libthread in plan9port to be MAP_STACK compliant,
> replacing calls to malloc/free with mmap and munmap when allocating
> thread stacks.
> 
> The most obvious effect  was sam(1), acme(1), and 9term(1) would
> core when executed. All three run now with seemingly no issues.
> 
> There maybe other problems I haven't noticed yet.

it's missing a revision bump, apart from that, your diff looks good for
me. thanks for looking into this,
Index: Makefile
===
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile20 Jan 2018 03:29:56 -  1.24
+++ Makefile10 Mar 2018 16:34:49 -
@@ -6,6 +6,7 @@ BROKEN-powerpc =threading issues
 COMMENT =  Plan 9 from user space
 
 DISTNAME = plan9port-20180117
+REVISION = 0
 
 GH_ACCOUNT =   9fans
 GH_PROJECT =   plan9port
Index: patches/patch-src_libthread_thread_c
===
RCS file: patches/patch-src_libthread_thread_c
diff -N patches/patch-src_libthread_thread_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_libthread_thread_c10 Mar 2018 16:34:49 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Index: src/libthread/thread.c
+--- src/libthread/thread.c.orig
 src/libthread/thread.c
+@@ -108,8 +108,9 @@ threadalloc(void (*fn)(void*), void *arg, uint stack)
+   ulong z;
+ 
+   /* allocate the task and stack together */
+-  t = malloc(sizeof *t+stack);
+-  if(t == nil)
++  t = mmap(0, sizeof *t+stack, PROT_READ|PROT_WRITE,
++  MAP_PRIVATE|MAP_ANON|MAP_STACK, -1, 0);
++  if(t == MAP_FAILED)
+   sysfatal("threadalloc malloc: %r");
+   memset(t, 0, sizeof *t);
+   t->stk = (uchar*)(t+1);
+@@ -364,7 +365,7 @@ procscheduler(Proc *p)
+   delthreadinproc(p, t);
+   p->nthread--;
+ /*print("nthread %d\n", p->nthread); */
+-  free(t);
++  munmap(t, t->stksize);
+   }
+   }
+ 
Index: patches/patch-src_libthread_threadimpl_h
===
RCS file: patches/patch-src_libthread_threadimpl_h
diff -N patches/patch-src_libthread_threadimpl_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_libthread_threadimpl_h10 Mar 2018 16:34:49 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/libthread/threadimpl.h
+--- src/libthread/threadimpl.h.orig
 src/libthread/threadimpl.h
+@@ -10,6 +10,8 @@
+ # define _XOPEN_SOURCE/* for Snow Leopard */
+ # endif
+ # include 
++#elif defined(__OpenBSD__)
++# include 
+ #endif
+ #include 
+ #include "libc.h"

Re: UPDATE: net/quagga-1.2.3

[Gleydson Soares]

> yep, one of these is particularly nasty: use-after-free in a transitive
> BGP attribute. this is one of those "one update message can kill all
> quaggas on the internet" bugs.

i've backported the security patches to -stable

potentially severe:
"bgpd/security: Fix double free of unknown attribute"
https://www.quagga.net/security/Quagga-2018-1114.txt

also fixes:
https://www.quagga.net/security/Quagga-2018-1550.txt
https://www.quagga.net/security/Quagga-2018-1975.txt 

the following is not needed for -stable, only affects >1.1.x
https://www.quagga.net/security/Quagga-2018-0543.txt

OK?
Index: Makefile
===
RCS file: /cvs/ports/net/quagga/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile27 Jun 2016 19:55:48 -  1.52
+++ Makefile16 Feb 2018 22:07:00 -
@@ -3,7 +3,7 @@
 COMMENT=   multi-threaded routing daemon
 
 DISTNAME=  quagga-1.0.20160315
-REVISION=  1
+REVISION=  2
 CATEGORIES=net
 MASTER_SITES=  http://download.savannah.gnu.org/releases/quagga/
 EXTRACT_SUFX=  .tar.xz
Index: patches/patch-bgpd_bgp_attr_c
===
RCS file: patches/patch-bgpd_bgp_attr_c
diff -N patches/patch-bgpd_bgp_attr_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bgpd_bgp_attr_c   16 Feb 2018 22:07:00 -
@@ -0,0 +1,71 @@
+$OpenBSD$
+
+Security issue: Quagga-2018-1114
+See: https://www.quagga.net/security/Quagga-2018-1114.txt
+
+Index: bgpd/bgp_attr.c
+--- bgpd/bgp_attr.c.orig
 bgpd/bgp_attr.c
+@@ -186,15 +186,17 @@ cluster_intern (struct cluster_list *cluster)
+ }
+ 
+ void
+-cluster_unintern (struct cluster_list *cluster)
++cluster_unintern (struct cluster_list **cluster)
+ {
+-  if (cluster->refcnt)
+-cluster->refcnt--;
++  struct cluster_list *c = *cluster;
++  if (c->refcnt)
++c->refcnt--;
+ 
+-  if (cluster->refcnt == 0)
++  if (c->refcnt == 0)
+ {
+-  hash_release (cluster_hash, cluster);
+-  cluster_free (cluster);
++  hash_release (cluster_hash, c);
++  cluster_free (c);
++  *cluster = NULL;
+ }
+ }
+ 
+@@ -344,15 +346,18 @@ transit_intern (struct transit *transit)
+ }
+ 
+ void
+-transit_unintern (struct transit *transit)
++transit_unintern (struct transit **transit)
+ {
+-  if (transit->refcnt)
+-transit->refcnt--;
++  struct transit *t = *transit;
++  
++  if (t->refcnt)
++t->refcnt--;
+ 
+-  if (transit->refcnt == 0)
++  if (t->refcnt == 0)
+ {
+-  hash_release (transit_hash, transit);
+-  transit_free (transit);
++  hash_release (transit_hash, t);
++  transit_free (t);
++  *transit = NULL;
+ }
+ }
+ 
+@@ -788,11 +793,11 @@ bgp_attr_unintern_sub (struct attr *attr)
+   UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_EXT_COMMUNITIES));
+   
+   if (attr->extra->cluster)
+-cluster_unintern (attr->extra->cluster);
++cluster_unintern (&attr->extra->cluster);
+   UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_CLUSTER_LIST));
+   
+   if (attr->extra->transit)
+-transit_unintern (attr->extra->transit);
++transit_unintern (&attr->extra->transit);
+ }
+ }
+ 
Index: patches/patch-bgpd_bgp_attr_h
===
RCS file: patches/patch-bgpd_bgp_attr_h
diff -N patches/patch-bgpd_bgp_attr_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bgpd_bgp_attr_h   16 Feb 2018 22:07:00 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Security issue: Quagga-2018-1114
+See: https://www.quagga.net/security/Quagga-2018-1114.txt
+
+Index: bgpd/bgp_attr.h
+--- bgpd/bgp_attr.h.orig
 bgpd/bgp_attr.h
+@@ -182,10 +182,10 @@ extern unsigned long int attr_unknown_count (void);
+ 
+ /* Cluster list prototypes. */
+ extern int cluster_loop_check (struct cluster_list *, struct in_addr);
+-extern void cluster_unintern (struct cluster_list *);
++extern void cluster_unintern (struct cluster_list **);
+ 
+ /* Transit attribute prototypes. */
+-void transit_unintern (struct transit *);
++void transit_unintern (struct transit **);
+ 
+ /* Below exported for unit-test purposes only */
+ struct bgp_attr_parser_args {
Index: patches/patch-bgpd_bgp_debug_c
===
RCS file: patches/patch-bgpd_bgp_debug_c
diff -N patches/patch-bgpd_bgp_debug_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bgpd_bgp_debug_c  16 Feb 2018 22:07:00 -
@@ -0,0 +1,91 @@
+$OpenBSD$
+
+Security issue: Quagga-2018-1550
+See: https://www.quagga.net/security/Quagga-2018-1550.txt
+
+Index: bgpd/bgp_debug.c
+--- bgpd/bgp_debug.c.orig
 bgpd/bgp_debug.c
+@@ -29,6 +29,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330
+ #include "log.h"
+ #include "sockunion.h"
+ #include "filter.h"
++#include "memory.h"
+ 
+ #include "bgpd/bgpd.h"
+ #include "bgpd/bgp_aspath.h"
+@@ -69,7 +70,8 @@ const struct message bgp_statu

UPDATE: net/quagga-1.2.3

[Gleydson Soares]

Here's an update for quagga-1.2.3. this release includes security fixes.

https://www.quagga.net/security/Quagga-2018-0543.txt
https://www.quagga.net/security/Quagga-2018-1114.txt
https://www.quagga.net/security/Quagga-2018-1550.txt
https://www.quagga.net/security/Quagga-2018-1975.txt

full changelog at:
https://savannah.nongnu.org/forum/forum.php?forum_id=9095

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/quagga/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile11 Jan 2018 19:27:07 -  1.56
+++ Makefile16 Feb 2018 20:39:11 -
@@ -2,8 +2,7 @@
 
 COMMENT=   multi-threaded routing daemon
 
-DISTNAME=  quagga-1.2.2
-REVISION=  1
+DISTNAME=  quagga-1.2.3
 CATEGORIES=net
 MASTER_SITES=  http://download.savannah.gnu.org/releases/quagga/
 
Index: distinfo
===
RCS file: /cvs/ports/net/quagga/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo3 Nov 2017 14:28:43 -   1.22
+++ distinfo16 Feb 2018 20:39:11 -
@@ -1,2 +1,2 @@
-SHA256 (quagga-1.2.2.tar.gz) = Ui4i8r7uZOPwws3j0BVfO4ED9Pb8ir75LLQLw6TMKTE=
-SIZE (quagga-1.2.2.tar.gz) = 2986142
+SHA256 (quagga-1.2.3.tar.gz) = 7iwJB6EGkCq73K9jtPKMZyQcTzOWmJ7VTae0l27srTE=
+SIZE (quagga-1.2.3.tar.gz) = 2925444
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/net/quagga/patches/patch-configure_ac,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure_ac
--- patches/patch-configure_ac  3 Nov 2017 14:28:43 -   1.6
+++ patches/patch-configure_ac  16 Feb 2018 20:39:11 -
@@ -6,7 +6,7 @@ ip_mreq.imr_interface.
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -1053,7 +1053,7 @@ AC_CHECK_HEADERS([linux/mroute.h], [], [],
+@@ -1054,7 +1054,7 @@ AC_CHECK_HEADERS([linux/mroute.h], [], [],
  AC_MSG_CHECKING([for BSD struct ip_mreq hack])
  AC_TRY_COMPILE([#ifdef HAVE_SYS_PARAM_H
  #include 

UPDATE: net/torsocks-2.2.0

[Gleydson Soares]

hi,

find below a diff that brings net/torsocks to latest release 2.2.0
getpw() patch was removed along with others since those are no
longer required, new patches added to cope with #if's, and some
former patches were tweaked to reflect changes in new release.

it now requires gnu libtool, it's not able to compile by using base
libtool(1).

tests pass at least on amd64 and works fine, tested with lynx.
OK?

// gsoares


Index: Makefile
===
RCS file: /cvs/ports/net/torsocks/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile22 Jan 2018 12:30:38 -  1.10
+++ Makefile23 Jan 2018 03:10:45 -
@@ -2,14 +2,17 @@
 
 COMMENT =  socks proxy for use with tor
 
-DISTNAME = torsocks-1.2
-REVISION = 5
+DISTNAME = torsocks-2.2.0
 
-SHARED_LIBS =  torsocks0.0 # 1.0
+GH_PROJECT =   torsocks
+GH_ACCOUNT =   dgoulet
+GH_TAGNAME =   v2.2.0
+
+SHARED_LIBS =  torsocks1.0 # 0.0
 
 CATEGORIES =   net
 
-HOMEPAGE = https://code.google.com/p/torsocks
+HOMEPAGE = https://gitweb.torproject.org/torsocks.git/
 
 MAINTAINER =   Pascal Stumpf 
 
@@ -18,7 +21,13 @@ PERMIT_PACKAGE_CDROM =   Yes
 
 WANTLIB += pthread
 
-MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=torsocks/}
+AUTOCONF_VERSION=  2.69
+AUTOMAKE_VERSION=  1.15
+
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+   ${MODGNU_AUTOMAKE_DEPENDS}
+
+USE_LIBTOOL =  gnu
 
 RUN_DEPENDS =  net/tor
 
@@ -26,9 +35,13 @@ FAKE_FLAGS = CONFDIR=${PREFIX}/share/ex
 
 CONFIGURE_STYLE =  gnu
 
-NO_TEST =  Yes
+pre-patch:
+   cd ${WRKSRC} && \
+   AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/src/torsocks.in
+   ${SUBST_CMD} ${WRKSRC}/src/bin/torsocks.in
+
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/torsocks/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:53 -  1.2
+++ distinfo23 Jan 2018 03:10:45 -
@@ -1,2 +1,2 @@
-SHA256 (torsocks-1.2.tar.gz) = vqV9NiTXI3JP0eJg8Oayo1TA2nQsAjqplMdpInDREdQ=
-SIZE (torsocks-1.2.tar.gz) = 456453
+SHA256 (torsocks-2.2.0.tar.gz) = NiFqHjD0f6DlvoR2Hg1yEzGWyKBCcWAX2lbpQ5M4yH0=
+SIZE (torsocks-2.2.0.tar.gz) = 115269
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in   23 Jan 2018 03:10:45 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -370,7 +370,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I config
+ SUBDIRS = src doc tests extras
+-dist_doc_DATA = ChangeLog
++dist_doc_DATA =
+ EXTRA_DIST = gpl-2.0.txt extras/torsocks-bash_completion
+ all: all-recursive
+ 
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 1 Dec 2011 11:49:27 -   1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2011/12/01 11:49:27 pascal Exp $
 configure.orig Mon Oct 24 22:23:40 2011
-+++ configure  Sun Oct 30 17:07:11 2011
-@@ -4827,7 +4827,6 @@ fi
- fi
- 
- 
--$as_echo "#define SUPPORT_RES_API /**/" >>confdefs.h
- 
- 
- 
Index: patches/patch-doc_Makefile_in
===
RCS file: /cvs/ports/net/torsocks/patches/patch-doc_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in   1 Dec 2011 11:49:27 -   1.1.1.1
+++ patches/patch-doc_Makefile_in   23 Jan 2018 03:10:45 -
@@ -1,11 +1,13 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2011/12/01 11:49:27 pascal Exp $
 doc/Makefile.in.orig   Tue Nov  8 14:46:24 2011
-+++ doc/Makefile.inTue Nov  8 14:46:38 2011
-@@ -517,7 +517,7 @@ info: info-am
+$OpenBSD$
+
+Index: doc/Makefile.in
+--- doc/Makefile.in.orig
 doc/Makefile.in
+@@ -595,7 +595,7 @@ info: info-am
  
  info-am:
  
--install-data-am: install-dist_confDATA install-dist_dataDATA \
+-install-data-am: install-dist_confDATA install-dist_docDATA \
 +install-data-am: install-dist_confDATA \
install-man
  
Index: patches/patch-src_bin_torsocks_in
===
RCS file: patches/patch-src_bin_torsocks_in
diff -N patches/patch-src_bin_torsocks_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_bin_torso

UPDATE: security/stunnel-5.42

[Gleydson Soares]

here's an update to stunnel, following diff brings it to 5.42. 
Index: Makefile
===
RCS file: /cvs/ports/security/stunnel/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile9 Jan 2017 15:40:30 -   1.87
+++ Makefile8 Sep 2017 19:30:49 -
@@ -2,7 +2,7 @@
 
 COMMENT=   SSL encryption wrapper for standard network daemons
 
-DISTNAME=  stunnel-5.39
+DISTNAME=  stunnel-5.42
 CATEGORIES=security
 
 MAINTAINER=Gleydson Soares 
Index: distinfo
===
RCS file: /cvs/ports/security/stunnel/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo9 Jan 2017 15:40:30 -   1.43
+++ distinfo8 Sep 2017 19:30:49 -
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.39.tar.gz) = KIwIelBGU5DQVQgGisdshBiiH65ydf68xj8EHsWwTe4=
-SIZE (stunnel-5.39.tar.gz) = 647101
+SHA256 (stunnel-5.42.tar.gz) = G2p66lyiI5kLyL1iH7CEa6pCeOGz4A/27uJ5y45UD6s=
+SIZE (stunnel-5.42.tar.gz) = 649496
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/security/stunnel/patches/patch-Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-Makefile_in
--- patches/patch-Makefile_in   4 Dec 2015 01:38:56 -   1.13
+++ patches/patch-Makefile_in   8 Sep 2017 19:30:49 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-Makefile_in,v 1.13 2015/12/04 01:38:56 gsoares Exp $
 Makefile.in.orig   Mon Nov 30 13:00:41 2015
-+++ Makefile.inThu Dec  3 19:26:54 2015
-@@ -357,7 +357,7 @@ top_build_prefix = @top_build_prefix@
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -352,7 +352,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
Index: patches/patch-src_ctx_c
===
RCS file: /cvs/ports/security/stunnel/patches/patch-src_ctx_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_ctx_c
--- patches/patch-src_ctx_c 9 Nov 2016 23:14:31 -   1.4
+++ patches/patch-src_ctx_c 8 Sep 2017 19:30:49 -
@@ -1,7 +1,17 @@
 $OpenBSD: patch-src_ctx_c,v 1.4 2016/11/09 23:14:31 gsoares Exp $
 src/ctx.c.orig Tue Jun 21 12:06:14 2016
-+++ src/ctx.c  Thu Nov  3 23:13:15 2016
-@@ -366,7 +366,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+Index: src/ctx.c
+--- src/ctx.c.orig
 src/ctx.c
+@@ -295,7 +295,7 @@ NOEXPORT int matches_wildcard(char *servername, char *
+ 
+ #ifndef OPENSSL_NO_DH
+ 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER) 
+ NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
+ return ctx->cipher_list;
+ }
+@@ -398,7 +398,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
  / initialize OpenSSL CONF */
  
  NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
Index: patches/patch-src_options_c
===
RCS file: patches/patch-src_options_c
diff -N patches/patch-src_options_c
--- patches/patch-src_options_c 9 Jan 2017 15:40:30 -   1.8
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_options_c,v 1.8 2017/01/09 15:40:30 gsoares Exp $
-
-use SSLv23_client_method() required to build with libressl since that it 
haven't
-TLS_client_method()  for now.
-
 src/options.c.orig Sun Jan  1 19:29:01 2017
-+++ src/options.c  Mon Jan  9 10:53:59 2017
-@@ -2630,7 +2630,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
- /* sslVersion */
- switch(cmd) {
- case CMD_BEGIN:
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- section->client_method=(SSL_METHOD *)TLS_client_method();
- section->server_method=(SSL_METHOD *)TLS_server_method();
- #else
-@@ -2642,7 +2642,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
- if(strcasecmp(opt, "sslVersion"))
- break;
- if(!strcasecmp(arg, "all")) {
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- section->client_method=(SSL_METHOD *)TLS_client_method();
- section->server_method=(SSL_METHOD *)TLS_server_method();
- #else
Index: patches/patch-src_prototypes_h
===
RCS file: patches/patch-src_prototypes_h
diff -N patches/patch-src_prototypes_h
--- patches/patch-src_prototypes_h  9 Jan 2017 15:40:30 -   1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_prototypes_h,v 1.3 2017/01/09 15:40:30 gsoares Exp $
 src/pro

Re: UPDATE: education/anki to 2.0.45

[Gleydson Soares]

I dont know how that previous diff slipped in :)
So here goes again,

Index: Makefile
===
RCS file: /cvs/ports/education/anki/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile8 Jul 2016 10:32:34 -   1.12
+++ Makefile25 Jul 2017 13:41:06 -
@@ -2,7 +2,8 @@
 
 COMMENT=   spaced learning system
 
-DISTNAME = anki-2.0.36
+DISTNAME = anki-2.0.45
+EXTRACT_SUFX = -source.tgz
 
 CATEGORIES =   education
 
@@ -13,9 +14,7 @@ MAINTAINER =  Federico G. Schwindt http://ankisrs.net/download/mirror/
-
-EXTRACT_SUFX = .tgz
+MASTER_SITES = https://apps.ankiweb.net/downloads/current/
 
 MODULES =  lang/python
 
Index: distinfo
===
RCS file: /cvs/ports/education/anki/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo8 Jul 2016 10:32:34 -   1.10
+++ distinfo25 Jul 2017 13:41:06 -
@@ -1,2 +1,2 @@
-SHA256 (anki-2.0.36.tgz) = +yCCMM3FDqAtU/UhzwOSbGJ//3z3MbfSnccz06sEFxw=
-SIZE (anki-2.0.36.tgz) = 3410538
+SHA256 (anki-2.0.45-source.tgz) = PFRpNgeiBsX3DsxR6U3+xBUWAm8++ZMhNq7UNUprmYo=
+SIZE (anki-2.0.45-source.tgz) = 3421960

Re: UPDATE: education/anki to 2.0.45

[Gleydson Soares]

Stuart Henderson  writes:
> On 2017/07/24 22:32, Gleydson Soares wrote:
> > Hi,
> > please find below a diff that brings anki to the latest release (2.0.45).
> > works fine here,
> 
> It's a bit cleaner if you apply this on top, otherwise ok with me:

sure. thanks.

Index: Makefile
===
RCS file: /cvs/ports/education/anki/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile8 Jul 2016 10:32:34 -   1.12
+++ Makefile25 Jul 2017 12:03:27 -
@@ -2,7 +2,8 @@
 
 COMMENT=   spaced learning system
 
-DISTNAME = anki-2.0.36
+DISTNAME = anki-2.0.45-source
+PKGNAME =  ${DISTNAME:S/-source//}
 
 CATEGORIES =   education
 
@@ -13,7 +14,7 @@ MAINTAINER =  Federico G. Schwindt http://ankisrs.net/download/mirror/
+MASTER_SITES = https://apps.ankiweb.net/downloads/current/
 
 EXTRACT_SUFX = .tgz
 
@@ -32,6 +33,8 @@ RUN_DEPENDS = audio/py-audio \
 CONFIGURE_STYLE= none
 
 NO_TEST =  Yes
+
+WRKDIST=   ${WRKDIR}/${DISTNAME:S/-source//}
 
 do-build:
${MODPY_BIN} -mcompileall -q ${WRKSRC}
Index: distinfo
===
RCS file: /cvs/ports/education/anki/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo8 Jul 2016 10:32:34 -   1.10
+++ distinfo25 Jul 2017 12:03:27 -
@@ -1,2 +1,2 @@
-SHA256 (anki-2.0.36.tgz) = +yCCMM3FDqAtU/UhzwOSbGJ//3z3MbfSnccz06sEFxw=
-SIZE (anki-2.0.36.tgz) = 3410538
+SHA256 (anki-2.0.45-source.tgz) = PFRpNgeiBsX3DsxR6U3+xBUWAm8++ZMhNq7UNUprmYo=
+SIZE (anki-2.0.45-source.tgz) = 3421960

UPDATE: education/anki to 2.0.45

[Gleydson Soares]

Hi,
please find below a diff that brings anki to the latest release (2.0.45).
works fine here,

Index: Makefile
===
RCS file: /cvs/ports/education/anki/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile8 Jul 2016 10:32:34 -   1.12
+++ Makefile25 Jul 2017 00:36:57 -
@@ -2,7 +2,8 @@
 
 COMMENT=   spaced learning system
 
-DISTNAME = anki-2.0.36
+DISTNAME = anki-2.0.45-source
+PKGNAME =  ${DISTNAME:S/-source//}
 
 CATEGORIES =   education
 
@@ -13,7 +14,7 @@ MAINTAINER =  Federico G. Schwindt http://ankisrs.net/download/mirror/
+MASTER_SITES = https://apps.ankiweb.net/downloads/current/
 
 EXTRACT_SUFX = .tgz
 
@@ -32,6 +33,8 @@ RUN_DEPENDS = audio/py-audio \
 CONFIGURE_STYLE= none
 
 NO_TEST =  Yes
+
+WRKDIST=   ${WRKDIR}/${DISTNAME:S/-source//}
 
 do-build:
${MODPY_BIN} -mcompileall -q ${WRKSRC}
Index: distinfo
===
RCS file: /cvs/ports/education/anki/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo8 Jul 2016 10:32:34 -   1.10
+++ distinfo25 Jul 2017 00:36:57 -
@@ -1,2 +1,2 @@
-SHA256 (anki-2.0.36.tgz) = +yCCMM3FDqAtU/UhzwOSbGJ//3z3MbfSnccz06sEFxw=
-SIZE (anki-2.0.36.tgz) = 3410538
+SHA256 (anki-2.0.45-source.tgz) = PFRpNgeiBsX3DsxR6U3+xBUWAm8++ZMhNq7UNUprmYo=
+SIZE (anki-2.0.45-source.tgz) = 3421960

Re: UPDATE: x11/st pledge()

[Gleydson Soares]

> However, this should be submitted to upstream;
> and yes, they will likely just wrap the patch in #ifdef's

Absolutely agreed!

Re: UPDATE: x11/st pledge()

[Gleydson Soares]

> If upstream has an autoconf-like mechanism, better wrap this in
> #ifdef HAVE_PLEDGE statements.  If not, better keep local patches, at
> least we can easily keep track of them.

sure, meanwhile we should also send it upstream and protecting these
calls by adding #ifdef is ok to make consistency with other suckless
tools. ii and sic pledge() patches have been merged:
http://git.suckless.org/ii/commit/?id=584290f2642eeacbe1b24e7174e49139d6787252
http://git.suckless.org/sic/commit/?id=9bb34de449c8f22d869a6f3794107ed25d37c7c1

Re: UPDATE: x11/st pledge()

[Gleydson Soares]

Hi Juan,

> If you're a regular user of st, let me know if this patch works for you
> or not.
>
> The patch was written by tb@.

I've no comments about this patch itself, but it would be nice wrap
these pledge() calls with #ifdef __OpenBSD__ and try to get it merged
upstream, as net/ii and net/sic.

Re: Ports with hardcoded "gcc", "g++"

[Gleydson Soares]

> The fixes that have been committed have unlocked additional parts
> of the ports tree, revealing new build failures.  Here is an updated
> list.  I've added the MAINTAINERs
..
> plan9/devdrawserver Gleydson Soares 

fixed.

Re: Ports with hardcoded "gcc", "g++"

[Gleydson Soares]

> plan9/plan9port
fixed.

Re: UPDATE: security/stunnel-5.36

[Gleydson Soares]

Gleydson Soares  writes:
> Hi,
> 
> following diff brings stunnel to latest release 5.36.  as bonus,
> enables X509_check_host, X509_check_email and X509_check_ip_asc
> courtesy of beck@ at g2k16. :-)
> 
> however as usual, this update requires some aditional patches to
> make (LIBRESSL_VERSION_NUMBER) dance.
> 
> works fine @amd64 with my setup, comments and tests welcome.

ping...
stunnel-5.37 was released. here's an updated diff.

Index: Makefile
===
RCS file: /cvs/ports/security/stunnel/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile24 Apr 2016 12:07:48 -  1.83
+++ Makefile8 Nov 2016 21:44:48 -
@@ -2,7 +2,7 @@
 
 COMMENT=   SSL encryption wrapper for standard network daemons
 
-DISTNAME=  stunnel-5.31
+DISTNAME=  stunnel-5.37
 CATEGORIES=security
 
 MAINTAINER=Gleydson Soares 
@@ -10,7 +10,7 @@ MAINTAINER=   Gleydson Soares http://www.stunnel.org/
 
Index: distinfo
===
RCS file: /cvs/ports/security/stunnel/distinfo,v
retrieving revision 1.40
diff -u -p -r1.40 distinfo
--- distinfo24 Apr 2016 12:07:48 -  1.40
+++ distinfo8 Nov 2016 21:44:48 -
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.31.tar.gz) = p0a3GrPcbCPqyw2vc0JGeHDkOskzQwkF6xsdBQu64Lc=
-SIZE (stunnel-5.31.tar.gz) = 639381
+SHA256 (stunnel-5.37.tar.gz) = 0ONTDj7/xk/ex5LHF5HUk3xri9O56kiVxrtlJtzQ0kE=
+SIZE (stunnel-5.37.tar.gz) = 645336
cvs server: Diffing patches
Index: patches/patch-src_common_h
===
RCS file: patches/patch-src_common_h
diff -N patches/patch-src_common_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_common_h  8 Nov 2016 21:44:48 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/common.h.orig  Mon Jun 27 04:29:32 2016
 src/common.h   Thu Nov  3 23:57:29 2016
+@@ -448,7 +448,7 @@ extern char *sys_errlist[];
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+@@ -474,7 +474,7 @@ extern char *sys_errlist[];
+ #include 
+ #ifndef OPENSSL_NO_DH
+ #include 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+ #endif /* OpenSSL older than 1.1.0 */
+ #endif /* !defined(OPENSSL_NO_DH) */
Index: patches/patch-src_ctx_c
===
RCS file: /cvs/ports/security/stunnel/patches/patch-src_ctx_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_ctx_c
--- patches/patch-src_ctx_c 24 Apr 2016 12:07:48 -  1.3
+++ patches/patch-src_ctx_c 8 Nov 2016 21:44:48 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_ctx_c,v 1.3 2016/04/24 12:07:48 gsoares Exp $
 src/ctx.c.orig Fri Feb 19 16:18:43 2016
-+++ src/ctx.c  Thu Apr 21 21:59:31 2016
-@@ -363,7 +363,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+--- src/ctx.c.orig Tue Jun 21 12:06:14 2016
 src/ctx.c  Thu Nov  3 23:13:15 2016
+@@ -366,7 +366,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
  / initialize OpenSSL CONF */
  
  NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
Index: patches/patch-src_options_c
===
RCS file: /cvs/ports/security/stunnel/patches/patch-src_options_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_options_c
--- patches/patch-src_options_c 24 Apr 2016 12:07:48 -  1.6
+++ patches/patch-src_options_c 8 Nov 2016 21:44:48 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_options_c,v 1.6 2016
 use SSLv23_client_method() required to build with libressl since that it 
haven't
 TLS_client_method()  for now.
 
 src/options.c.orig Fri Jan 15 13:45:23 2016
-+++ src/options.c  Thu Apr 21 21:59:31 2016
-@@ -2579,7 +2579,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+--- src/options.c.orig Fri Aug  5 06:39:57 2016
 src/options.c  Thu Nov  3 23:13:15 2016
+@@ -2617,7 +2617,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
  /* sslVersion */
  switch(cmd) {
  case CMD_BEGIN:
@@ -14,7 +14,7 @@ TLS_client_method()  for now.
  section->client_method=(SSL_METHOD *)TLS_client_method();
  section->server_method=(SSL_METHOD *)TLS_server_method();
  #else
-@@ -2591,7 +2591,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+@@ -2629,7 +2629,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
  if(strcasecmp(opt, "sslVersion"))
  break;
 

UPDATE: security/stunnel-5.36

[Gleydson Soares]

Hi,

following diff brings stunnel to latest release 5.36.  as bonus,
enables X509_check_host, X509_check_email and X509_check_ip_asc
courtesy of beck@ at g2k16. :-)

however as usual, this update requires some aditional patches to
make (LIBRESSL_VERSION_NUMBER) dance.

works fine @amd64 with my setup, comments and tests welcome.

Index: Makefile
===
RCS file: /cvs/ports/security/stunnel/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile24 Apr 2016 12:07:48 -  1.83
+++ Makefile4 Nov 2016 03:43:56 -
@@ -2,7 +2,7 @@
 
 COMMENT=   SSL encryption wrapper for standard network daemons
 
-DISTNAME=  stunnel-5.31
+DISTNAME=  stunnel-5.36
 CATEGORIES=security
 
 MAINTAINER=Gleydson Soares 
@@ -10,7 +10,7 @@ MAINTAINER=   Gleydson Soares http://www.stunnel.org/
 
Index: distinfo
===
RCS file: /cvs/ports/security/stunnel/distinfo,v
retrieving revision 1.40
diff -u -p -r1.40 distinfo
--- distinfo24 Apr 2016 12:07:48 -  1.40
+++ distinfo4 Nov 2016 03:43:56 -
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.31.tar.gz) = p0a3GrPcbCPqyw2vc0JGeHDkOskzQwkF6xsdBQu64Lc=
-SIZE (stunnel-5.31.tar.gz) = 639381
+SHA256 (stunnel-5.36.tar.gz) = 64lS/P3831BWofGnjh7FAUuBnF9fdZm5JNxEkP/kteo=
+SIZE (stunnel-5.36.tar.gz) = 645205
cvs server: Diffing patches
Index: patches/patch-src_common_h
===
RCS file: patches/patch-src_common_h
diff -N patches/patch-src_common_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_common_h  4 Nov 2016 03:43:56 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/common.h.orig  Mon Jun 27 04:29:32 2016
 src/common.h   Thu Nov  3 23:57:29 2016
+@@ -448,7 +448,7 @@ extern char *sys_errlist[];
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+@@ -474,7 +474,7 @@ extern char *sys_errlist[];
+ #include 
+ #ifndef OPENSSL_NO_DH
+ #include 
+-#if OPENSSL_VERSION_NUMBER<0x1010L
++#if OPENSSL_VERSION_NUMBER<0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+ #endif /* OpenSSL older than 1.1.0 */
+ #endif /* !defined(OPENSSL_NO_DH) */
Index: patches/patch-src_ctx_c
===
RCS file: /cvs/ports/security/stunnel/patches/patch-src_ctx_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_ctx_c
--- patches/patch-src_ctx_c 24 Apr 2016 12:07:48 -  1.3
+++ patches/patch-src_ctx_c 4 Nov 2016 03:43:56 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_ctx_c,v 1.3 2016/04/24 12:07:48 gsoares Exp $
 src/ctx.c.orig Fri Feb 19 16:18:43 2016
-+++ src/ctx.c  Thu Apr 21 21:59:31 2016
-@@ -363,7 +363,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+--- src/ctx.c.orig Tue Jun 21 12:06:14 2016
 src/ctx.c  Thu Nov  3 23:13:15 2016
+@@ -366,7 +366,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
  / initialize OpenSSL CONF */
  
  NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
Index: patches/patch-src_options_c
===
RCS file: /cvs/ports/security/stunnel/patches/patch-src_options_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_options_c
--- patches/patch-src_options_c 24 Apr 2016 12:07:48 -  1.6
+++ patches/patch-src_options_c 4 Nov 2016 03:43:56 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_options_c,v 1.6 2016
 use SSLv23_client_method() required to build with libressl since that it 
haven't
 TLS_client_method()  for now.
 
 src/options.c.orig Fri Jan 15 13:45:23 2016
-+++ src/options.c  Thu Apr 21 21:59:31 2016
-@@ -2579,7 +2579,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+--- src/options.c.orig Fri Aug  5 06:39:57 2016
 src/options.c  Thu Nov  3 23:13:15 2016
+@@ -2617,7 +2617,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
  /* sslVersion */
  switch(cmd) {
  case CMD_BEGIN:
@@ -14,7 +14,7 @@ TLS_client_method()  for now.
  section->client_method=(SSL_METHOD *)TLS_client_method();
  section->server_method=(SSL_METHOD *)TLS_server_method();
  #else
-@@ -2591,7 +2591,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+@@ -2629,7 +2629,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
  if(strcasecmp(opt, "sslVersion"))
  break;
  if(!strcasecmp(arg, "all")) {
Index: patches/patch-src_prototypes_h
=

Re: x11/slock: clear passwords with explicit_bzero

[Gleydson Soares]

Theo Buehler  writes:
> 
> > A patch to change this has been applied to upstream slock (latest git),
> > see: 
> > http://git.suckless.org/slock/commit/?id=a7afade1701a809f6a33b53525d59dd29b38d381
> > 
> > I have imported explicit_bzero.c from libressl-portable.
> 
> Very cool, thank you! Patch makes sense to me as it is.
> 
> Is there a new release for slock planned anytime soon?
> 
> If not:
> ok for the following diff so we have this in our port?

Patch looks right, builds and runs fine.
OK gsoares@

UPDATE: mail/msmtp-1.6.5

[Gleydson Soares]

update msmtp to 1.6.5.

This release supports SHA256 fingerprints for tls_fingerprint, and
mark both SHA1 and MD5 as deprecated.

OK?

Index: Makefile
===
RCS file: /cvs/ports/mail/msmtp/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile27 Apr 2016 10:40:15 -  1.42
+++ Makefile9 Jun 2016 02:36:20 -
@@ -2,7 +2,7 @@
 
 COMMENT =  SMTP plugin for MUAs
 
-DISTNAME = msmtp-1.6.4
+DISTNAME = msmtp-1.6.5
 CATEGORIES =   mail
 
 HOMEPAGE = http://msmtp.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/mail/msmtp/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo27 Apr 2016 10:40:15 -  1.28
+++ distinfo9 Jun 2016 02:36:20 -
@@ -1,2 +1,2 @@
-SHA256 (msmtp-1.6.4.tar.xz) = m0nAIqVEDUG2eCyX7yl30DRsPa4Fqog2JDqZU+mC0c0=
-SIZE (msmtp-1.6.4.tar.xz) = 282840
+SHA256 (msmtp-1.6.5.tar.xz) = dqDWBpPH5l0MehLwHTAIgtKAseG+AgL1RzCuRNRKUAY=
+SIZE (msmtp-1.6.5.tar.xz) = 283284

Re: net/ii bus error

[Gleydson Soares]

Sebastien Marie  writes:
> 
> On Mon, Jun 06, 2016 at 06:15:40AM +0200, Sebastien Marie wrote:
> > On Mon, Jun 06, 2016 at 12:50:02AM -0300, Gleydson Soares wrote:
> > > 
> > > - add '# uses pledge()' marker in Makefile (missing in previus)
> > > - wrap pledge(2) in #ifdef __OpenBSD__
> > 
> > ok semarie@
> 
> whoops: finally not ok: there are missing braces !

fixed.

Index: Makefile
===
RCS file: /cvs/ports/net/ii/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile21 May 2016 05:31:38 -  1.13
+++ Makefile6 Jun 2016 04:53:13 -
@@ -3,7 +3,7 @@
 COMMENT=   minimalist IRC client
 
 DISTNAME=  ii-1.7
-REVISION=  2
+REVISION=  3
 CATEGORIES=net
 
 HOMEPAGE=  http://tools.suckless.org/ii
@@ -15,6 +15,7 @@ MAINTAINER=   Gleydson Soares http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+uses pledge():
+  - stdio rpath wpath cpath dpath: ii(1) will create directory
+structure and fifos on demand (when joining a new channel for
+example).
+
+--- ii.c.orig  Mon Jun  6 00:44:40 2016
 ii.c   Mon Jun  6 01:47:02 2016
+@@ -438,7 +438,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv;
+@@ -475,9 +475,11 @@ static void run() {
+   handle_server_output();
+   last_response = time(NULL);
+   }
+-  for(c = channels; c; c = c->next)
++  for(c = channels; c; c = n) {
++  n = c->next;
+   if(FD_ISSET(c->fd, &rd))
+   handle_channels_input(c);
++  }
+   }
+ }
+ 
+@@ -511,6 +513,14 @@ int main(int argc, char *argv[]) {
+   if(use_ssl)
+   port = port == SERVER_PORT ? SSL_SERVER_PORT : port;
+   irc = tcpopen(port);
++
++#ifdef __OpenBSD__
++  if (pledge("stdio rpath wpath cpath dpath", NULL) == -1) {
++  fputs("ii: pledge\n", stderr);
++  exit(EXIT_FAILURE);
++  }
++#endif
++
+   if(!snprintf(path, sizeof(path), "%s/%s", prefix, host)) {
+   fputs("ii: path to irc directory too long\n", stderr);
+   exit(EXIT_FAILURE);
Index: patches/ucspipatch-ii_c
===
RCS file: patches/ucspipatch-ii_c
diff -N patches/ucspipatch-ii_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/ucspipatch-ii_c 6 Jun 2016 04:53:13 -
@@ -0,0 +1,48 @@
+$OpenBSD$
+
+http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+uses pledge():
+  - stdio rpath wpath cpath dpath: ii(1) will create directory
+structure and fifos on demand (when joining a new channel for
+example).
+
+--- ii.c.orig  Mon Jun  6 00:46:07 2016
 ii.c   Mon Jun  6 01:47:57 2016
+@@ -386,7 +386,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv;
+@@ -423,9 +423,11 @@ static void run() {
+   handle_server_output();
+   last_response = time(NULL);
+   }
+-  for(c = channels; c; c = c->next)
++  for(c = channels; c; c = n) {
++  n = c->next;
+   if(FD_ISSET(c->fd, &rd))
+   handle_channels_input(c);
++  }
+   }
+ }
+ 
+@@ -455,6 +457,14 @@ int main(int argc, char *argv[]) {
+   default: usage(); break;
+   }
+   }
++
++#ifdef __OpenBSD__
++  if (pledge("stdio rpath wpath cpath dpath", NULL) == -1) {
++  fputs("ii: pledge\n", stderr);
++  exit(EXIT_FAILURE);
++  }
++#endif
++
+   if(!snprintf(path, sizeof(path), "%s/%s", prefix, host)) {
+   fputs("ii: path to irc directory too long\n", stderr);
+   exit(EXIT_FAILURE);

Re: net/ii bus error

[Gleydson Soares]

Hi,

Gleydson Soares  writes:
> 
> Hi,
> 
> Ray Lai  writes:
> > 
> > On Sun, 5 Jun 2016 21:41:54 +0800
> > Ray Lai  wrote:
> > 
> > > On Sun, 5 Jun 2016 14:10:25 +0200
> > > Sebastien Marie  wrote:
> > > >   - does the patch maintained locally or by upstream ? if it is only
> > > > locally, I would kept it as simple as possible.
> > > > 
> > > > with only one pledge call, it is really simple to understand what is
> > > > pledged and what it isn't. so it is more simple to maintain later
> > > > (because code changes on the time).  
> > > 
> > > Okay, you've convinced me.
> > > 
> > > > > +# uses pledge()
> > > > 
> > > > it is a bit a minimal comment... :-)
> > > > 
> > > > some additionnal elements for helping maintainer later:
> > > > 
> > > > uses pledge():
> > > >   - inet dns: just for tcpopen() call. once done, no need anymore
> > > > network stuff.
> > > >   
> > > >   - rpath wpath cpath dpath: ii(1) will create directory structure and
> > > > fifos on demand (when joining a new channel for example).  
> > > 
> > > Thanks! I just copied from other pledge'd ports, but from the few
> > > examples I found, they just had one line. (I'm copy-and-paste slacker.)
> > 
> > Missing rpath, sorry:
> 
> This breaks ucspi flavor. Here is a new one that works. 
> 
> ii-ucspi/pledge(2):
> ucspi take care of ii network capabilities, so ii doesn't 
> need more "inet dns" itself, then I've pledged.
> 
> I've tested both and works just fine.
> 
> btw I'll work to add pledge(2) support upstream.

- add '# uses pledge()' marker in Makefile (missing in previus)
- wrap pledge(2) in #ifdef __OpenBSD__

Index: Makefile
===
RCS file: /cvs/ports/net/ii/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile21 May 2016 05:31:38 -  1.13
+++ Makefile6 Jun 2016 03:45:03 -
@@ -3,7 +3,7 @@
 COMMENT=   minimalist IRC client
 
 DISTNAME=  ii-1.7
-REVISION=  2
+REVISION=  3
 CATEGORIES=net
 
 HOMEPAGE=  http://tools.suckless.org/ii
@@ -15,6 +15,7 @@ MAINTAINER=   Gleydson Soares http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+uses pledge():
+  - stdio rpath wpath cpath dpath: ii(1) will create directory
+structure and fifos on demand (when joining a new channel for
+example).
+
+--- ii.c.orig  Mon Jun  6 00:39:32 2016
 ii.c   Mon Jun  6 00:40:00 2016
+@@ -438,7 +438,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv;
+@@ -475,9 +475,11 @@ static void run() {
+   handle_server_output();
+   last_response = time(NULL);
+   }
+-  for(c = channels; c; c = c->next)
++  for(c = channels; c; c = n) {
++  n = c->next;
+   if(FD_ISSET(c->fd, &rd))
+   handle_channels_input(c);
++  }
+   }
+ }
+ 
+@@ -511,6 +513,13 @@ int main(int argc, char *argv[]) {
+   if(use_ssl)
+   port = port == SERVER_PORT ? SSL_SERVER_PORT : port;
+   irc = tcpopen(port);
++
++#ifdef __OpenBSD__
++  if (pledge("stdio rpath wpath cpath dpath", NULL) == -1)
++  fputs("ii: pledge\n", stderr);
++  exit(EXIT_FAILURE);
++#endif
++
+   if(!snprintf(path, sizeof(path), "%s/%s", prefix, host)) {
+   fputs("ii: path to irc directory too long\n", stderr);
+   exit(EXIT_FAILURE);
Index: patches/ucspipatch-ii_c
===
RCS file: patches/ucspipatch-ii_c
diff -N patches/ucspipatch-ii_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/ucspipatch-ii_c 6 Jun 2016 03:45:03 -
@@ -0,0 +1,47 @@
+$OpenBSD$
+
+http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+uses pledge():
+  - stdio rpath wpath cpath dpath: ii(1) will create directory
+structure and fifos on demand (when joining a new channel for
+example).
+
+--- ii.c.orig  Mon Jun  6 00:40:54 2016
 ii.c   Mon Jun  6 00:41:14 2016
+@@ -386,7 +386,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv

Re: net/ii bus error

[Gleydson Soares]

Hi,

Ray Lai  writes:
> 
> On Sun, 5 Jun 2016 21:41:54 +0800
> Ray Lai  wrote:
> 
> > On Sun, 5 Jun 2016 14:10:25 +0200
> > Sebastien Marie  wrote:
> > >   - does the patch maintained locally or by upstream ? if it is only
> > > locally, I would kept it as simple as possible.
> > > 
> > > with only one pledge call, it is really simple to understand what is
> > > pledged and what it isn't. so it is more simple to maintain later
> > > (because code changes on the time).  
> > 
> > Okay, you've convinced me.
> > 
> > > > +# uses pledge()
> > > 
> > > it is a bit a minimal comment... :-)
> > > 
> > > some additionnal elements for helping maintainer later:
> > > 
> > > uses pledge():
> > >   - inet dns: just for tcpopen() call. once done, no need anymore
> > > network stuff.
> > >   
> > >   - rpath wpath cpath dpath: ii(1) will create directory structure and
> > > fifos on demand (when joining a new channel for example).  
> > 
> > Thanks! I just copied from other pledge'd ports, but from the few
> > examples I found, they just had one line. (I'm copy-and-paste slacker.)
> 
> Missing rpath, sorry:

This breaks ucspi flavor. Here is a new one that works. 

ii-ucspi/pledge(2):
ucspi take care of ii network capabilities, so ii doesn't 
need more "inet dns" itself, then I've pledged.

I've tested both and works just fine.

btw I'll work to add pledge(2) support upstream.

Index: Makefile
===
RCS file: /cvs/ports/net/ii/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile21 May 2016 05:31:38 -  1.13
+++ Makefile5 Jun 2016 23:02:56 -
@@ -3,7 +3,7 @@
 COMMENT=   minimalist IRC client
 
 DISTNAME=  ii-1.7
-REVISION=  2
+REVISION=  3
 CATEGORIES=net
 
 HOMEPAGE=  http://tools.suckless.org/ii
Index: patches/patch-config_mk
===
RCS file: patches/patch-config_mk
diff -N patches/patch-config_mk
Index: patches/sslpatch-ii_c
===
RCS file: patches/sslpatch-ii_c
diff -N patches/sslpatch-ii_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/sslpatch-ii_c   5 Jun 2016 23:02:56 -
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+uses pledge():
+  - stdio rpath wpath cpath dpath: ii(1) will create directory
+structure and fifos on demand (when joining a new channel for
+example).
+
+--- ii.c.orig  Sat Jan  5 10:15:13 2013
 ii.c   Sun Jun  5 19:35:00 2016
+@@ -410,7 +410,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv;
+@@ -447,9 +447,11 @@ static void run() {
+   handle_server_output();
+   last_response = time(NULL);
+   }
+-  for(c = channels; c; c = c->next)
++  for(c = channels; c; c = n) {
++  n = c->next;
+   if(FD_ISSET(c->fd, &rd))
+   handle_channels_input(c);
++  }
+   }
+ }
+ 
+@@ -480,6 +482,10 @@ int main(int argc, char *argv[]) {
+   }
+   }
+   irc = tcpopen(port);
++
++  if (pledge("stdio rpath wpath cpath dpath", NULL) == -1)
++  err(1, "pledge");
++
+   if(!snprintf(path, sizeof(path), "%s/%s", prefix, host)) {
+   fputs("ii: path to irc directory too long\n", stderr);
+   exit(EXIT_FAILURE);
Index: patches/ucspipatch-ii_c
===
RCS file: patches/ucspipatch-ii_c
diff -N patches/ucspipatch-ii_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/ucspipatch-ii_c 5 Jun 2016 23:02:56 -
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+uses pledge():
+  - stdio rpath wpath cpath dpath: ii(1) will create directory
+structure and fifos on demand (when joining a new channel for
+example).
+
+--- ii.c.orig  Sun Jun  5 19:36:53 2016
 ii.c   Sun Jun  5 19:44:16 2016
+@@ -386,7 +386,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv;
+@@ -423,9 +423,11 @@ static void run() {
+   handle_server_output();
+   last_response = time(NULL);
+   }
+-  for(c = channels; c; c = c->next)
++  for(c = channels; c; c = n) {
++  n = c->next;
+   if(FD_ISSET(c->fd, &rd))
+   handle_channels_input(c);
++  }
+   }
+ }
+ 
+@@ -455,6 +45

Re: net/ii bus error

[Gleydson Soares]

> Looks like there's an use after freeing in main loop
> Attached diff should fix it. Could you try?
> Thanks,

updated diff. (it was missing a bump)

cvs server: Diffing .
Index: Makefile
===
RCS file: /cvs/ports/net/ii/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile21 May 2016 05:31:38 -  1.13
+++ Makefile4 Jun 2016 18:57:19 -
@@ -3,7 +3,7 @@
 COMMENT=   minimalist IRC client
 
 DISTNAME=  ii-1.7
-REVISION=  2
+REVISION=  3
 CATEGORIES=net
 
 HOMEPAGE=  http://tools.suckless.org/ii
cvs server: Diffing patches
Index: patches/patch-ii_c
===
RCS file: patches/patch-ii_c
diff -N patches/patch-ii_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-ii_c  4 Jun 2016 18:57:19 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+# 
http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+--- ii.c.orig  Sat Jan  5 10:15:13 2013
 ii.c   Sat Jun  4 15:39:10 2016
+@@ -410,7 +410,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv;
+@@ -447,9 +447,11 @@ static void run() {
+   handle_server_output();
+   last_response = time(NULL);
+   }
+-  for(c = channels; c; c = c->next)
++  for(c = channels; c; c = n) {
++  n = c->next;
+   if(FD_ISSET(c->fd, &rd))
+   handle_channels_input(c);
++  }
+   }
+ }
+ 

Re: net/ii bus error

[Gleydson Soares]

Hi Ray,

Ray Lai  writes:
> 
> (terminal 1)
> $ ii
> 
> (terminal 2)
> $ echo '/j #test123' >> ~/irc/irc.freenode.net/in
> $ echo '/l #test123' >> ~/irc/irc.freenode.net/'#test123'/in
> 
> (terminal 1)
> Bus error (core dumped) 
> $ egdb ./ii ~/ii.core
> GNU gdb (GDB) 7.11
> Copyright (C) 2016 Free Software Foundation, Inc.
> License GPLv3+: GNU GPL version 3 or later 
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
> and "show warranty" for details.
> This GDB was configured as "x86_64-unknown-openbsd6.0".
> Type "show configuration" for configuration details.
> For bug reporting instructions, please see:
> .
> Find the GDB manual and other documentation resources online at:
> .
> For help, type "help".
> Type "apropos word" to search for commands related to "word"...
> Reading symbols from ./ii...done.
> [New process 99191]
> Core was generated by `ii'.
> Program terminated with signal SIGBUS, Bus error.
> #0  run () at ii.c:479
> 479   if(FD_ISSET(c->fd, &rd))
> (gdb) frame 0
> #0  run () at ii.c:479
> 479   if(FD_ISSET(c->fd, &rd))
> (gdb) print c
> $1 = 
> (gdb) print c->fd
> value has been optimized out
> (gdb) print rd
> $2 = {fds_bits = {32, 0 }}
> (gdb) print channels
> $3 = (Channel *) 0x6368a267f40
> (gdb) print *channels
> $4 = {fd = 4, name = 0x637221ee350 "", next = 0x0}
> (gdb) 
> 
> ii.c:
>   for(;;) {
>   FD_ZERO(&rd);
>   maxfd = irc->irc;
>   FD_SET(irc->irc, &rd);
>   for(c = channels; c; c = c->next) {
>   if(maxfd < c->fd)
>   maxfd = c->fd;
>   FD_SET(c->fd, &rd);
>   }
> 
>   tv.tv_sec = 120;
>   tv.tv_usec = 0;
>   r = select(maxfd + 1, &rd, 0, 0, &tv);
>   if(r < 0) {
>   if(errno == EINTR)
>   continue;
>   perror("ii: error on select()");
>   exit(EXIT_FAILURE);
>   } else if(r == 0) {
>   if(time(NULL) - last_response >= PING_TIMEOUT) {
>   print_out(NULL, "-!- ii shutting down: ping 
> timeout");
>   exit(EXIT_FAILURE);
>   }
>   WRITE(irc, ping_msg, strlen(ping_msg));
>   continue;
>   }
>   if(FD_ISSET(irc->irc, &rd)) {
>   handle_server_output();
>   last_response = time(NULL);
>   }
>   for(c = channels; c; c = c->next)
> /*479*/   if(FD_ISSET(c->fd, &rd))
>   handle_channels_input(c);
>   }
> 

Looks like there's an use after freeing in main loop
Attached diff should fix it. Could you try?
Thanks,

Index: patch-ii_c
===
RCS file: patch-ii_c
diff -N patch-ii_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patch-ii_c  4 Jun 2016 18:50:57 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+# 
http://git.suckless.org/ii/commit/?id=f79e2f09534d92a6fe4e062b06449a925fef1c41
+
+--- ii.c.orig  Sat Jan  5 10:15:13 2013
 ii.c   Sat Jun  4 15:39:10 2016
+@@ -410,7 +410,7 @@ static void handle_server_output() {
+ }
+ 
+ static void run() {
+-  Channel *c;
++  Channel *c, *n;
+   int r, maxfd;
+   fd_set rd;
+   struct timeval tv;
+@@ -447,9 +447,11 @@ static void run() {
+   handle_server_output();
+   last_response = time(NULL);
+   }
+-  for(c = channels; c; c = c->next)
++  for(c = channels; c; c = n) {
++  n = c->next;
+   if(FD_ISSET(c->fd, &rd))
+   handle_channels_input(c);
++  }
+   }
+ }
+ 

UPDATE: net/websockify-0.8.0 plus SECURITY fix

[Gleydson Soares]

Below there's a diff that updates websockify to latest release 0.8.0 and adds
a patch that fix a SECURITY issue related at:
http://marc.info/?l=full-disclosure&m=146469562404285&w=2

patch comes from upstream
https://github.com/kanaka/websockify/commit/192ec6f5f9bf9c80a089ca020d05ad4bd9e7bcd9.patch

only the port net/noVNC depends on websockify library, builds fine...
(not tested though).

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/websockify/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile22 Dec 2015 14:41:52 -  1.2
+++ Makefile3 Jun 2016 03:21:02 -
@@ -2,8 +2,7 @@
 
 COMMENT=   WebSocket to TCP proxy
 
-MODPY_EGG_VERSION= 0.7.0
-REVISION=  0
+MODPY_EGG_VERSION= 0.8.0
 DISTNAME=  websockify-${MODPY_EGG_VERSION}
 
 CATEGORIES=net
@@ -28,7 +27,7 @@ post-build:
cd ${WRKSRC}; env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
 post-install:
-   ${INSTALL_DATA} ${WRKSRC}/docs/websockify.1 ${PREFIX}/man/man1/
+   ${INSTALL_MAN} ${WRKSRC}/docs/websockify.1 ${PREFIX}/man/man1/
${INSTALL_DATA_DIR} ${PREFIX}/lib/websockify
${INSTALL_DATA} ${WRKSRC}/rebind.so ${PREFIX}/lib/websockify/
 
Index: distinfo
===
RCS file: /cvs/ports/net/websockify/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo18 Dec 2015 13:18:39 -  1.1.1.1
+++ distinfo3 Jun 2016 03:21:02 -
@@ -1,2 +1,2 @@
-SHA256 (websockify-0.7.0.tar.gz) = imOOkKGm3+CGI0XQadkx3x1JatsV2ylL/HB3pd8t7Ms=
-SIZE (websockify-0.7.0.tar.gz) = 286470
+SHA256 (websockify-0.8.0.tar.gz) = 8IDkCz9CnzncVXxixtcVpoMQDnwQxVf6N2ttveIzWM4=
+SIZE (websockify-0.8.0.tar.gz) = 288359
cvs server: Diffing patches
Index: patches/patch-other_websocket_c
===
RCS file: patches/patch-other_websocket_c
diff -N patches/patch-other_websocket_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-other_websocket_c 3 Jun 2016 03:21:02 -
@@ -0,0 +1,48 @@
+$OpenBSD$
+
+fix SECURITY issue:
+http://marc.info/?l=full-disclosure&m=146469562404285&w=2
+upstream patch:
+https://github.com/kanaka/websockify/commit/192ec6f5f9bf9c80a089ca020d05ad4bd9e7bcd9.patch
+
+--- other/websocket.c.orig Thu Feb 18 16:11:15 2016
 other/websocket.c  Fri Jun  3 00:17:08 2016
+@@ -612,15 +612,28 @@ ws_ctx_t *do_handshake(int sock) {
+ }
+ offset = 0;
+ for (i = 0; i < 10; i++) {
+-len = ws_recv(ws_ctx, handshake+offset, 4096);
+-if (len == 0) {
++/* (offset + 1): reserve one byte for the trailing '' */
++if (0 > (len = ws_recv(ws_ctx, handshake + offset, sizeof(handshake) 
- (offset + 1 {
++handler_emsg("Read error during handshake: %m
");
++free_ws_ctx(ws_ctx);
++return NULL;
++} else if (0 == len) {
+ handler_emsg("Client closed during handshake
");
++free_ws_ctx(ws_ctx);
+ return NULL;
+ }
+ offset += len;
+ handshake[offset] = 0;
+ if (strstr(handshake, "

")) {
+ break;
++} else if (sizeof(handshake) <= (size_t)(offset + 1)) {
++handler_emsg("Oversized handshake
");
++free_ws_ctx(ws_ctx);
++return NULL;
++} else if (9 == i) {
++handler_emsg("Incomplete handshake
");
++free_ws_ctx(ws_ctx);
++return NULL;
+ }
+ usleep(10);
+ }
+@@ -628,6 +641,7 @@ ws_ctx_t *do_handshake(int sock) {
+ //handler_msg("handshake: %s
", handshake);
+ if (!parse_handshake(ws_ctx, handshake)) {
+ handler_emsg("Invalid WS request
");
++free_ws_ctx(ws_ctx);
+ return NULL;
+ }
+ 
Index: patches/patch-websockify_websocket_py
===
RCS file: /cvs/ports/net/websockify/patches/patch-websockify_websocket_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-websockify_websocket_py
--- patches/patch-websockify_websocket_py   18 Dec 2015 13:18:39 -  
1.1.1.1
+++ patches/patch-websockify_websocket_py   3 Jun 2016 03:21:02 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-websockify_websocket_py,v 1.1.1.1 2015/12/18 13:18:39 sthen 
Exp $
 websockify/websocket.py.orig   Fri Dec 18 12:31:42 2015
-+++ websockify/websocket.pyFri Dec 18 12:34:27 2015
-@@ -711,15 +711,6 @@ class WebSocketServer(object):
+--- websockify/websocket.py.orig   Thu Feb 18 16:11:15 2016
 websockify/websocket.pyThu Jun  2 23:57:19 2016
+@@ -722,15 +722,6 @@ class WebSocketServer(object):
  
  if  tcp_keepalive:
  sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)

Re: Update: devel/subversion

[Gleydson Soares]

Just a slight slight slight tweak ;)

> find ${PREFIX}/share/examples/subversion -type f | xargs perl -pi \

move to use `sed -i' instead of depending on perl.

> +   -e "s,.*/usr/bin/ruby.*,#!${RUBY},;" \
> +   -e "s,.*env ruby.*,#!${RUBY},;" \
> -e "s,.*/usr/bin/python.*,#!${MODPY_BIN},;" \
> -e "s,.*env python.*,#!${MODPY_BIN},;"

Otherwise, looks fine, but I haven't tested, maybe tonight.

Re: Update: devel/subversion

[Gleydson Soares]

Could you merge it [1] on top of your diff?

It adds a rcscript and _svnserver user to db/user.list
(Sent by jung@ yesterday) [1]

[1] http://marc.info/?l=openbsd-ports&m=146447355118340&w=2

Dmitrij D. Czarkoff  writes:

> Hi!
>
> Below is an update for devel/subversion (1.8.15 => 1.9.4).  It is only
> slightly tested because I am not a subversion user, and I only needed
> svn as a dependency for another port I am working on.  Please test.

Re: thunderbird: Unhandleable OOM, W^X violation

[Gleydson Soares]

Hi Peter,

Did you have your /usr/local partition mounted with
wxallowed flag?

By default (on OpenBSD -current) [1], It doesn't allow W^X violation. 

[1] http://marc.info/?l=openbsd-cvs&m=146437839601863&w=2

// gsoares

Peter N. M. Hansteen  writes:

> Hi,
>
> After upgrading to the latest amd64 snapshot and packages, thunderbird failed 
> to start when I tried to invoke it from the xfce menu. Trying again from
> a shell produces
>
>
> [Sat May 28 15:08:07] peter@elke:~$ thunderbird &
> [1] 32335
> [Sat May 28 15:14:00] peter@elke:~$ out of memory
> Assertion failure: [unhandlable oom] OOM in createJitRuntime, at 
> /usr/obj/ports/thunderbird-45.1.0/thunderbird-45.1.0/mozilla/js/src/jscntxt.cpp:1228
>
> [1]+  Segmentation fault  (core dumped) thunderbird
>
> dmesg and /var/log/messages also show several instances of "mmap W^X 
> violation" produced by thunderbird. My guess is that those 
> issues may be related.
>
> [Sat May 28 15:14:55] peter@elke:~$ dmesg
> OpenBSD 6.0-beta (GENERIC.MP) #2131: Fri May 27 21:04:15 MDT 2016
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 17046183936 (16256MB)
> avail mem = 16524963840 (15759MB)
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xeb500 (35 entries)
> bios0: vendor American Megatrends Inc. version "4.6.5" date 11/21/2013
> bios0: Notebook W840SU Series
> acpi0 at bios0: rev 2
> acpi0: sleep states S0 S3 S4 S5
> acpi0: tables DSDT FACP APIC FPDT ASF! SSDT SSDT SSDT MCFG HPET SSDT SSDT 
> DMAR CSRT
> acpi0: wakeup devices PXSX(S4) RP01(S4) PXSX(S4) RP02(S4) PXSX(S4) RP03(S4) 
> PXSX(S4) RP04(S4) RLAN(S4) PXSX(S4) RP05(S4) PXSX(S4) RP06(S4) PXSX(S4) 
> RP07(S4) PXSX(S4) [...]
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: Intel(R) Core(TM) i7-4510U CPU @ 2.00GHz, 2793.96 MHz
> cpu0: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT
> cpu0: 256KB 64b/line 8-way L2 cache
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
> cpu0: apic clock running at 99MHz
> cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4.1.1.1, IBE
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Core(TM) i7-4510U CPU @ 2.00GHz, 2793.54 MHz
> cpu1: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT
> cpu1: 256KB 64b/line 8-way L2 cache
> cpu1: smt 0, core 1, package 0
> cpu2 at mainbus0: apid 1 (application processor)
> cpu2: Intel(R) Core(TM) i7-4510U CPU @ 2.00GHz, 2793.54 MHz
> cpu2: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT
> cpu2: 256KB 64b/line 8-way L2 cache
> cpu2: smt 1, core 0, package 0
> cpu3 at mainbus0: apid 3 (application processor)
> cpu3: Intel(R) Core(TM) i7-4510U CPU @ 2.00GHz, 2793.54 MHz
> cpu3: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,SENSOR,ARAT
> cpu3: 256KB 64b/line 8-way L2 cache
> cpu3: smt 1, core 1, package 0
> ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 40 pins
> acpimcfg0 at acpi0 addr 0xf800, bus 0-63
> acpihpet0 at acpi0: 14318179 Hz
> acpiprt0 at acpi0: bus 0 (PCI0)
> acpiprt1 at acpi0: bus 1 (RP01)
> acpiprt2 at acpi0: bus 2 (RP03)
> acpiprt3 at acpi0: bus 3 (RP04)
> acpiprt4 at acpi0: bus -1 (P0P2)
> acpiprt5 at acpi0: bus -1 (P0PA)
> acpiprt6 at acpi0: bus -1 (P0PB)
> acpiprt7 at acpi0: bus -1 (PEG0)
> acpiprt8 at acpi0: bus -1 (PEG1)
> acpiprt9 at acpi0: bus -1 (PEG2)
> acpiec0 at acpi0
> acpicpu0 at acpi0: C3(200@506 mwait.1@0x60), C2(200@148 mwait.1@0x33), 
> C1(1000@1 mwait.1), PSS
> acpicpu1 at acpi0: C3(200@506 mwait.1@0x60), C2(200@148 mwait.1@0x33), 
> C1(1000@1 mwait.1), PSS
> acpicpu2 at acpi0: C3(200@506 mwait.1@0x60), C2(200@148 mwait.1@0x33), 
> C1(1000@1 mwait.1), PSS
> acpicpu3 at acp

Re: UPDATE: misc/redshift

[Gleydson Soares]

Looks correct to me. OK gsoares@

Re: net/ii: add ucspi flavor

[Gleydson Soares]

Looks correct to me. OK gsoares@

Re: UPDATE: misc/redshift

[Gleydson Soares]

Looks like it is missing some files in PLIST. (make update-plist)

+share/applications/redshift.desktop
+share/locale/tr/LC_MESSAGES/redshift.mo

by the way, "redshift.desktop" was pointed out by upstream at
 https://github.com/jonls/redshift/issues/158
and it seems related to geoclue thing. I haven't tested though.

Re: security/luasec ssl.https module

[Gleydson Soares]

> Is there a reason that the luasec port doesn't install the https module?
> If not, this patch should add it, and also bumps the documentation link
> in the description.

Committed with a slight tweak, your diff was missing a REVISION bump.
thanks,

lua.port.mk - should avoid FULLPKGNAME in PLIST

[Gleydson Soares]

I noticed that lua.port.mk is setting MODLUA_EXAMPLEDIR and MODLUA_DOCDIR to
${PREFIX}/share/examples/${FULLPKGNAME}/ and 
${PREFIX}/share/doc/${FULLPKGNAME}/ 
respectively.

We must use ${DISTNAME:C/-([0-9]+\.[0-9]+).*$//g} instead of ${FULLPKGNAME}
It will strip the name correctly as expected.

I don't like FULLPKGNAME in PLIST and portcheck either.

requires a bump for all lua* ports that uses this MODULE and using
MODLUA_EXAMPLEDIR and MODLUA_DOCDIR, since it changes the package,

comments?

Index: lua.port.mk
===
RCS file: /cvs/ports/lang/lua/lua.port.mk,v
retrieving revision 1.33
diff -u -p -r1.33 lua.port.mk
--- lua.port.mk 18 Oct 2015 20:20:50 -  1.33
+++ lua.port.mk 19 May 2016 04:18:34 -
@@ -93,10 +93,10 @@ _MODLUA_TEST_DEPENDS +=${x},${MODLUA_FLA
 MODLUA_INCL_DIR =  ${LOCALBASE}/include/lua-${MODLUA_VERSION}/
 
 # Where the example will be installed
-MODLUA_EXAMPLEDIR =${PREFIX}/share/examples/${FULLPKGNAME}/
+MODLUA_EXAMPLEDIR =
${PREFIX}/share/examples/${DISTNAME:C/-([0-9]+\.[0-9]+).*$//g}
 
 # Where the docs will be installed
-MODLUA_DOCDIR =${PREFIX}/share/doc/${FULLPKGNAME}/
+MODLUA_DOCDIR =
${PREFIX}/share/doc/${DISTNAME:C/-([0-9]+\.[0-9]+).*$//g}
 
 # Where the lua libraries will be installed to
 MODLUA_LIBDIR =${PREFIX}/lib/lua/${MODLUA_VERSION}/

Re: update: icbirc 2.1

[Gleydson Soares]

On Mon, Apr 25, 2016 at 6:14 AM, Sebastien Marie  wrote:
> Hi,
>
> Here a diff for the new version (2.1) of icbirc:
>   - return *** as nick in IRC error messages (where missing),
>   - add pledge(2) call on OpenBSD
>
> OK ?

builds and runs fine. OK gsoares@


> --
> Sebastien Marie
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/icbirc/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile23 Aug 2015 04:38:23 -  1.16
> +++ Makefile25 Apr 2016 09:11:28 -
> @@ -2,7 +2,7 @@
>
>  COMMENT=   proxy IRC client with ICB server
>
> -DISTNAME=  icbirc-2.0
> +DISTNAME=  icbirc-2.1
>  CATEGORIES=net
>  MASTER_SITES=  http://www.benzedrine.ch/
>
> @@ -13,6 +13,7 @@ MAINTAINER=   Sebastien Marie   # BSD
>  PERMIT_PACKAGE_CDROM=  Yes
>
> +# uses pledge()
>  WANTLIB=   c
>
>  NO_TEST=   Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/icbirc/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo23 Aug 2015 04:38:23 -  1.11
> +++ distinfo25 Apr 2016 09:11:28 -
> @@ -1,2 +1,2 @@
> -SHA256 (icbirc-2.0.tar.gz) = dgfH2A/Dk5zLkTyfzFemPTVSrzYVRU5Ab/Djc3wM5r0=
> -SIZE (icbirc-2.0.tar.gz) = 11174
> +SHA256 (icbirc-2.1.tar.gz) = aDk0TZPABNqX7Gu12AWh234Kee/DhwRFeIBDYnFiu7E=
> +SIZE (icbirc-2.1.tar.gz) = 11257
>