[UPDATE] sysutils/libfwnt

[Remi Pointel]

Hi,

this is the diff to update libfwnt to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/libfwnt/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile	12 Feb 2017 06:46:18 -	1.1.1.1
+++ Makefile	1 Feb 2018 05:21:16 -
@@ -2,7 +2,7 @@
 
 COMMENT =	library for Windows NT data types
 
-VERSION = 	20170115
+VERSION = 	20180117
 DISTNAME =	libfwnt-alpha-${VERSION}
 PKGNAME =	${DISTNAME:S/-alpha//}
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libfwnt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	12 Feb 2017 06:46:18 -	1.1.1.1
+++ distinfo	1 Feb 2018 05:21:16 -
@@ -1,2 +1,2 @@
-SHA256 (libfwnt-alpha-20170115.tar.gz) = AQmQeJZWpKF1N6aNYl5bofckPf/k0bmTpk8QA2/UDeE=
-SIZE (libfwnt-alpha-20170115.tar.gz) = 696120
+SHA256 (libfwnt-alpha-20180117.tar.gz) = 2Wi7v5ALXb2KGUWJhpZ7fkcV/mAZtshaV646liwTgJY=
+SIZE (libfwnt-alpha-20180117.tar.gz) = 695519

Re: [UPDATE] net/gpodder -> 3.10.0 depends on textproc/py-podcastparser net/mygpoclient

[trondd]

Klemens Nanni  wrote:

> On Tue, Jan 30, 2018 at 10:46:36PM -0500, trondd wrote:
> > "trondd"  wrote:
> > 
> > > On Fri, January 12, 2018 6:17 pm, trondd wrote:
> > > > Update gPodder to their new python3/GTK+3 version.  Depends on the 
> > > > python3
> > > > version of textproc/py-podcastparser and net/mygpoclient.
> > > >
> > > > My only question on this one, do I need to run compileall.py like
> > > > portcheck
> > > > says?  I think it was mentioned ot me that it isn't always necessary.  
> > > > It
> > > > would be for the extensions, most of which I can't use and I haven't 
> > > > seen
> > > > issues running the ones I did try.
> > > >
> > > > There is also optional support for ID3 tag management that depends on
> > > > py-eyed3 which needs updating.  I'll tackle that next and enable it in
> > > > gPodder as a seperate update.
> > > >
> > > > Tim.
> > > >
> > > 
> > > Bump the real one.
> > > 
> > > Tim.
> > 
> > Updated to account for flavored textproxy/py-podcastparser
> Looks good port-wise except for two things:
> 
> patch-makefile can be dropped in favor of FAKE_FLAGS.

Did this work for you?  It seems to have no effect.

$ find /usr/ports/pobj/gpodder-3.10.0/ -name "*.1"
/usr/ports/pobj/gpodder-3.10.0/gpodder-3.10.0/share/man/man1/gpo.1
/usr/ports/pobj/gpodder-3.10.0/gpodder-3.10.0/share/man/man1/gpodder-migrate2tres.1
/usr/ports/pobj/gpodder-3.10.0/gpodder-3.10.0/share/man/man1/gpodder.1
/usr/ports/pobj/gpodder-3.10.0/gpodder-3.10.0/usr/ports/pobj/gpodder-3.10.0/fake-amd64/usr/local/man/man1/gpo.1
/usr/ports/pobj/gpodder-3.10.0/gpodder-3.10.0/usr/ports/pobj/gpodder-3.10.0/fake-amd64/usr/local/man/man1/gpodder-migrate2tres.1
/usr/ports/pobj/gpodder-3.10.0/gpodder-3.10.0/usr/ports/pobj/gpodder-3.10.0/fake-amd64/usr/local/man/man1/gpodder.1

Seems FAKE_FLAGS does nothing.  I think because the Makefile defines a
do-install.  However, NOTHING I do to PREFIX or DESTDIR in *_FLAGS or *_ENV has
any effect because the ports sytem sets those varaibles *after* setting the
customized *_ENV or *_FLAG variables.

cd /usr/ports/pobj/gpodder-3.10.0/gpodder-3.10.0 && /usr/bin/env -i 
LC_CTYPE=en_US.UTF-8  PYTHON=/usr/local/bin/python3.6  
GPODDER_MANPATH_NO_SHARE="yes"  DESTDIR="arbitrary"  PREFIX="useless" CC=cc 
PYTHONUSERBASE=/usr/ports/pobj/gpodder-3.10.0 INTLTOOL_EXTRACT=/usr/local/
bin/intltool-extract  INTLTOOL_MERGE=/usr/local/bin/intltool-merge  
INTLTOOL_UPDATE=/usr/local/bin/intltool-update PORTSDIR="/usr/ports" 
LIBTOOL="/usr/bin/libtool"  
PATH='/usr/ports/pobj/gpodder-3.10.0/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
 PREFIX
='/usr/ports/pobj/gpodder-3.10.0/fake-amd64/usr/local'  LOCALBASE='/usr/local' 
X11BASE='/usr/X11R6'  CFLAGS='-O2 -pipe'  
TRUEPREFIX='/usr/ports/pobj/gpodder-3.10.0/fake-amd64/usr/local' DESTDIR=''  
HOME='/gpodder-3.10.0_writes_to_HOME' COMPILER_VERSION=clang  PICFLAG="-fpi
c"  BINGRP=bin BINOWN=root BINMODE=755 NONBINMODE=644  DIRMODE=755  
INSTALL_COPY=-c INSTALL_STRIP=-s  MANGRP=bin MANOWN=root MANMODE=644 
BSD_INSTALL_PROGRAM="/usr/ports/pobj/gpodder-3.10.0/bin/install -c -s  -m 755"  
BSD_INSTALL_SCRIPT="/usr/ports/pobj/gpodder-3.10.0/bin/i
nstall -c  -m 755"  
BSD_INSTALL_DATA="/usr/ports/pobj/gpodder-3.10.0/bin/install -c  -m 644"  
BSD_INSTALL_MAN="/usr/ports/pobj/gpodder-3.10.0/bin/install -c  -m 644"  
BSD_INSTALL_PROGRAM_DIR="/usr/ports/pobj/gpodder-3.10.0/bin/install -d  -m 755" 
 BSD_INSTALL_SCRIPT_DIR="/
usr/ports/pobj/gpodder-3.10.0/bin/install -d  -m 755"  
BSD_INSTALL_DATA_DIR="/usr/ports/pobj/gpodder-3.10.0/bin/install -d  -m 755"  
BSD_INSTALL_MAN_DIR="/usr/ports/pobj/gpodder-3.10.0/bin/install -d  -m 755" 
gmake  -f makefile install


The only way I could make this work without a patch is to set DESTDIR (or
PREFIX, but DESTDIR is the real problem, I think) in the do-install.
 
> See one PLIST fix inline, updated diff below.

That was a good catch.  Thanks.

Tim.


Index: Makefile
===
RCS file: /cvs/ports/net/gpodder/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile13 Jun 2017 07:43:56 -  1.12
+++ Makefile1 Feb 2018 02:04:48 -
@@ -2,11 +2,11 @@
 
 COMMENT=   media aggregator and podcast client
 
-MODPY_EGG_VERSION= 3.9.3
+MODPY_EGG_VERSION= 3.10.0
 DISTNAME=  gpodder-${MODPY_EGG_VERSION}
 CATEGORIES=net www
 
-HOMEPAGE=  http://gpodder.org/
+HOMEPAGE=  https://gpodder.github.io/
 
 MAINTAINER=Tim Meunier 
 
@@ -15,36 +15,39 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 GH_ACCOUNT=gpodder
 GH_PROJECT=gpodder
-GH_TAGNAME=${DISTNAME}
+GH_TAGNAME=${MODPY_EGG_VERSION}
 
 MODULES=   lang/python \
textproc/intltool
 
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
 RUN_DEPENDS=   

CVS: cvs.openbsd.org: ports

[James Turner]

CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2018/01/31 17:32:56

Modified files:
databases/ksql : Makefile distinfo 
databases/ksql/pkg: PLIST 

Log message:
Update ksql to 0.2.3

Re: [NEW] devel/p5-Devel-Platform-Info

[James E Keenan]

On 01/30/2018 09:50 AM, James E Keenan wrote:

On 01/28/2018 04:36 PM, Andrew Hewus Fresh wrote:
[snip]
 >
 > I think this is OK, although I've been led to believe that we usually
 > prefer to enable as many tests as possible so that we don't get
 > different results depending on what folks might have installed or what
 > environment they have set, which would mean making these additions.
 >
 > TEST_ENV =    AUTOMATED_TESTING=1
 > TEST_DEPENDS =    devel/p5-Test-MockObject \
 > devel/p5-Test-Pod>=1.00 \
 > devel/p5-Test-Pod-Coverage>=0.08 \
 > devel/p5-Test-CPAN-Meta
 >
 > # Additional tests could be enabled by porting
 > #    devel/p5-Test-CPAN-Meta-JSON
 >

Andrew,

I agree with you that, in general, we don't want to get different test 
results depending on what particular users have installed on their 
systems.  That would lead us to activate tests which the CPAN author 
indicates can be run if certain other Perl extensions are present.


However, I think we should look more closely at the environmental 
variable which you are suggesting to include in the port's Makefile:


#
TEST_ENV =    AUTOMATED_TESTING=1
#

In the context of tests in CPAN distributions 'AUTOMATED_TESTING' has a 
specific meaning.  At the 2013 Perl QA Hackathon held in Lancaster, 
U.K., a consensus emerged to define the meaning of certain terms that 
would be used by CPAN authors to activate or not activate tests under 
different circumstances 
(https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/lancaster-consensus.md#environment-variables-for-testing-contexts). 
  Here's what was recommended for 'AUTOMATED_TESTING':


#
AUTOMATED_TESTING: if true, tests are being run by an automated testing 
facility and not as part of the installation of a module; CPAN smokers 
must set this to true; CPAN clients must not set this

#

In this context, "automated testing facility" refers to a server where 
someone is testing large parts of the 36,000+ distributions on CPAN 
against various versions of Perl on a specific platform and is sending 
test reports to cpantesters.org.  For example, Alceu Rodrigues de 
Freitas Junior runs CPAN smokers for testing distributions against Perl 
5.26.0, 5.26.1 and 5.27.6 (blead) on OpenBSD 6.0, 6.1 and 6.2.  In those 
set-ups, he has indeed turned on an AUTOMATED_TESTING environmental 
variable; see, e.g., 
http://www.cpantesters.org/cpan/report/7f3fb1ae-e729-11e7-8087-d3e9cf4e8a6e. 



However, the Lancaster consensus guidance above indicates that in all 
circumstances other than preparing reports for cpantesters.org, 
AUTOMATED_TESTING should not be turned on.  An OpenBSD port of a CPAN 
distribution is, essentially, a set of instructions for fetching a 
tarball from CPAN and installing it on OpenBSD.  It is therefore a "CPAN 
client" as defined by the Lancaster consensus and, hence, should *not* 
turn on the AUTOMATED_TESTING environmental variable.


The author of Devel-Platform-Info, Barbie, has participated in many Perl 
QA hackathons and was the administrator of cpantesters.org for many 
years.  Hence, we should presume that he is using 'AUTOMATED_TESTING' in 
the way described above.  Here's how Barbie structures his tests:


#
# From:t/90podtest.t

plan skip_all => "Author tests not required for installation" unless 
($ENV{AUTOMATED_TESTING});

eval "use Test::Pod 1.00";
plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
#

He characterizes the tests in this file as "[a]uthor tests not required 
for installation" which are to be run only if the AUTOMATED_TESTING 
envvar is set.  I interpret this to mean that they should only be run in 
the context of CPAN smokers.  He then goes on to say that the tests in 
this file should only be run if Test::Pod version 1.00 or greater is 
already present on the user's machine.


If the first 'plan skip_all' statement were not present in this file, 
then the author would be telling the user, "Go ahead and run this file 
if you've already got Test::Pod installed, but don't bother if you don't 
have it installed."  If that were the case, then I think it would be 
appropriate for an OpenBSD port's Makefile to include the port 
corresponding to Test::Pod as a value for TEST_DEPENDS.  But that's not 
the case here.  The author is indicating that the Test::Pod tests should 
only be run by CPAN smokers, not by CPAN clients.  If a CPAN client 
turns on AUTOMATED_TESTING, it is, in effect, second-guessing the author.


Now I concede that:

* The CPAN author may be incorrect; hence he or she should be 
second-guessed.


* OpenBSD is free to set policies for ports that adhere to standards 
different from those set by the authors of the code being ported.


* I'm just a beginner with respect to OpenBSD ports, so I may not know 
the historical context.


So, I'm perfectly willing to revise the port's Makefile per your 
suggestion.  But it would be good to have an explicit and well-reasoned 
policy 

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/31 15:29:09

Modified files:
net/kea: Makefile 
Added files:
net/kea/patches: patch-src_lib_asiolink_io_service_h 
 patch-src_lib_asiolink_tcp_acceptor_h 
 patch-src_lib_asiolink_tcp_socket_h 
 patch-src_lib_asiolink_udp_socket_h 
 patch-src_lib_asiolink_unix_domain_socket_cc 

Log message:
fix build with boost 1.66.0

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/31 14:54:49

Modified files:
devel/boost: Makefile distinfo 
devel/boost/patches: patch-Jamroot 
 patch-boost_config_compiler_clang_hpp 
 patch-tools_build_src_tools_gcc_jam 
devel/boost/pkg: PLIST 
Removed files:
devel/boost/patches: 
 
patch-boost_asio_ssl_old_detail_openssl_context_service_hpp 

Log message:
Update boost to 1.66.0

Main port changes:
- Add myself as second maintainer
- Licence tag from MIT-like to boost

Changelog:

http://www.boost.org/users/history/version_1_66_0.html

ok jca@ and landry@ (Tested in a bulk, thanks!)
"Fine with me" from Brad (maintainer)

Re: dpb(1) and pkgpath(7) file not working

[Bryan Vyhmeister]

On Wed, Jan 31, 2018 at 04:48:25PM -0500, trondd wrote:
> The file can't be in /root.  I think this was explained previously but
> either /root/something looks like a valid individual package or is a valid
> package path.

Sure enough. That was it. I moved pkglist to /tmp and it works fine now.
Thank you!

Bryan

Re: dpb(1) and pkgpath(7) file not working

[trondd]

On Wed, January 31, 2018 2:45 pm, Bryan Vyhmeister wrote:
> I am working on some partial bulk builds with dpb(1) and was intending
> to use a list of packages to build from a file conforming to pkgpath(7).
> My pkglist file always gives an error. I can build ports by listing them
> individually just fine on the command line.
>
> octeon# dpb -B /dest -P ~/pkglist
> Started as: root
> Port user: root
> Build user: _pbuild
> Fetch user: _pfetch
> Log user: _pbuild
> Unpriv user: _dpb
> dpb: Bad package path: /root/pkglist
> Usage: dpb [-acemqrRsuUvx] [-A arch] [-B chroot] [-C plist] [-f m] [-F m]
>[-I pathlist] [-J p] [-j n] [-p parallel] [-P pathlist] [-h hosts]
>[-L logdir] [-l lockdir] [-b log] [-M threshold] [-X pathlist]
>[pathlist ...]
>
> octeon# cat /root/pkglist
> net/curl
> net/wget
> net/fping
>

The file can't be in /root.  I think this was explained previously but
either /root/something looks like a valid individual package or is a valid
package path.

Tim.


> I prepared /dest (a partition) with proot(1) and everything works fine
> by running:
>
> octeon# dpb -B /dest net/curl net/wget net/fping
>
> I also thought that since 'dpb -B' is a chroot setup, perhaps I needed
> my pkglist under the chroot. I copied it to /dest/root/pkglist which
> still shows the same issue.
>
> Is there some bug with reading a pkgpath(7) with dpb or am I making some
> mistake in my invocation?
>
> Bryan
>

Re: UPDATE: graphics/feh 2.20 -> 2.23.1

[Stuart Henderson]

On 2018/01/31 20:54, Klemens Nanni wrote:
> * The Makefile no longer honors CPPFLAGS and instead consistently uses CFLAGS 
> for user-provided include paths

CPPFLAGS would usually be the better place for include paths ...

Re: UPDATE: graphics/feh 2.20 -> 2.23.1

[Klemens Nanni]

On Mon, Jan 29, 2018 at 02:03:53AM +0100, Klemens Nanni wrote:
> Here's an update to the newest release:
> 
> * Fix broken thumbnail/index windows when using --scale-down
> * Use Imlib2 in-memory image cache (default cache size: 4MiB). This allows
>   for significant performance improvements especially in small slideshows
> * Add --cache-size option to set Imlib2 image cache size
> * Fix HTTPS certificate errors on some systems (broken in 2.22)
> * Allow ~/.fehbg to be sourced (instead of executed) from other shell
>   scripts again (broken in 2.22)
> * Add support for CURL_CA_BUNDLE environment variable when loading images
>   via HTTPS
> * Fix ~/.fehbg not being updated when setting a wallpaper via menu
>   (broken in 2.21)
> * Add toggle_fixed_geometry ('g') key binding to toggle window auto-resize
> * Improve control via terminal input
> * Fix crash (segmentation fault) when using feh -O in non-index mode
> * Fix --force-aliasing (and possibly other options) missing from ~/.fehbg
>   when using them for background setting
> 
> The EXIF hunk in patch-config_mk got moved to MAKE_FLAGS.
> 
> System includes needed to be moved before local ones.
> 
> glibc specific CFLAGS had to be removed, there is no object change when
> compiling without `-std=c11' so I left those out completely.
> 
> With my new devel/p5-Test-Command port submitted earlier we can also
> enable headless tests, which all succeed on my amd64 machine except for
> mandoc linting. This is both due to our mandoc(1) not having `-V' and
> actual markup issues in their manpages, see attached test.log.
> 
> Works fine for me on amd64, but I have yet to communicate with upstream
> regarding the patches.
New 2.23.1 release after I got all our patches (except the SUBST bits)
merged upstream:

* The Makefile no longer honors CPPFLAGS and instead consistently uses CFLAGS 
for user-provided include paths
* Fix %u format specifier in multiwindow and list modes (patch by ulteq)
* Minor performance improvements (patches by ulteq)
* Stability improvements when using --magick-timeout (patch by ulteq)

I also took the liberty to squash the SUBST_CMD invocation a bit while
moving it from post- to pre-configure.

Test are ok, upstream checks for `mandoc -V' but would throw lots of
mandoc linter warnings anyway. They're working on it.

test/feh.t . ok
usage: mandoc [-ac] [-I os=name] [-K encoding] [-mdoc | -man] [-O 
options]
  [-T output] [-W level] [file ...]
# mandoc not installed, test skipped. This is NOT fatal.
test/mandoc.t .. ok
All tests successful.
Files=2, Tests=74,  1 wallclock secs ( 0.02 usr  0.05 sys +  0.23 cusr  
0.45 csys =  0.75 CPU)
Result: PASS

Feedback? Any takers?

Index: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile7 Dec 2017 13:12:44 -   1.88
+++ Makefile31 Jan 2018 19:51:38 -
@@ -2,12 +2,12 @@
 
 COMMENT=   lightweight image viewer
 
-DISTNAME=  feh-2.20
+DISTNAME=  feh-2.23.1
 EXTRACT_SUFX=  .tar.bz2
 CATEGORIES=graphics
 FIX_EXTRACT_PERMISSIONS=Yes
 
-HOMEPAGE=  http://feh.finalrewind.org/
+HOMEPAGE=  https://feh.finalrewind.org/
 
 MAINTAINER=David Coppa 
 
@@ -24,21 +24,20 @@ LIB_DEPENDS=graphics/imlib2 \
 
 RUN_DEPENDS+=  devel/desktop-file-utils \
x11/gtk+3,-guic
+TEST_DEPENDS=  devel/p5-Test-Command
 
 CFLAGS+=   -I${LOCALBASE}/include \
-I${X11BASE}/include
 LDFLAGS+=  -L${LOCALBASE}/lib -L${X11BASE}/lib
 MAKE_FLAGS=LDFLAGS="${LDFLAGS}" man_dir="${DESTDIR}${PREFIX}/man" \
-   example_dir="${DESTDIR}${PREFIX}/share/examples/feh"
+   example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
+   exif=1
 FAKE_FLAGS=PREFIX="${PREFIX}"
 
 USE_GMAKE= Yes
 
-NO_TEST=   Yes
-
-post-configure:
+pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
-   ${WRKSRC}/src/events.c ${WRKSRC}/src/keyevents.c \
-   ${WRKSRC}/src/options.c
+   ${WRKSRC}/src/{events,keyevents,options}.c
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo8 Sep 2017 08:19:20 -   1.55
+++ distinfo31 Jan 2018 19:51:38 -
@@ -1,2 +1,2 @@
-SHA256 (feh-2.20.tar.bz2) = S1BDAgmext0JnITdfihcgNwxiXfr2kiUlZM4a8JucAs=
-SIZE (feh-2.20.tar.bz2) = 2129466
+SHA256 (feh-2.23.1.tar.bz2) = m8Fk0IY9QSAb0lOiZS3O5YBqnGqLWRi7i6CfzubX6b4=
+SIZE (feh-2.23.1.tar.bz2) = 2130373
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/feh/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 

dpb(1) and pkgpath(7) file not working

[Bryan Vyhmeister]

I am working on some partial bulk builds with dpb(1) and was intending
to use a list of packages to build from a file conforming to pkgpath(7).
My pkglist file always gives an error. I can build ports by listing them
individually just fine on the command line.

octeon# dpb -B /dest -P ~/pkglist
Started as: root
Port user: root
Build user: _pbuild
Fetch user: _pfetch
Log user: _pbuild
Unpriv user: _dpb
dpb: Bad package path: /root/pkglist
Usage: dpb [-acemqrRsuUvx] [-A arch] [-B chroot] [-C plist] [-f m] [-F m]
   [-I pathlist] [-J p] [-j n] [-p parallel] [-P pathlist] [-h hosts]
   [-L logdir] [-l lockdir] [-b log] [-M threshold] [-X pathlist]
   [pathlist ...]

octeon# cat /root/pkglist
net/curl
net/wget
net/fping

I prepared /dest (a partition) with proot(1) and everything works fine
by running:

octeon# dpb -B /dest net/curl net/wget net/fping

I also thought that since 'dpb -B' is a chroot setup, perhaps I needed
my pkglist under the chroot. I copied it to /dest/root/pkglist which
still shows the same issue.

Is there some bug with reading a pkgpath(7) with dpb or am I making some
mistake in my invocation?

Bryan

Re: [UPDATE] textproc/py-podcastparser for net/gpodder update

[Klemens Nanni]

On Tue, Jan 30, 2018 at 06:37:13PM -0500, trondd wrote:
> Daniel Jakots  wrote:
> 
> > On Thu, 25 Jan 2018 20:06:29 -0500, trondd 
> > wrote:
> > 
> > > +MODPY_VERSION=   ${MODPY_DEFAULT_VERSION_3}
> > 
> > As it's a library and the ports name is py- prefixed, we can easily go
> > with a flavour which is what our policy is :)
> > Any comment?
> 
> Thanks.  That was one of my questions.  This is good, except for
> disambiguating the man page filename.
> 
> Tim.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/py-podcastparser/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  18 Apr 2017 02:13:26 -  1.1.1.1
> +++ Makefile  30 Jan 2018 23:28:59 -
> @@ -2,34 +2,37 @@
>  
>  COMMENT= simple, fast and efficient podcast parser
>  
> -MODPY_EGG_VERSION=   0.6.1
> +MODPY_EGG_VERSION=   0.6.2
>  DISTNAME=podcastparser-${MODPY_EGG_VERSION}
>  PKGNAME= py-${DISTNAME}
>  CATEGORIES=  textproc
>  
> -HOMEPAGE=http://gpodder.org/podcastparser/
> -
>  MAINTAINER=  Tim Meunier 
>  
>  # ISC
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -MASTER_SITES=${HOMEPAGE}
> -
>  MODULES= lang/python
>  
> -BUILD_DEPENDS=   textproc/py-sphinx
> +MODPY_PI=Yes
> +
> +BUILD_DEPENDS=   textproc/py-sphinx${MODPY_FLAVOR}
> +
> +TEST_DEPENDS=devel/py-nose${MODPY_FLAVOR} \
> + devel/py-coverage${MODPY_FLAVOR}
>  
> -TEST_DEPENDS=devel/py-nose \
> - devel/py-coverage
> +FLAVORS= python3
> +FLAVOR?=
>  
>  MAKE_FILE=   makefile
>  MAKE_ENV=PYTHON=${MODPY_BIN}
>  
>  post-build:
> - cd ${WRKSRC}/doc && ${MAKE_ENV} ${MAKE_PROGRAM} man
> + cd ${WRKSRC}/doc && ${MAKE_ENV} ${MAKE_PROGRAM} man \
> + SPHINXBUILD=sphinx-build${MODPY_BIN_SUFFIX}
>  
>  post-install:
> - ${INSTALL_DATA} ${WRKSRC}/doc/_build/man/*.1 ${PREFIX}/man/man1/
> + ${INSTALL_DATA} ${WRKSRC}/doc/_build/man/podcastparser.1 \
> + ${PREFIX}/man/man1/podcastparser${MODPY_BIN_SUFFIX}.1
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/py-podcastparser/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  18 Apr 2017 02:13:26 -  1.1.1.1
> +++ distinfo  30 Jan 2018 23:28:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (podcastparser-0.6.1.tar.gz) = 
> o0eQqUC8WC99Y4jEO2mvchRDK6G9fUANGZxjvS2hPRQ=
> -SIZE (podcastparser-0.6.1.tar.gz) = 18006
> +SHA256 (podcastparser-0.6.2.tar.gz) = 
> i5FSJMAPK/JIETn4C/Nl7SB0KjkH9DdxHJawqGqHiWg=
> +SIZE (podcastparser-0.6.2.tar.gz) = 21871
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/textproc/py-podcastparser/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 18 Apr 2017 02:13:26 -  1.1.1.1
> +++ pkg/PLIST 30 Jan 2018 23:28:59 -
> @@ -1,5 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/18 02:13:26 danj Exp $
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}podcastparser.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/podcastparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
>  lib/python${MODPY_VERSION}/site-packages/podcastparser.py
> -lib/python${MODPY_VERSION}/site-packages/podcastparser.pyc
> -@man man/man1/podcastparser.1
> +@man man/man1/podcastparser${MODPY_BIN_SUFFIX}.1
> 
Please disregard my diff, yours is completely fine.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/01/31 12:14:06

Modified files:
sysutils/parallel: Makefile distinfo 
sysutils/parallel/patches: patch-src_Makefile_in 
sysutils/parallel/pkg: PLIST 

Log message:
Update to parallel-20171222, from Klemens Nanni
ok pascal@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/01/31 10:58:38

Modified files:
devel/libffi   : Makefile 
devel/libffi/patches: patch-configure patch-libffi_pc_in 

Log message:
No need to link against libpthread any more

The pthread_mutex_* functions are now in libc, so revert the workaround.
Bulk build and ok ajacoutot@, ok jasper@ (maintainer)

Re: [UPDATE] net/rsync to 3.1.3

[Bryan Vyhmeister]

On Wed, Jan 31, 2018 at 12:39:42PM -0500, Daniel Jakots wrote:
> cvs rm -f /path/to/patch and then cvs diff ;)

Thanks! That was exactly what I was missing. Updated diff with the
patches removed below.

Bryan


Index: net/rsync/Makefile
===
RCS file: /cvs/ports/net/rsync/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- net/rsync/Makefile  11 Jan 2018 19:27:07 -  1.79
+++ net/rsync/Makefile  31 Jan 2018 17:42:34 -
@@ -2,8 +2,7 @@
 
 COMMENT =  mirroring/synchronization over low bandwidth links
 
-DISTNAME = rsync-3.1.2
-REVISION = 2
+DISTNAME = rsync-3.1.3
 CATEGORIES =   net
 HOMEPAGE = https://rsync.samba.org/
 
Index: net/rsync/distinfo
===
RCS file: /cvs/ports/net/rsync/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- net/rsync/distinfo  10 Jan 2016 21:36:22 -  1.28
+++ net/rsync/distinfo  31 Jan 2018 17:42:34 -
@@ -1,2 +1,2 @@
-SHA256 (rsync-3.1.2.tar.gz) = 7Ppip/o8TBi57M2MFurd7kvTCKdupQtcAqWEDwnAocI=
-SIZE (rsync-3.1.2.tar.gz) = 892724
+SHA256 (rsync-3.1.3.tar.gz) = VcxVTv7F/arXDekhzVpe62wpqVUkxxXzu/hJI1sIAMA=
+SIZE (rsync-3.1.3.tar.gz) = 905908
Index: net/rsync/patches/patch-receiver_c
===
RCS file: net/rsync/patches/patch-receiver_c
diff -N net/rsync/patches/patch-receiver_c
--- net/rsync/patches/patch-receiver_c  19 Dec 2017 19:58:39 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-$OpenBSD: patch-receiver_c,v 1.3 2017/12/19 19:58:39 danj Exp $
-
-Backport from upstream
-3e06d40029cfdce9d0f73d87cfd4edaf54be9c51
-5509597decdbd7b91994210f700329d8a35e70a1
-f5e8a17e093065fb20fea00a29540fe2c7896441
-
-Index: receiver.c
 receiver.c.orig
-+++ receiver.c
-@@ -583,6 +583,12 @@ int recv_files(int f_in, int f_out, char *local_name)
-   if (DEBUG_GTE(RECV, 1))
-   rprintf(FINFO, "recv_files(%s)\n", fname);
- 
-+  if (daemon_filter_list.head && (*fname != '.' || fname[1] != 
'\0')
-+   && check_filter(_filter_list, FLOG, fname, 0) < 0) {
-+  rprintf(FERROR, "attempt to hack rsync failed.\n");
-+  exit_cleanup(RERR_PROTOCOL);
-+  }
-+
- #ifdef SUPPORT_XATTRS
-   if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
-&& !(want_xattr_optim && BITS_SET(iflags, 
ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
-@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char *local_name)
- 
-   cleanup_got_literal = 0;
- 
--  if (daemon_filter_list.head
--  && check_filter(_filter_list, FLOG, fname, 0) < 0) {
--  rprintf(FERROR, "attempt to hack rsync failed.\n");
--  exit_cleanup(RERR_PROTOCOL);
--  }
--
-   if (read_batch) {
-   int wanted = redoing
-  ? we_want_redo(ndx)
-@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char *local_name)
-   break;
-   }
-   if (!fnamecmp || (daemon_filter_list.head
--&& check_filter(_filter_list, FLOG, fname, 0) 
< 0)) {
-+&& check_filter(_filter_list, FLOG, fnamecmp, 
0) < 0)) {
-   fnamecmp = fname;
-   fnamecmp_type = FNAMECMP_FNAME;
-   }
Index: net/rsync/patches/patch-rsync_c
===
RCS file: net/rsync/patches/patch-rsync_c
diff -N net/rsync/patches/patch-rsync_c
--- net/rsync/patches/patch-rsync_c 19 Dec 2017 19:58:39 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-rsync_c,v 1.2 2017/12/19 19:58:39 danj Exp $
-
-Backport from upstream
-70aeb5fddd1b2f8e143276f8d5a085db16c593b9
-
-Index: rsync.c
 rsync.c.orig
-+++ rsync.c
-@@ -49,6 +49,7 @@ extern int flist_eof;
- extern int file_old_total;
- extern int keep_dirlinks;
- extern int make_backups;
-+extern int sanitize_paths;
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
- extern struct chmod_mode_struct *daemon_chmod_modes;
- #ifdef ICONV_OPTION
-@@ -396,6 +397,11 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag
-   if (iflags & ITEM_XNAME_FOLLOWS) {
-   if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
-   exit_cleanup(RERR_PROTOCOL);
-+
-+  if (sanitize_paths) {
-+  sanitize_path(buf, buf, "", 0, SP_DEFAULT);
-+  len = strlen(buf);
-+  }
-   } else {
-   *buf = '\0';
-   len = -1;
Index: net/rsync/patches/patch-xattrs_c

Re: [UPDATE] net/rsync to 3.1.3

[Daniel Jakots]

On Wed, 31 Jan 2018 09:28:43 -0800, Bryan Vyhmeister
 wrote:

> Patches to remove:

cvs rm -f /path/to/patch and then cvs diff ;)

[UPDATE] net/rsync to 3.1.3

[Bryan Vyhmeister]

This is an update to rsync 3.1.3. This releases merges in some of our
patches that we backported including:

patch-receiver_c
patch-rsync_c
patch-xattrs_c

These patches at reflected fixes for security advisories CVE-2017-15994
and CVE-2017-17433.

Running 'make test' results in:

- overall results:
  30 passed
  9 skipped

I tested this update on amd64 and octeon and everything seems to work
fine from my tests.

I am not sure how to remove the patches in a diff if someone could point
out how to accomplish that (I couldn't figure it out in my searches).
Also, CC maintainer.

Bryan


Patches to remove:

net/rsync/patches/patch-receiver_c
net/rsync/patches/patch-rsync_c
net/rsync/patches/patch-xattrs_c


Index: net/rsync/Makefile
===
RCS file: /cvs/ports/net/rsync/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- net/rsync/Makefile  11 Jan 2018 19:27:07 -  1.79
+++ net/rsync/Makefile  31 Jan 2018 17:03:39 -
@@ -2,8 +2,7 @@
 
 COMMENT =  mirroring/synchronization over low bandwidth links
 
-DISTNAME = rsync-3.1.2
-REVISION = 2
+DISTNAME = rsync-3.1.3
 CATEGORIES =   net
 HOMEPAGE = https://rsync.samba.org/
 
Index: net/rsync/distinfo
===
RCS file: /cvs/ports/net/rsync/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- net/rsync/distinfo  10 Jan 2016 21:36:22 -  1.28
+++ net/rsync/distinfo  31 Jan 2018 17:03:39 -
@@ -1,2 +1,2 @@
-SHA256 (rsync-3.1.2.tar.gz) = 7Ppip/o8TBi57M2MFurd7kvTCKdupQtcAqWEDwnAocI=
-SIZE (rsync-3.1.2.tar.gz) = 892724
+SHA256 (rsync-3.1.3.tar.gz) = VcxVTv7F/arXDekhzVpe62wpqVUkxxXzu/hJI1sIAMA=
+SIZE (rsync-3.1.3.tar.gz) = 905908

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/31 10:10:47

Modified files:
security/easy-rsa: Makefile distinfo 
security/easy-rsa/patches: patch-easyrsa 
security/easy-rsa/pkg: PLIST 

Log message:
update to easy-rsa 3.0.4, from Björn Ketelaars

Re: [New] DiffUtilTcl

[Stuart Cassoff]

Reattached.
OK?

> -- Original Message --
> From: Stuart Cassoff <3...@bell.net>
> Date: January 15, 2018 at 11:48 AM
> 
> 
> OK?
> 
> > -- Original Message --
> > From: Stuart Cassoff <3...@bell.net>
> > Date: December 24, 2017 at 11:46 PM
> > 
> > 
> > OK?
> > 
> > > -- Original Message --
> > > From: Stuart Cassoff <3...@bell.net>
> > > Date: December 9, 2017 at 11:27 AM
> > > 
> > > 
> > > Comment:
> > > diff functions for Tcl
> > > 
> > > Description:
> > > A Tcl extension that provides utilities for comparisons of strings, lists 
> > > and files.
> > > 
> > > The base comparison is a Longest Common Substring algorithm based on
> > > J. W. Hunt and M. D. McIlroy, "An algorithm for differential file 
> > > comparison,"
> > > Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
> > > Available on the Web at the second author's personal site:
> > > http://www.cs.dartmouth.edu/~doug/
> > > 
> > > It is basically an LCS diff algorithm implemented in C on top of Tcl's 
> > > API,
> > > thus giving full Unicode and VFS support.
> > > 
> > > 
> > > OK?
> >

diffutiltcl-0.4.0-port.tar.gz
Description: application/gzip

Re: UPDATE: textproc/py-markdown 2.6.9 -> 2.6.11

[Klemens Nanni]

On Mon, Jan 22, 2018 at 02:14:20AM +0100, Klemens Nanni wrote:
> Simple update, tests pass for py2 and py3 on amd64.
> 
> I included the NOOP diff for PFRAG.no-python3 as done by `update-plist'
> so further runs won't change it.
> 
> Feedback?
> 
> diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
> index 96dc570c7d0..a4b4cadaf4e 100644
> --- a/textproc/py-markdown/Makefile
> +++ b/textproc/py-markdown/Makefile
> @@ -2,7 +2,7 @@
>  
>  COMMENT= text-to-HTML conversion tool
>  
> -MODPY_EGG_VERSION=   2.6.9
> +MODPY_EGG_VERSION=   2.6.11
>  DISTNAME=Markdown-${MODPY_EGG_VERSION}
>  PKGNAME= py-markdown-${MODPY_EGG_VERSION}
>  CATEGORIES=  textproc
> @@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=   Yes
>  
>  MODULES= lang/python
>  MODPY_PI=Yes
> +MODPY_SETUPTOOLS=Yes
>  
>  FLAVORS= python3
>  FLAVOR?=
> diff --git a/textproc/py-markdown/distinfo b/textproc/py-markdown/distinfo
> index 8d5fa55b6b9..4ed3133c0a2 100644
> --- a/textproc/py-markdown/distinfo
> +++ b/textproc/py-markdown/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (Markdown-2.6.9.tar.gz) = c695cji5V2izqbb+YnDiUOXAnZiLjlsiP9XvpOBvr4E=
> -SIZE (Markdown-2.6.9.tar.gz) = 271564
> +SHA256 (Markdown-2.6.11.tar.gz) = 
> qFaGnH/wea2Eo+Gc2HpkmYNQwrlOngjkQnD67zNAD4E=
> +SIZE (Markdown-2.6.11.tar.gz) = 274132
> diff --git a/textproc/py-markdown/pkg/PFRAG.no-python3 
> b/textproc/py-markdown/pkg/PFRAG.no-python3
> index bb99a9348db..25ef9ae0134 100644
> --- a/textproc/py-markdown/pkg/PFRAG.no-python3
> +++ b/textproc/py-markdown/pkg/PFRAG.no-python3
> @@ -1,3 +1,3 @@
>  @comment $OpenBSD: PFRAG.no-python3,v 1.1.1.1 2017/02/10 21:42:33 danj Exp $
> -@pkgpath textproc/markdown
>  @conflict markdown-*
> +@pkgpath textproc/markdown
> diff --git a/textproc/py-markdown/pkg/PLIST b/textproc/py-markdown/pkg/PLIST
> index cfe7537594d..a5db307758b 100644
> --- a/textproc/py-markdown/pkg/PLIST
> +++ b/textproc/py-markdown/pkg/PLIST
> @@ -1,7 +1,12 @@
>  @comment $OpenBSD: PLIST,v 1.3 2017/02/10 22:25:20 danj Exp $
>  !%%python3%%
>  bin/markdown_py${MODPY_BIN_SUFFIX}
> -lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
> +lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> +lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/markdown/
>  lib/python${MODPY_VERSION}/site-packages/markdown/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/markdown/__main__.py
> 
Bump, haven't heard a word from MAINTAINER so far.

Re: UPDATE: sysutils/parallel 20170222 -> 20171222

[Klemens Nanni]

On Thu, Jan 25, 2018 at 03:08:37PM +0100, Klemens Nanni wrote:
> On Wed, Jan 17, 2018 at 05:00:35PM +0100, Klemens Nanni wrote:
> > Simple update including:
> > 
> > * env_parset for ash, dash, ksh, sh, zsh
> > * Automatically create hostgroups if argument ends in @sshlogin
> > * Initial support for XDG Base Directory $XDG_* environment variables.
> > * Use '--limit myprog' to make a dynamic job limit. Just return 0 to
> >   spawn another job, 1 to not spawn another job, and 2 to kill the
> >   youngest job.
> > * PARALLEL_RSYNC_OPTS and --rsync-opts sets the options for rsync
> >  (Default: -rlDzR).
> > * --line-buffer no longer uses tempfiles. This is faster and makes it
> >   possible for a single process to output more data than there is free
> >   disk space.
> > * The command line can now contain \257 (Macron) or UTF characters
> >   containing \257.
> > * --timeout can now use s=second,m=minute,h=hour,d=day.
> > * --dr is now an alias for --dry-run.
> > * --halt supports done in addition to success and fail.
> > * parset will set variables in parallel in Bash.
> > * --rpl can now take arguments by adding '(regexp)' in the replacement
> >   string.
> > * Bug fixes and man page updates.
> > 
> > Works fine for me on amd64.
> > 
> > Feedback? Anyone willing to commit this?
> I got an OK from pascal@ today, anyone else?
> 
Bump.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/31 08:14:47

Modified files:
print/cups-filters: Makefile distinfo 

Log message:
Update to cups-filters-1.20.0.

Re: [UPDATE] textproc/py-podcastparser for net/gpodder update

[Klemens Nanni]

On Tue, Jan 30, 2018 at 06:37:13PM -0500, trondd wrote:
> Daniel Jakots  wrote:
> 
> > On Thu, 25 Jan 2018 20:06:29 -0500, trondd 
> > wrote:
> > 
> > > +MODPY_VERSION=   ${MODPY_DEFAULT_VERSION_3}
> > 
> > As it's a library and the ports name is py- prefixed, we can easily go
> > with a flavour which is what our policy is :)
> > Any comment?
> 
> Thanks.  That was one of my questions.  This is good, except for
> disambiguating the man page filename.
> 
> Tim.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/py-podcastparser/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  18 Apr 2017 02:13:26 -  1.1.1.1
> +++ Makefile  30 Jan 2018 23:28:59 -
> @@ -2,34 +2,37 @@
>  
>  COMMENT= simple, fast and efficient podcast parser
>  
> -MODPY_EGG_VERSION=   0.6.1
> +MODPY_EGG_VERSION=   0.6.2
>  DISTNAME=podcastparser-${MODPY_EGG_VERSION}
>  PKGNAME= py-${DISTNAME}
>  CATEGORIES=  textproc
>  
> -HOMEPAGE=http://gpodder.org/podcastparser/
> -
>  MAINTAINER=  Tim Meunier 
>  
>  # ISC
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -MASTER_SITES=${HOMEPAGE}
> -
>  MODULES= lang/python
>  
> -BUILD_DEPENDS=   textproc/py-sphinx
> +MODPY_PI=Yes
> +
> +BUILD_DEPENDS=   textproc/py-sphinx${MODPY_FLAVOR}
> +
> +TEST_DEPENDS=devel/py-nose${MODPY_FLAVOR} \
> + devel/py-coverage${MODPY_FLAVOR}
>  
> -TEST_DEPENDS=devel/py-nose \
> - devel/py-coverage
> +FLAVORS= python3
> +FLAVOR?=
>  
>  MAKE_FILE=   makefile
>  MAKE_ENV=PYTHON=${MODPY_BIN}
>  
>  post-build:
> - cd ${WRKSRC}/doc && ${MAKE_ENV} ${MAKE_PROGRAM} man
> + cd ${WRKSRC}/doc && ${MAKE_ENV} ${MAKE_PROGRAM} man \
> + SPHINXBUILD=sphinx-build${MODPY_BIN_SUFFIX}
>  
>  post-install:
> - ${INSTALL_DATA} ${WRKSRC}/doc/_build/man/*.1 ${PREFIX}/man/man1/
> + ${INSTALL_DATA} ${WRKSRC}/doc/_build/man/podcastparser.1 \
> + ${PREFIX}/man/man1/podcastparser${MODPY_BIN_SUFFIX}.1
This can be simplified using ALL_TARGET, see below an updated diff for
Makefile only as I haven't tested all of it yet.

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-podcastparser/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile18 Apr 2017 02:13:26 -  1.1.1.1
+++ Makefile31 Jan 2018 15:05:15 -
@@ -2,34 +2,35 @@
 
 COMMENT=   simple, fast and efficient podcast parser
 
-MODPY_EGG_VERSION= 0.6.1
+MODPY_EGG_VERSION= 0.6.2
 DISTNAME=  podcastparser-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=textproc
 
-HOMEPAGE=  http://gpodder.org/podcastparser/
-
 MAINTAINER=Tim Meunier 
 
 # ISC
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=  ${HOMEPAGE}
-
 MODULES=   lang/python
 
-BUILD_DEPENDS= textproc/py-sphinx
+MODPY_PI=  Yes
+
+BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR}
+
+TEST_DEPENDS=  devel/py-nose${MODPY_FLAVOR} \
+   devel/py-coverage${MODPY_FLAVOR}
 
-TEST_DEPENDS=  devel/py-nose \
-   devel/py-coverage
+FLAVORS=   python3
+FLAVOR?=
 
 MAKE_FILE= makefile
-MAKE_ENV=  PYTHON=${MODPY_BIN}
+MAKE_ENV=  PYTHON=${MODPY_BIN} \
+   SPHINXBUILD=sphinx-build${MODPY_BIN_SUFFIX}
 
-post-build:
-   cd ${WRKSRC}/doc && ${MAKE_ENV} ${MAKE_PROGRAM} man
+ALL_TARGET=all man
 
 post-install:
-   ${INSTALL_DATA} ${WRKSRC}/doc/_build/man/*.1 ${PREFIX}/man/man1/
+   mv ${PREFIX}/man/man1/podcastparser{,${MODPY_BIN_SUFFIX}}.1
 
 .include 

Re: [UPDATE] net/gpodder -> 3.10.0 depends on textproc/py-podcastparser net/mygpoclient

[Klemens Nanni]

On Tue, Jan 30, 2018 at 10:46:36PM -0500, trondd wrote:
> "trondd"  wrote:
> 
> > On Fri, January 12, 2018 6:17 pm, trondd wrote:
> > > Update gPodder to their new python3/GTK+3 version.  Depends on the python3
> > > version of textproc/py-podcastparser and net/mygpoclient.
> > >
> > > My only question on this one, do I need to run compileall.py like
> > > portcheck
> > > says?  I think it was mentioned ot me that it isn't always necessary.  It
> > > would be for the extensions, most of which I can't use and I haven't seen
> > > issues running the ones I did try.
> > >
> > > There is also optional support for ID3 tag management that depends on
> > > py-eyed3 which needs updating.  I'll tackle that next and enable it in
> > > gPodder as a seperate update.
> > >
> > > Tim.
> > >
> > 
> > Bump the real one.
> > 
> > Tim.
> 
> Updated to account for flavored textproxy/py-podcastparser
Looks good port-wise except for two things:

patch-makefile can be dropped in favor of FAKE_FLAGS.

See one PLIST fix inline, updated diff below.

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/gpodder/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile  13 Jun 2017 07:43:56 -  1.12
> +++ Makefile  31 Jan 2018 03:40:09 -
> @@ -2,11 +2,11 @@
>  
>  COMMENT= media aggregator and podcast client
>  
> -MODPY_EGG_VERSION=   3.9.3
> +MODPY_EGG_VERSION=   3.10.0
>  DISTNAME=gpodder-${MODPY_EGG_VERSION}
>  CATEGORIES=  net www
>  
> -HOMEPAGE=http://gpodder.org/
> +HOMEPAGE=https://gpodder.github.io/
>  
>  MAINTAINER=  Tim Meunier 
>  
> @@ -15,26 +15,31 @@ PERMIT_PACKAGE_CDROM= Yes
>  
>  GH_ACCOUNT=  gpodder
>  GH_PROJECT=  gpodder
> -GH_TAGNAME=  ${DISTNAME}
> +GH_TAGNAME=  ${MODPY_EGG_VERSION}
>  
>  MODULES= lang/python \
>   textproc/intltool
>  
> +MODPY_VERSION=   ${MODPY_DEFAULT_VERSION_3}
> +
>  RUN_DEPENDS= devel/desktop-file-utils \
>   devel/gettext \
> + devel/py-html5lib${MODPY_FLAVOR} \
> + devel/py-gobject3${MODPY_FLAVOR} \
>   net/mygpoclient \
> - textproc/py-podcastparser \
> - x11/dbus-python \
> - x11/gtk+3,-guic \
> - x11/py-gtk2
> -TEST_DEPENDS=devel/py-minimock \
> - devel/py-coverage \
> + textproc/py-podcastparser${MODPY_FLAVOR} \
> + www/webkitgtk4 \
> + x11/dbus-python${MODPY_FLAVOR} \
> + x11/gtk+3,-guic
> +TEST_DEPENDS=devel/py-minimock${MODPY_FLAVOR} \
> + devel/py-coverage${MODPY_FLAVOR} \
>   net/mygpoclient \
> - textproc/py-feedparser
> + textproc/py-podcastparser
>  
>  USE_GMAKE=   Yes
>  MAKE_FILE=   makefile
> -MAKE_ENV=PYTHON=${MODPY_BIN} \
> +MAKE_ENV=LC_CTYPE=en_US.UTF-8 \
> + PYTHON=${MODPY_BIN} \
>   GPODDER_MANPATH_NO_SHARE="yes"
>  ALL_TARGET=  messages
>  
> @@ -43,8 +48,5 @@ TEST_TARGET=unittest
>  do-install:
>   cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
>   -f ${MAKE_FILE} install
> -
> -post-install:
> - ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py 
> ${PREFIX}/share/gpodder/extensions/
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/gpodder/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo  18 Apr 2017 09:09:25 -  1.4
> +++ distinfo  31 Jan 2018 03:40:09 -
> @@ -1,2 +1,2 @@
> -SHA256 (gpodder-3.9.3.tar.gz) = LLgOxTKuOSnxPM+UY/+6mpwMfsi3I6va40umQRMYNcA=
> -SIZE (gpodder-3.9.3.tar.gz) = 1008774
> +SHA256 (gpodder-3.10.0.tar.gz) = xc8MHlMN7ctOZS0jUKB9UVwVXzTGx20OmMkY+AQrr1Q=
> +SIZE (gpodder-3.10.0.tar.gz) = 881761
> Index: patches/patch-makefile
> ===
> RCS file: /cvs/ports/net/gpodder/patches/patch-makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-makefile
> --- patches/patch-makefile23 Oct 2016 01:59:16 -  1.2
> +++ patches/patch-makefile31 Jan 2018 03:40:09 -
> @@ -1,6 +1,7 @@
>  $OpenBSD: patch-makefile,v 1.2 2016/10/23 01:59:16 czarkoff Exp $
>  makefile.origWed Aug 31 15:10:41 2016
> -+++ makefile Fri Sep 16 21:26:10 2016
> +Index: makefile
> +--- makefile.orig
>  makefile
>  @@ -82,7 +82,7 @@ $(GPODDER_SERVICE_FILE): $(GPODDER_SERVICE_FILE_IN)
>   intltool-extract --quiet --type=gettext/ini $<
>   
> @@ -8,5 +9,5 @@ $OpenBSD: patch-makefile,v 

security/easy-rsa

[Björn Ketelaars]

Diff below brings security/easy-rsa to 3.0.4.

Lightly tested by initialising a pki and generating some certs.

Comments?

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


diff --git Makefile Makefile
index 72cda61c371..db2a3a76079 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  small RSA key management package
 
-V =3.0.3
+V =3.0.4
 PKGNAME =  easy-rsa-$V
 DISTNAME = EasyRSA-$V
 EXTRACT_SUFX = .tgz
diff --git distinfo distinfo
index ed1a32d7ef9..d551ee2e959 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (EasyRSA-3.0.3.tgz) = +yOdZ/S9CfgXsAJUUNQi7Xrj7pOvc3xX1KzY/bZGB54=
-SIZE (EasyRSA-3.0.3.tgz) = 40960
+SHA256 (EasyRSA-3.0.4.tgz) = RyFn+XbGy3yGDOxhUKVhbhY64gNlyB8XmBHW7gd57Fo=
+SIZE (EasyRSA-3.0.4.tgz) = 37721
diff --git patches/patch-easyrsa patches/patch-easyrsa
index a6903bcef34..801861037b3 100644
--- patches/patch-easyrsa
+++ patches/patch-easyrsa
@@ -10,7 +10,7 @@ OpenSSL from ports instead.
 Index: easyrsa
 --- easyrsa.orig
 +++ easyrsa
-@@ -1042,7 +1042,7 @@ Note: using Easy-RSA configuration from: $vars"
+@@ -1061,7 +1061,7 @@ Note: using Easy-RSA configuration from: $vars"

# Set defaults, preferring existing env-vars if present
set_var EASYRSA "${0%/*}"
diff --git pkg/PLIST pkg/PLIST
index 92f6816e282..314ababc49d 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,6 +3,7 @@
 share/easy-rsa/
 share/easy-rsa/COPYING.md
 share/easy-rsa/ChangeLog
+share/easy-rsa/README.md
 share/easy-rsa/README.quickstart.md
 share/easy-rsa/doc/
 share/easy-rsa/doc/EasyRSA-Advanced.md
@@ -12,11 +13,12 @@ share/easy-rsa/doc/Hacking.md
 share/easy-rsa/doc/Intro-To-PKI.md
 share/easy-rsa/easyrsa
 share/easy-rsa/gpl-2.0.txt
-share/easy-rsa/openssl-1.0.cnf
+share/easy-rsa/mktemp.txt
+share/easy-rsa/openssl-easyrsa.cnf
 share/easy-rsa/vars.example
 share/easy-rsa/x509-types/
 share/easy-rsa/x509-types/COMMON
 share/easy-rsa/x509-types/ca
 share/easy-rsa/x509-types/client
-share/easy-rsa/x509-types/san
+share/easy-rsa/x509-types/code-signing
 share/easy-rsa/x509-types/server

UPDATE net/wget

[Björn Ketelaars]

Diff below brings net/wget to the latest version, which addresses:

  - A major bug that caused GZip'ed pages to never be decompressed has
been fixed
  - Support for Content-Encoding and Transfer-Encoding have been marked
as experimental and disabled by default
  - Prevent erroneous decompression of .gz and .tgz files with broken
server
  - Added support for HTTP 308 Permanent Redirect response
  - Fix a segfault in some cases where the Content-Type header is not
sent
  - Several minor bug fixes

Output make test:

# TOTAL: 93
# PASS:  84
# SKIP:  9
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
...
# TOTAL: 44
# PASS:  44
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


diff --git Makefile Makefile
index b153454d731..fb757e361ab 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.19.2
+DISTNAME = wget-1.19.4
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
diff --git distinfo distinfo
index 1739246e01f..3d027dcc684 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (wget-1.19.2.tar.gz) = T0pnO21GbvpQ+/unlr2EpGriTjcPpWLt5bIatTwRqSA=
-SIZE (wget-1.19.2.tar.gz) = 4349267
+SHA256 (wget-1.19.4.tar.gz) = k/uWsPSKIP9b4NnZ08SphrRpy4UxMfnV/kzJzsvItbU=
+SIZE (wget-1.19.4.tar.gz) = 4310657
diff --git patches/patch-doc_wget_texi patches/patch-doc_wget_texi
index 39ebc7e1a0e..4c35d92c6c4 100644
--- patches/patch-doc_wget_texi
+++ patches/patch-doc_wget_texi
@@ -2,7 +2,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.13 2017/10/31 18:00:32 
rsadowski Exp $
 Index: doc/wget.texi
 --- doc/wget.texi.orig
 +++ doc/wget.texi
-@@ -191,7 +191,7 @@ gauge can be customized to your preferences.
+@@ -190,7 +190,7 @@ gauge can be customized to your preferences.
  Most of the features are fully configurable, either through command line
  options, or via the initialization file @file{.wgetrc} (@pxref{Startup
  File}).  Wget allows you to define @dfn{global} startup files
@@ -11,7 +11,7 @@ Index: doc/wget.texi
  specify the location of a startup file with the --config option.
  To disable the reading of config files, use --no-config.
  If both --config and --no-config are given, --no-config is ignored.
-@@ -200,7 +200,7 @@ If both --config and --no-config are given, --no-confi
+@@ -199,7 +199,7 @@ If both --config and --no-config are given, --no-confi
  @ignore
  @c man begin FILES
  @table @samp
@@ -20,7 +20,7 @@ Index: doc/wget.texi
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -3143,9 +3143,8 @@ commands.
+@@ -3145,9 +3145,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
-@@ -3155,7 +3154,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3157,7 +3156,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: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

On 2018/01/31 05:04, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2018/01/31 05:04:20
> 
> Modified files:
>   net/sslh   : Makefile distinfo 
>   net/sslh/patches: patch-Makefile 
> 
> Log message:
> update to sslh-1.19b, fixing an IPv6 parse bug.
> from Björn Ketelaars (maintainer)
> 

+ comments from Klemens Nanni

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/31 05:04:20

Modified files:
net/sslh   : Makefile distinfo 
net/sslh/patches: patch-Makefile 

Log message:
update to sslh-1.19b, fixing an IPv6 parse bug.
from Björn Ketelaars (maintainer)

Re: UPDATE net/sslh

[Klemens Nanni]

On Wed, Jan 31, 2018 at 11:01:20AM +0100, Björn Ketelaars wrote:
> On Wed 31/01/2018 09:54, Klemens Nanni wrote:
> > On Wed, Jan 31, 2018 at 06:34:19AM +0100, Björn Ketelaars wrote:
> > > A new version of sslh is available that fixes an IPv6 parse bug.
> > Which bug? Does it work for you now?
> 
> The new release has been announced on the sslh mailinglist [0], and
> tries to explain why it has been released. The fix for the mentioned bug
> is on github [1].
> 
> The reason that I didn't notice the issue with IPv6 before is because
> I'm not using sslh in combination with it. However, before sending the
> diff to ports@ I did some testing:
> 
>   - v1.19
> 
> $ doas sslh-fork -vf --listen [::1]:443 --ssh [::1]:22
> sslh-fork(94193) in free(): modified chunk-pointer 0xefd21aeeb81
> Abort trap (core dumped)
> 
>   - v1.19b
> 
> $ doas sslh-fork -vf --listen [::1]:443 --ssh [::1]:22
> ssh addr: localhost:ssh. libwrap service: sshd log_level: 1 family 24 24 [] 
> [fork]
> listening on:
> localhost:443  []
> timeout: 2
> on-timeout: ssh
> listening to 1 addresses
> sslh-fork v1.19b started
> 
> A telnet session to ::1 443 showed:
> 
> accepted fd 4
> timed out, connect to ssh
> connecting to localhost:ssh family 24 len 28
> ssh:connection from localhost:40131 to localhost:443 forwarded from 
> localhost:34533 to localhost:ssh
> flushing deferred data to fd 3
> 
> Answer to you second question: IPv6 now works.
> 
> Does the above answer your questions?
Yes, quite well so. Thanks!

> [0] http://rutschle.net/pipermail/sslh/2018-January/000661.html
> [1] 
> https://github.com/yrutschle/sslh/commit/1a6ba5edc0b4482182ec6603433435ff091f66b6
> 
> > > Upstream has decided to remove the v1.19 tarball to avoid encouraging
> > > use of a bad version, and has released v1.19b.
> > They also changed their homepage, see the redirection.
> 
> I did not notice that. Thank you!  New diff below.
> 
> 
> diff --git Makefile Makefile
> index 84caa75c02f..20427bdce13 100644
> --- Makefile
> +++ Makefile
> @@ -2,11 +2,11 @@
>  
>  COMMENT =SSL/SSH multiplexer
>  
> -DISTNAME =   sslh-v1.19
> +DISTNAME =   sslh-v1.19b
>  PKGNAME =${DISTNAME:S/-v/-/}
>  CATEGORIES = security net
>  
> -HOMEPAGE =   https://www.rutschle.net/tech/sslh.shtml
> +HOMEPAGE =   https://www.rutschle.net/tech/sslh/README.html
>  
>  MAINTAINER = Bjorn Ketelaars 
>  
> diff --git distinfo distinfo
> index e4dae567aea..40073b4 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (sslh-v1.19.tar.gz) = 75yxg5baQEu3BbLEzUViql/rVU3m+b0HSyTnrEcTZpw=
> -SIZE (sslh-v1.19.tar.gz) = 57352
> +SHA256 (sslh-v1.19b.tar.gz) = EN/E3v+8qUw+91NdP3GyE6vHjVPtHpAIc9PKHMlDZZw=
> +SIZE (sslh-v1.19b.tar.gz) = 57369
> diff --git patches/patch-Makefile patches/patch-Makefile
> index 977a2e2329d..91dee1b9e7b 100644
> --- patches/patch-Makefile
> +++ patches/patch-Makefile
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.6 2018/01/28 16:31:48 sthen Exp $
>  Index: Makefile
>  --- Makefile.orig
>  +++ Makefile
> -@@ -87,7 +83,7 @@ echosrv: version.h $(OBJS) echosrv.o
> +@@ -87,7 +87,7 @@ echosrv: version.h $(OBJS) echosrv.o
>   $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o 
> $(LIBS)
>   
>   $(MAN): sslh.pod Makefile
Looks good to me.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/31 02:52:29

Modified files:
security/libhttpseverywhere: Makefile distinfo 
security/libhttpseverywhere/pkg: PLIST 

Log message:
Update to libhttpseverywhere-0.8.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/31 02:20:26

Modified files:
graphics/py-cairo: Makefile distinfo 

Log message:
Update to py-cairo-1.15.6.

Re: UPDATE net/sslh

[Klemens Nanni]

On Wed, Jan 31, 2018 at 06:34:19AM +0100, Björn Ketelaars wrote:
> A new version of sslh is available that fixes an IPv6 parse bug.
Which bug? Does it work for you now?

> Upstream has decided to remove the v1.19 tarball to avoid encouraging
> use of a bad version, and has released v1.19b.
They also changed their homepage, see the redirection.

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/31 01:51:40

Added files:
games/pokerth/patches: patch-src_net_common_clientthread_cpp 

Log message:
Missing patch in the last update to 1.1.2

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/31 01:36:22

Modified files:
devel/harfbuzz : Makefile distinfo 

Log message:
Update to harfbuzz-1.7.5.

graphics/zint: [patch] EAN and UPC symbols resizable in glabels

[Sebastien Marie]

Hi,

Since the upgrade from zint 2.4.3 to 2.6.2, I had problems in glabels
when using Zint backend: EAN and UPC barcodes aren't resizable
anymore.

I looked to the issue with upstream and a fix has been commited in zint
tree: 
https://github.com/woo-j/zint/commit/3aeb1ea70a5f5b7c9a235ee29bdd708663f4d1f6

Discussion with upstream is on zint-barcode mailing-list at
https://sourceforge.net/p/zint/mailman/message/36208925/

As the fix isn't present in any zint release for now, I would like to
backport it in 2.6.2, in order to restore the functionality inside
glabels in ports.

The following diff do that. Is it acceptable ?

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/graphics/zint/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile10 Jan 2018 15:12:08 -  1.12
+++ Makefile31 Jan 2018 08:27:47 -
@@ -7,6 +7,7 @@ V = 2.6.2
 DISTNAME = zint-${V}.src
 PKGNAME-main = zint-${V}
 PKGNAME-x11 =  zint-gui-${V}
+REVISION = 0
 
 SHARED_LIBS += QZint   1.0 # 2.6
 SHARED_LIBS += zint1.0 # 2.6
Index: patches/patch-backend_render_c
===
RCS file: patches/patch-backend_render_c
diff -N patches/patch-backend_render_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_render_c  31 Jan 2018 08:27:47 -
@@ -0,0 +1,47 @@
+$OpenBSD$
+Make EAN and UPC symbols resizable in glabels in accordance with EN 797:1996
+https://github.com/woo-j/zint/commit/3aeb1ea70a5f5b7c9a235ee29bdd708663f4d1f6
+Index: backend/render.c
+--- backend/render.c.orig
 backend/render.c
+@@ -267,27 +267,34 @@ int render_plot(struct zint_symbol *symbol, float widt
+ /* The X-dimension of UPC/EAN symbols is fixed at 0.330mm */
+ /* The phrase before is questionable. It may scale in certain 
percentages (80% - 200%).
+see https://internationalbarcodes.com/ean-13-specifications/ */
++// Can now cope with sizes between 80% and 200%, enforces correct 
aspect ratio
+ /* NOTE: This code will need adjustment before it correctly deals 
with composite symbols */
+-x_dimension = 0.330;
+-width = 0.330 * GL_CONST * total_area_width_x;
+-/* The height is also fixed */
++//x_dimension = 0.330;
++if (x_dimension < 0.26) {
++x_dimension = 0.26;
++}
++if (x_dimension > 0.66) {
++x_dimension = 0.66;
++}
++width = x_dimension * GL_CONST * total_area_width_x;
++
+ switch (upceanflag) {
+ case 6:
+ case 12:
+ case 13:
+ /* UPC-A, UPC-E and EAN-13 */
+ /* Height of bars should be 22.85mm */
+-height = ((0.330 * ((2 * symbol->border_width) + text_offset 
+ text_height)) + 22.85) * GL_CONST;
++height = ((x_dimension * ((2 * symbol->border_width) + 
text_offset + text_height)) + (22.85 * (x_dimension / 0.33))) * GL_CONST;
+ break;
+ case 8:
+ /* EAN-8 */
+ /* Height of bars should be 18.23mm */
+-height = ((0.330 * ((2 * symbol->border_width) + text_offset 
+ text_height)) + 18.23) * GL_CONST;
++height = ((x_dimension * ((2 * symbol->border_width) + 
text_offset + text_height)) + (18.23 * (x_dimension / 0.33))) * GL_CONST;
+ break;
+ default:
+ /* EAN-2 and EAN-5 */
+ /* Height of bars should be 21.10mm */
+-height = ((0.330 * ((2 * symbol->border_width) + text_offset 
+ text_height)) + 21.10) * GL_CONST;
++height = ((x_dimension * ((2 * symbol->border_width) + 
text_offset + text_height)) + (21.10 * (x_dimension / 0.33))) * GL_CONST;
+ }
+ }
+ 

WIP: Suricata-4.0.3

[Gonzalo L. Rodriguez]

Hallo,

Here is again, a new WIP for Suricata 4.0.3, a little bit pulished 
than the last one and updated.

Feedbacks are welcome :)

Cheers.-

-- 
Sending from my toaster.


suricata-4.0.3.tgz
Description: application/tar-gz