Re: Help update port 'mail/mlmmj' to the latest 1.3.0
> On Nov 1, 2017, at 11:48 PM, viq wrote: > > If that was done in a CVS checkout, now run 'cvs diff -Nrud' and attach > the result to mail to ports@ :) Thanks for the instruction. I checkout the CVS version today and generate a patch with ‘cvs diff -Naud’. Note: the diff it generated didn’t mention directory ‘patches/‘ was removed. mlmmj-1.3.0.patch Description: Binary data Zhang Huangbin, founder of iRedMail project: http://www.iredmail.org/ Time zone: GMT+8 (China/Beijing). Available on Telegram: https://t.me/iredmail
Re: security/gpgme (needs help)
Rafael Sadowski [2017-11-01, 17:53:43]: > Hi porters, > > I need help with the gpgme update. Special thing here, I need the Qt > bindings because kde-applications/gpgmepp is dead and all dependent > programs work with gpgme-qt now. > > But I always trap into the following link issue: > > libtool: link: cc -shared -fPIC -DPIC -o .libs/libgpgme.so.20.0 > -I/usr/local/include -O2 -pipe -Wall -Wcast-align -Wshadow > -Wstrict-prototypes .libs/conversion.o .libs/b64dec.o .libs/get-env.o > .libs/parsetlv.o .libs/mbox-util.o .libs/data.o .libs/data-fd.o > .libs/data-stream.o .libs/data-mem.o .libs/data-user.o .libs/data-compat.o > .libs/data-identify.o .libs/signers.o .libs/sig-notation.o .libs/wait.o > .libs/wait-global.o .libs/wait-private.o .libs/wait-user.o .libs/op-support.o > .libs/encrypt.o .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o > .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o .libs/key.o > .libs/keylist.o .libs/keysign.o .libs/trust-item.o .libs/trustlist.o > .libs/tofupolicy.o .libs/import.o .libs/export.o .libs/genkey.o > .libs/delete.o .libs/edit.o .libs/getauditlog.o .libs/opassuan.o > .libs/passwd.o .libs/spawn.o .libs/assuan-support.o .libs/engine.o > .libs/engine-gpg.o .libs/status-table.o .libs/engine-gpgsm.o > .libs/engine-assuan.o .libs/engine-gpgconf.o .libs/engine-uiserver.o > .libs/engine-g13.o .libs/vfs-mount.o .libs/vfs-create.o .libs/engine-spawn.o > .libs/gpgconf.o .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o > .libs/dirinfo.o .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o > .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv > libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o > parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o data-user.o > data-compat.o data-identify.o signers.o sig-notation.o wait.o wait-global.o > wait-private.o wait-user.o op-support.o encrypt.o encrypt-sign.o decrypt.o > decrypt-verify.o verify.o sign.o passphrase.o progress.o key.o keylist.o > keysign.o trust-item.o trustlist.o tofupolicy.o import.o export.o genkey.o > delete.o edit.o getauditlog.o opassuan.o passwd.o spawn.o assuan-support.o > engine.o engine-gpg.o status-table.o engine-gpgsm.o engine-assuan.o > engine-gpgconf.o engine-uiserver.o engine-g13.o vfs-mount.o vfs-create.o > engine-spawn.o gpgconf.o queryswdb.o posix-util.o posix-io.o dirinfo.o > debug.o gpgme.o version.o error.o ath.o > libtool: link: ranlib .libs/libgpgme.a > cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2 > -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT gpgme-tool.o -MD > -MP -MF .deps/gpgme-tool.Tpo -c -o gpgme-tool.o gpgme-tool.c > mv -f .deps/gpgme-tool.Tpo .deps/gpgme-tool.Po > cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2 > -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT argparse.o -MD -MP > -MF .deps/argparse.Tpo -c -o argparse.o argparse.c > mv -f .deps/argparse.Tpo .deps/argparse.Po > c++ gpgme-tool.o argparse.o libgpgme.la -lassuan -L/usr/local/lib -lgpg-error > libgpgme.la: file not recognized: File format not recognized > c++: error: linker command failed with exit code 1 (use -v to see invocation) libgpgme.la is a libtool library file, which indeed isn't recognized by the linker. maybe it is an error caused by our libtool. can you try building this with USE_LIBTOOL=gnu ?
Remove mail/mixmaster?
mail/mixmaster (client for anonymous remailing) is fourteen years old. I don't think that security~crypto software that has been unmaintained for that long is still useful. Time to delete it? -- Christian "naddy" Weisgerber na...@mips.inka.de
New: x11/ruby-tk 0.2.0
ruby <2.4 used to ship with the tk extension, which was built as the -tk subpackage. Starting in ruby 2.4, they moved the code to a gem, and they have released occassional improvements since (an earlier version segfaulted at exit). After using both ruby-qt3 (x11/kde/bindings3) and ruby-qt4 (x11/kde4/ruby-qt) in the past, I eventually converted my ruby GUI programs to ruby-tk as the ruby-tk API is simpler and more idiomatic. Tested on amd64. Can another developer please review and provide an ok to import? Thanks, Jeremy ruby-tk.tar.gz Description: application/tar-gz
Re: Remaining /dev/srandom users fixed
On Wed Nov 01, 2017 at 07:35:32PM +0100, Christian Weisgerber wrote: > After the removal of /dev/srandom, it turned out that this device > wasn't as entirely unused as I had thought. > > I extracted all packages from an amd64 snapshot and ran "fgrep -a > /dev/srandom" over the contents to identify all remaining /dev/srandom > users. Today I went through the list and fixed all ports that > required fixing; others were already fine since they simply tried > various /dev/*random devices and would find /dev/random or /dev/urandom > before or after trying /dev/srandom. > > All done. > -- > Christian "naddy" Weisgerber na...@mips.inka.de > Great job naddy, thanks a lot!
Update: mruby 1.2.0 -> 1.3.0
This is a simple update to mruby 1.3.0. New features:
* Safe navigation operator (&.)
* Hash#dig, Array#dig
* Object#freeze
* Kernel#caller
Tested on amd64. Will be committing in a day or so unless I hear
objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile23 Sep 2017 10:15:28 - 1.6
+++ Makefile1 Nov 2017 18:31:49 -
@@ -4,9 +4,8 @@ BROKEN-sparc64 =Bus error (core dumped)
COMMENT = lightweight, embeddable implementation of ruby
-VERSION = 1.2.0
+VERSION = 1.3.0
DISTNAME = mruby-${VERSION}
-REVISION = 1
CATEGORIES = lang
HOMEPAGE = https://github.com/mruby/mruby
Index: distinfo
===
RCS file: /cvs/ports/lang/mruby/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo5 Nov 2016 22:31:28 - 1.1.1.1
+++ distinfo1 Nov 2017 18:31:54 -
@@ -1,2 +1,2 @@
-SHA256 (mruby-1.2.0-1.2.0.tar.gz) =
Ba0BNanDQVj/DP1GMfT7rtKMu4JDaA0sl//bnCRrHz0=
-SIZE (mruby-1.2.0-1.2.0.tar.gz) = 386475
+SHA256 (mruby-1.3.0-1.3.0.tar.gz) =
EMZkXsWbX4zYAGnnKXq8UUtUrzVAciECtbloAzogm/Q=
+SIZE (mruby-1.3.0-1.3.0.tar.gz) = 424107
Index: patches/patch-build_config_rb
===
RCS file: /cvs/ports/lang/mruby/patches/patch-build_config_rb,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-build_config_rb
--- patches/patch-build_config_rb 4 Mar 2017 05:09:15 - 1.1
+++ patches/patch-build_config_rb 1 Nov 2017 18:34:50 -
@@ -4,8 +4,9 @@ Don't build in debug mode by default.
Only build binaries we plan to use.
build_config.rb.orig Tue Nov 17 01:02:30 2015
-+++ build_config.rbThu Mar 2 21:29:29 2017
+Index: build_config.rb
+--- build_config.rb.orig
build_config.rb
@@ -8,7 +8,7 @@ MRuby::Build.new do |conf|
toolchain :gcc
end
@@ -15,7 +16,7 @@ Only build binaries we plan to use.
# Use mrbgems
# conf.gem 'examples/mrbgems/ruby_extension_example'
-@@ -105,7 +105,7 @@ MRuby::Build.new('host-debug') do |conf|
+@@ -107,7 +107,7 @@ MRuby::Build.new('host-debug') do |conf|
# bintest
# conf.enable_bintest
@@ -24,8 +25,8 @@ Only build binaries we plan to use.
MRuby::Build.new('test') do |conf|
# Gets set by the VS command prompts.
-@@ -120,7 +120,7 @@ MRuby::Build.new('test') do |conf|
- conf.enable_test
+@@ -134,7 +134,7 @@ MRuby::Build.new('bench') do |conf|
+ end
conf.gembox 'default'
-end
Index: patches/patch-tasks_mruby_build_rake
===
RCS file: /cvs/ports/lang/mruby/patches/patch-tasks_mruby_build_rake,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-tasks_mruby_build_rake
--- patches/patch-tasks_mruby_build_rake5 Nov 2016 22:31:28 -
1.1.1.1
+++ patches/patch-tasks_mruby_build_rake1 Nov 2017 18:34:44 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-tasks_mruby_build_rake,v 1.1.1.1 2016/11/05 22:31:28 jeremy
Exp $
tasks/mruby_build.rake.origFri Nov 4 23:51:18 2016
-+++ tasks/mruby_build.rake Fri Nov 4 23:51:35 2016
-@@ -273,7 +273,7 @@ EOS
+Index: tasks/mruby_build.rake
+--- tasks/mruby_build.rake.orig
tasks/mruby_build.rake
+@@ -304,7 +304,7 @@ EOS
def run_bintest
targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map {
|v| filename v.dir }
targets << filename(".") if File.directory? "./bintest"
Index: patches/patch-tasks_toolchains_gcc_rake
===
RCS file: /cvs/ports/lang/mruby/patches/patch-tasks_toolchains_gcc_rake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-tasks_toolchains_gcc_rake
--- patches/patch-tasks_toolchains_gcc_rake 27 Feb 2017 21:33:43 -
1.1
+++ patches/patch-tasks_toolchains_gcc_rake 1 Nov 2017 18:34:44 -
@@ -1,8 +1,9 @@
$OpenBSD: patch-tasks_toolchains_gcc_rake,v 1.1 2017/02/27 21:33:43 jca Exp $
tasks/toolchains/gcc.rake.orig Mon Feb 27 22:08:50 2017
-+++ tasks/toolchains/gcc.rake Mon Feb 27 22:14:00 2017
+Index: tasks/toolchains/gcc.rake
+--- tasks/toolchains/gcc.rake.orig
tasks/toolchains/gcc.rake
@@ -1,7 +1,7 @@
- MRuby::Toolchain.new(:gcc) do |conf|
+ MRuby::Toolchain.new(:gcc) do |conf, _params|
[conf.cc, conf.objc, conf.asm].each do |cc|
cc.command = ENV['CC'] || 'gcc'
-cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall
-Werror-implicit-function-declaration -Wdeclaration-after-statement
-Wwrite-strings)]
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/mruby/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1
Re: Update: PostgreSQL 9.6.5 -> 10.0
On Wed, Nov 01, 2017 at 11:26:45AM -0700, Jeremy Evans wrote:
> This updates PostgreSQL from 9.6.5 to 10.0. Starting in 10.0,
> the versioning policy will change, so instead of 10.0.1, the
> next bugfix release will be 10.1, and the next feature release
> will be 11.0.
>
> There are many compelling reasons to upgrade, see:
>
> https://www.postgresql.org/about/news/1786/
> https://www.postgresql.org/docs/10/static/release-10.html
>
> The update is fairly straightforward, though I moved some things
> around in the PLISTs:
>
> * All python-dependent code moves to the -plpython subpackage,
> as it doesn't make sense to have plpython itself in -plpython,
> but hstore-plpython and ltree-plpython in -contrib.
>
> * Some server-specific programs such as pg_basebackup and
> pg_receivexlog (renamed to pg_receivewal) move from -client
> to -server, since they are only useful if you are running
> a PostgreSQL server.
>
> postgresql-previous gets updated from 9.5.5 to 9.6.5, and
> postgresql-pg_upgrade now depends on a postgresql-previous
> version that is at least greater than the previous major
> version, which should fix issues if someone runs
> "pkg_add postgresql-server".
>
> I've tried a pg_upgrade from 9.6 to 10 and didn't run into
> any problems, but it was on a very simple test database.
>
> Included at the bottom are necessary bumps for postgresql-pllua
> and postgresql-plv8, since those always depend on specific
> PostgreSQL versions.
>
> I've tried building some of the dependencies. citus needs an
> update to work with PostgreSQL 10, the diff to update to the
> latest citus version is included below. No other issues
> noticed yet, but I haven't finished building the dependencies
> for PostGIS.
>
> This should probably go into a bulk so we can see what the
> fallout is.
>
Hi Jeremy,
Thanks for your diff. Let me compare it with my own diff (i'm running pg 10
since beta 1).
Regards,
> Thanks,
> Jeremy
>
> Index: postgresql/Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.229
> diff -u -p -u -p -r1.229 Makefile
> --- postgresql/Makefile 13 Sep 2017 14:24:08 - 1.229
> +++ postgresql/Makefile 1 Nov 2017 17:14:24 -
> @@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
> COMMENT-plpython=Python procedural language for PostgreSQL
> COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous
> version
>
> -VERSION= 9.6.5
> -PREV_MAJOR= 9.5
> +VERSION= 10.0
> +PREV_MAJOR= 9.6
> DISTNAME=postgresql-${VERSION}
> PKGNAME-main=postgresql-client-${VERSION}
> PKGNAME-server= postgresql-server-${VERSION}
> @@ -18,10 +18,10 @@ PKGNAME-plpython=postgresql-plpython-${V
> PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
>
> CATEGORIES= databases
> -SHARED_LIBS= ecpg7.8 \
> - ecpg_compat 4.8 \
> - pgtypes 4.7 \
> - pq 6.9
> +SHARED_LIBS= ecpg7.9 \
> + ecpg_compat 4.9 \
> + pgtypes 4.8 \
> + pq 6.10
>
> HOMEPAGE=http://www.postgresql.org/
>
> @@ -96,10 +96,10 @@ WANTLIB-server= ${WANTLIB-main} perl pq>
> RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
> LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
>${LIB_DEPENDS-main}
> -WANTLIB-contrib= ${WANTLIB-main} pq>=4
> +WANTLIB-contrib= ${WANTLIB-main} pq>=4 perl
>
> RUN_DEPENDS-pg_upgrade= databases/postgresql,-server=${VERSION} \
> - databases/postgresql-previous
> + databases/postgresql-previous>=${PREV_MAJOR}
> LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
>${LIB_DEPENDS-main}
> WANTLIB-pg_upgrade= ${WANTLIB-main} pq>=4
> Index: postgresql/distinfo
> ===
> RCS file: /cvs/ports/databases/postgresql/distinfo,v
> retrieving revision 1.68
> diff -u -p -u -p -r1.68 distinfo
> --- postgresql/distinfo 13 Sep 2017 14:24:08 - 1.68
> +++ postgresql/distinfo 1 Nov 2017 14:12:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (postgresql-9.6.5.tar.gz) =
> eelgXTIbVFsu2d8Yrf0uUslQ3JNGtl6VJ/EXExYn3Ao=
> -SIZE (postgresql-9.6.5.tar.gz) = 25652523
> +SHA256 (postgresql-10.0.tar.gz) =
> hsg6Zkt3ARSGG8lqnso8Pv4owDhManHGEEJs1CsBZPs=
> +SIZE (postgresql-10.0.tar.gz) = 25830653
> Index: postgresql/patches/patch-src_backend_libpq_ip_c
> ===
> RCS file:
> /cvs/ports/databases/postgresql/patches/patch-src_backend_libpq_ip_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-src_backend_libpq_ip_c
> --- postgresql/patches/patch-src_backend_libpq_ip_c 13 Feb 2016 21:54:28
> - 1.2
> +++ postgresql/patches/patch-src_backend_libpq_ip_c 1 Nov 2017 14
Remaining /dev/srandom users fixed
After the removal of /dev/srandom, it turned out that this device wasn't as entirely unused as I had thought. I extracted all packages from an amd64 snapshot and ran "fgrep -a /dev/srandom" over the contents to identify all remaining /dev/srandom users. Today I went through the list and fixed all ports that required fixing; others were already fine since they simply tried various /dev/*random devices and would find /dev/random or /dev/urandom before or after trying /dev/srandom. All done. -- Christian "naddy" Weisgerber na...@mips.inka.de
Update: PostgreSQL 9.6.5 -> 10.0
This updates PostgreSQL from 9.6.5 to 10.0. Starting in 10.0,
the versioning policy will change, so instead of 10.0.1, the
next bugfix release will be 10.1, and the next feature release
will be 11.0.
There are many compelling reasons to upgrade, see:
https://www.postgresql.org/about/news/1786/
https://www.postgresql.org/docs/10/static/release-10.html
The update is fairly straightforward, though I moved some things
around in the PLISTs:
* All python-dependent code moves to the -plpython subpackage,
as it doesn't make sense to have plpython itself in -plpython,
but hstore-plpython and ltree-plpython in -contrib.
* Some server-specific programs such as pg_basebackup and
pg_receivexlog (renamed to pg_receivewal) move from -client
to -server, since they are only useful if you are running
a PostgreSQL server.
postgresql-previous gets updated from 9.5.5 to 9.6.5, and
postgresql-pg_upgrade now depends on a postgresql-previous
version that is at least greater than the previous major
version, which should fix issues if someone runs
"pkg_add postgresql-server".
I've tried a pg_upgrade from 9.6 to 10 and didn't run into
any problems, but it was on a very simple test database.
Included at the bottom are necessary bumps for postgresql-pllua
and postgresql-plv8, since those always depend on specific
PostgreSQL versions.
I've tried building some of the dependencies. citus needs an
update to work with PostgreSQL 10, the diff to update to the
latest citus version is included below. No other issues
noticed yet, but I haven't finished building the dependencies
for PostGIS.
This should probably go into a bulk so we can see what the
fallout is.
Thanks,
Jeremy
Index: postgresql/Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.229
diff -u -p -u -p -r1.229 Makefile
--- postgresql/Makefile 13 Sep 2017 14:24:08 - 1.229
+++ postgresql/Makefile 1 Nov 2017 17:14:24 -
@@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 9.6.5
-PREV_MAJOR=9.5
+VERSION= 10.0
+PREV_MAJOR=9.6
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
PKGNAME-server=postgresql-server-${VERSION}
@@ -18,10 +18,10 @@ PKGNAME-plpython=postgresql-plpython-${V
PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
CATEGORIES=databases
-SHARED_LIBS= ecpg7.8 \
- ecpg_compat 4.8 \
- pgtypes 4.7 \
- pq 6.9
+SHARED_LIBS= ecpg7.9 \
+ ecpg_compat 4.9 \
+ pgtypes 4.8 \
+ pq 6.10
HOMEPAGE= http://www.postgresql.org/
@@ -96,10 +96,10 @@ WANTLIB-server= ${WANTLIB-main} perl pq>
RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
${LIB_DEPENDS-main}
-WANTLIB-contrib= ${WANTLIB-main} pq>=4
+WANTLIB-contrib= ${WANTLIB-main} pq>=4 perl
RUN_DEPENDS-pg_upgrade=databases/postgresql,-server=${VERSION} \
- databases/postgresql-previous
+ databases/postgresql-previous>=${PREV_MAJOR}
LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
${LIB_DEPENDS-main}
WANTLIB-pg_upgrade=${WANTLIB-main} pq>=4
Index: postgresql/distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 distinfo
--- postgresql/distinfo 13 Sep 2017 14:24:08 - 1.68
+++ postgresql/distinfo 1 Nov 2017 14:12:43 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-9.6.5.tar.gz) = eelgXTIbVFsu2d8Yrf0uUslQ3JNGtl6VJ/EXExYn3Ao=
-SIZE (postgresql-9.6.5.tar.gz) = 25652523
+SHA256 (postgresql-10.0.tar.gz) = hsg6Zkt3ARSGG8lqnso8Pv4owDhManHGEEJs1CsBZPs=
+SIZE (postgresql-10.0.tar.gz) = 25830653
Index: postgresql/patches/patch-src_backend_libpq_ip_c
===
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_backend_libpq_ip_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_backend_libpq_ip_c
--- postgresql/patches/patch-src_backend_libpq_ip_c 13 Feb 2016 21:54:28
- 1.2
+++ postgresql/patches/patch-src_backend_libpq_ip_c 1 Nov 2017 14:22:27
-
@@ -3,9 +3,10 @@ $OpenBSD: patch-src_backend_libpq_ip_c,v
Use the address family from the address, not from the netmask,
since the latter is unreliable. Fixes "samenet"/"samehost".
src/backend/libpq/ip.c.origMon Feb 8 21:15:19 2016
-+++ src/backend/libpq/ip.c Fri Feb 12 17:18:09 2016
-@@ -423,17 +423,16 @@ run_ifaddr_callback(PgIfAddrCallback callback,
security/gpgme (needs help)
Hi porters,
I need help with the gpgme update. Special thing here, I need the Qt
bindings because kde-applications/gpgmepp is dead and all dependent
programs work with gpgme-qt now.
But I always trap into the following link issue:
libtool: link: cc -shared -fPIC -DPIC -o .libs/libgpgme.so.20.0
-I/usr/local/include -O2 -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes
.libs/conversion.o .libs/b64dec.o .libs/get-env.o .libs/parsetlv.o
.libs/mbox-util.o .libs/data.o .libs/data-fd.o .libs/data-stream.o
.libs/data-mem.o .libs/data-user.o .libs/data-compat.o .libs/data-identify.o
.libs/signers.o .libs/sig-notation.o .libs/wait.o .libs/wait-global.o
.libs/wait-private.o .libs/wait-user.o .libs/op-support.o .libs/encrypt.o
.libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o .libs/verify.o
.libs/sign.o .libs/passphrase.o .libs/progress.o .libs/key.o .libs/keylist.o
.libs/keysign.o .libs/trust-item.o .libs/trustlist.o .libs/tofupolicy.o
.libs/import.o .libs/export.o .libs/genkey.o .libs/delete.o .libs/edit.o
.libs/getauditlog.o .libs/opassuan.o .libs/passwd.o .libs/spawn.o
.libs/assuan-support.o .libs/engine.o .libs/engine-gpg.o .libs/status-table.o
.libs/engine-gpgsm.o .libs/engine-assuan.o .libs/engine-gpgconf.o
.libs/engine-uiserver.o .libs/engine-g13.o .libs/vfs-mount.o .libs/vfs-create.o
.libs/engine-spawn.o .libs/gpgconf.o .libs/queryswdb.o .libs/posix-util.o
.libs/posix-io.o .libs/dirinfo.o .libs/debug.o .libs/gpgme.o .libs/version.o
.libs/error.o .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv
libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o
parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o data-user.o
data-compat.o data-identify.o signers.o sig-notation.o wait.o wait-global.o
wait-private.o wait-user.o op-support.o encrypt.o encrypt-sign.o decrypt.o
decrypt-verify.o verify.o sign.o passphrase.o progress.o key.o keylist.o
keysign.o trust-item.o trustlist.o tofupolicy.o import.o export.o genkey.o
delete.o edit.o getauditlog.o opassuan.o passwd.o spawn.o assuan-support.o
engine.o engine-gpg.o status-table.o engine-gpgsm.o engine-assuan.o
engine-gpgconf.o engine-uiserver.o engine-g13.o vfs-mount.o vfs-create.o
engine-spawn.o gpgconf.o queryswdb.o posix-util.o posix-io.o dirinfo.o debug.o
gpgme.o version.o error.o ath.o
libtool: link: ranlib .libs/libgpgme.a
cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2
-pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT gpgme-tool.o -MD -MP
-MF .deps/gpgme-tool.Tpo -c -o gpgme-tool.o gpgme-tool.c
mv -f .deps/gpgme-tool.Tpo .deps/gpgme-tool.Po
cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2
-pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT argparse.o -MD -MP
-MF .deps/argparse.Tpo -c -o argparse.o argparse.c
mv -f .deps/argparse.Tpo .deps/argparse.Po
c++ gpgme-tool.o argparse.o libgpgme.la -lassuan -L/usr/local/lib -lgpg-error
libgpgme.la: file not recognized: File format not recognized
c++: error: linker command failed with exit code 1 (use -v to see invocation)
Help, Feedback is welcome.
Index: Makefile
===
RCS file: /cvs/ports/security/gpgme/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile11 May 2017 00:29:50 - 1.38
+++ Makefile1 Nov 2017 16:48:31 -
@@ -1,31 +1,46 @@
# $OpenBSD: Makefile,v 1.38 2017/05/11 00:29:50 espie Exp $
-COMMENT= GnuPG Made Easy
+COMMENT-main= GnuPG Made Easy
+COMMENT-qt=Qt bindings for GPGme
+COMMENT-py2= Python 2 bindings for GPGme
+COMMENT-py3= Python 3 bindings for GPGme
+
+V =1.9.0
+DISTNAME= gpgme-$V
+
+PKGNAME-main = ${PKGNAME}
+PKGNAME-qt=gpgme-qt-$V
+PKGNAME-py2= gpgme-py2-$V
+PKGNAME-py3= gpgme-py3-$V
-DISTNAME= gpgme-1.6.0
-REVISION= 0
CATEGORIES=security devel
SHARED_LIBS += gpgme20.0 # 25.0
SHARED_LIBS += gpgme-pthread20.0 # 25.0
-HOMEPAGE= http://www.gnupg.org/gpgme.html
+HOMEPAGE= https://www.gnupg.org/related_software/gpgme/
# GPLv2 - LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += assuan c gpg-error iconv intl pthread
+WANTLIB-main += ${COMPILER_LIBCXX} assuan c gpg-error iconv intl m
MASTER_SITES= ${MASTER_SITE_GNUPG:=gpgme/}
EXTRACT_SUFX= .tar.bz2
-CONFIGURE_STYLE= gnu
+MULTI_PACKAGES = -main -qt -py2 -py3
+PSEUDO_FLAVORS = no_qt no_py2 no_py3
+FLAVOR ?=
# not without -pthread
-CONFIGURE_ENV += gpgme_cv_tls_works=no
+CONFIGURE_ENV += gpgme_cv_tls_works=no
+CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
# Requires gpgsm (gnupg 2.x) during build, but can run with any gnupg.
-BUILD
update ripe.atlas.tools to 2.2.2 (& ripe.atlas.cousteau -> 1.4, ripe.atlas.sagan -> 1.2.2)
apparently I'm at a ports hackathon...
lightly tested, OK?
diff --git net/py-ripe.atlas.cousteau/Makefile
net/py-ripe.atlas.cousteau/Makefile
index 0f90761acdd..73b3a91a1a1 100644
--- net/py-ripe.atlas.cousteau/Makefile
+++ net/py-ripe.atlas.cousteau/Makefile
@@ -2,10 +2,9 @@
COMMENT = python bindings for the RIPE Atlas API
-MODPY_EGG_VERSION =1.3
+MODPY_EGG_VERSION =1.4
DISTNAME = ripe.atlas.cousteau-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = net
diff --git net/py-ripe.atlas.cousteau/distinfo
net/py-ripe.atlas.cousteau/distinfo
index a5c30d944a8..9c87f052f14 100644
--- net/py-ripe.atlas.cousteau/distinfo
+++ net/py-ripe.atlas.cousteau/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ripe.atlas.cousteau-1.3.tar.gz) =
Jgw+/8CxEmnst/vV/eeQxR/56eEuv9yjyhaArk2a/X8=
-SIZE (ripe.atlas.cousteau-1.3.tar.gz) = 48301
+SHA256 (ripe.atlas.cousteau-1.4.tar.gz) =
QeDJGuRFmmwQFEj1uvsEO6RLSr/ZqApa4LTDobtVClI=
+SIZE (ripe.atlas.cousteau-1.4.tar.gz) = 49303
diff --git net/py-ripe.atlas.sagan/Makefile net/py-ripe.atlas.sagan/Makefile
index abefc7082b4..d7b53672865 100644
--- net/py-ripe.atlas.sagan/Makefile
+++ net/py-ripe.atlas.sagan/Makefile
@@ -2,10 +2,9 @@
COMMENT = parsing library for RIPE Atlas measurement results
-MODPY_EGG_VERSION =1.1.11
+MODPY_EGG_VERSION =1.2.2
DISTNAME = ripe.atlas.sagan-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = net
diff --git net/py-ripe.atlas.sagan/distinfo net/py-ripe.atlas.sagan/distinfo
index 09586901bcb..a28138594f9 100644
--- net/py-ripe.atlas.sagan/distinfo
+++ net/py-ripe.atlas.sagan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ripe.atlas.sagan-1.1.11.tar.gz) =
tRxGS2708sygYhuxxKLGJrWK++nDLFKSxqt8jBtwXQg=
-SIZE (ripe.atlas.sagan-1.1.11.tar.gz) = 102136
+SHA256 (ripe.atlas.sagan-1.2.2.tar.gz) =
g2/bO+6g3ULZSVZpyCurR24mXp92wVNxao8lOIk7nN8=
+SIZE (ripe.atlas.sagan-1.2.2.tar.gz) = 108353
diff --git net/py-ripe.atlas.tools/Makefile net/py-ripe.atlas.tools/Makefile
index d4b9b7c7d90..ff2311c5b84 100644
--- net/py-ripe.atlas.tools/Makefile
+++ net/py-ripe.atlas.tools/Makefile
@@ -2,9 +2,8 @@
COMMENT = official command-line client for RIPE Atlas
-MODPY_EGG_VERSION =2.0.2
+MODPY_EGG_VERSION =2.2.2
DISTNAME = ripe.atlas.tools-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = net
diff --git net/py-ripe.atlas.tools/distinfo net/py-ripe.atlas.tools/distinfo
index 40d9798ffa5..67341e29d69 100644
--- net/py-ripe.atlas.tools/distinfo
+++ net/py-ripe.atlas.tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ripe.atlas.tools-2.0.2.tar.gz) =
pqRvuFy0Dw9WRN899REMvcA5SyePKJy+ZGLLsQ7aDXg=
-SIZE (ripe.atlas.tools-2.0.2.tar.gz) = 96447
+SHA256 (ripe.atlas.tools-2.2.2.tar.gz) =
sRGZi2cDdAuaDnxsTvHgdkQ1HS7SfkM0M59+udK4kVM=
+SIZE (ripe.atlas.tools-2.2.2.tar.gz) = 101197
diff --git net/py-ripe.atlas.tools/pkg/PLIST net/py-ripe.atlas.tools/pkg/PLIST
index 559dce7773d..24a36aa061f 100644
--- net/py-ripe.atlas.tools/pkg/PLIST
+++ net/py-ripe.atlas.tools/pkg/PLIST
@@ -101,6 +101,7 @@
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCA
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}aggregate_ping.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dns_compact.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dst_asn.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
@@ -113,6 +114,7 @@
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCA
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/aggregate_ping.py
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/base.py
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dns.py
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dns_compact.py
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dst_asn.py
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/http.py
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/ntp.py
--
I'm not entirely sure you are real.
Update scintilla and scite from 3.5.2 to 4.0.2
Forgot that I had already dropped maintainership of Scintilla and SciTE
until after I promised landry@ I'd update them. Almost all the
patches broke and had to be manually reapplied.
Briefly tested on amd64. If anyone is intresting in taking over
maintainership, don't be shy.
Thanks,
Jeremy
Index: scintilla/Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- scintilla/Makefile 26 Jul 2017 22:45:19 - 1.25
+++ scintilla/Makefile 1 Nov 2017 14:27:26 -
@@ -2,14 +2,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 3.5.2
+VERSION= 4.0.2
DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
CATEGORIES=editors x11
-REVISION= 3
-SHARED_LIBS= scintilla 9.0 \
- scintilla_lexers9.0
+SHARED_LIBS= scintilla 10.0 \
+ scintilla_lexers10.0
HOMEPAGE= http://www.scintilla.org/
@@ -17,7 +16,7 @@ HOMEPAGE= http://www.scintilla.org/
PERMIT_PACKAGE_CDROM= may not sell
PERMIT_PACKAGE_FTP=Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
+MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tgz
PATCHORIG= .orig.port
Index: scintilla/distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- scintilla/distinfo 17 Jan 2015 05:06:12 - 1.10
+++ scintilla/distinfo 1 Nov 2017 14:28:05 -
@@ -1,2 +1,2 @@
-SHA256 (scintilla352.tgz) = OXcagL2B/HpLuN07vZ8x5d3c/547xfRiYD46N+ei3Fw=
-SIZE (scintilla352.tgz) = 1360555
+SHA256 (scintilla402.tgz) = h9lhB0zWRvp/kuPUiMsStqLQg4oZRLVsuVeNhXG7vU4=
+SIZE (scintilla402.tgz) = 1401547
Index: scintilla/patches/patch-gtk_ScintillaGTK_cxx
===
RCS file: scintilla/patches/patch-gtk_ScintillaGTK_cxx
diff -N scintilla/patches/patch-gtk_ScintillaGTK_cxx
--- scintilla/patches/patch-gtk_ScintillaGTK_cxx2 May 2017 20:48:21
- 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gtk_ScintillaGTK_cxx,v 1.4 2017/05/02 20:48:21 fcambus Exp $
-
-Fix build with Clang. Patch from Scintilla 3.7.4.
-
gtk/ScintillaGTK.cxx.orig
-+++ gtk/ScintillaGTK.cxx
-@@ -1637,7 +1637,7 @@ void ScintillaGTK::ReceivedDrop(GtkSelectionData *sele
- drop.push_back('\0');
- NotifyURIDropped(&drop[0]);
- } else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) ||
(TypeOfGSD(selection_data) == atomUTF8)) {
-- if (TypeOfGSD(selection_data) > 0) {
-+ if (LengthOfGSD(selection_data) > 0) {
- SelectionText selText;
- GetGtkSelectionText(selection_data, selText);
- DropAt(posDrop, selText.Data(), selText.Length(),
false, selText.rectangular);
Index: scintilla/patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-gtk_makefile
--- scintilla/patches/patch-gtk_makefile11 Mar 2016 18:13:19 -
1.12
+++ scintilla/patches/patch-gtk_makefile1 Nov 2017 15:47:27 -
@@ -1,53 +1,56 @@
$OpenBSD: patch-gtk_makefile,v 1.12 2016/03/11 18:13:19 naddy Exp $
-Drop `-pedantic'
-/usr/local/include/gtk-3.0/gdk/gdktypes.h:318: error: comma at end of
enumerator list
-
gtk/makefile.orig Thu Nov 27 21:47:24 2014
-+++ gtk/makefile Fri Mar 11 18:05:48 2016
-@@ -6,15 +6,8 @@
- # Builds for GTK+ 2 and no longer supports GTK+ 1.
- # Also works with ming32-make on Windows.
+Index: gtk/makefile
+--- gtk/makefile.orig
gtk/makefile
+@@ -8,19 +8,9 @@
--.SUFFIXES: .cxx .c .o .h .a
+ srcdir ?= .
+
+-.SUFFIXES: .cxx .c .o .h .a .list
-ifdef CLANG
--CXX = clang++ -Wno-deprecated-register
+-CXX = clang++
+-CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
-CC = clang
-# Can choose aspect to sanitize: address and undefined can simply change
SANITIZE but for
-# thread also need to create Position Independent Executable -> search online
documentation
-SANITIZE = address
-#SANITIZE = undefined
+-else
+-CXXWARNFLAGS = -Wall -pedantic
-endif
-+.SUFFIXES: .cxx .c .o .h .a .so
++.SUFFIXES: .cxx .c .o .h .a .list .so
+ ARFLAGS = rc
+AR = ar
RANLIB = touch
ifdef GTK3
-@@ -36,17 +29,20 @@ DEL = del /q
- COMPLIB=..\bin\scintilla.a
+@@ -48,18 +38,21 @@ DEL = del /q
+ COMPLIB=$(srcdir)\..\bin\scintilla.a
else
DEL = rm -f
--COMPLIB=../bin/scintilla.a
-+COMPLIB=../bin/libscintilla.a
-+LEXERLIB=../bin/libscintilla_lexers.a
-+SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION}
-+SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintill
Re: Help update port 'mail/mlmmj' to the latest 1.3.0
On 17-11-01 14:16:25, Zhang Huangbin wrote: > Dear port maintainers, > > Could anyone help update port ‘mail/mlmmj’ to the latest 1.3.0 release? > > I did some changes to make it work based on the latest ports tree: > > *) Bump version number to 1.3.0 in Makefile. > *) Remove ‘patches/’ directory. Failed to patch, and it’s not required > anymore after checked mlmmj source code. > > Then run commands: > > make makesum > make checksum > make install clean > > It works for me. > > Thank you very much. If that was done in a CVS checkout, now run 'cvs diff -Nrud' and attach the result to mail to ports@ :)
Re: [UPDATE] net/prosody 0.9.12 -> 0.10.0
Hey On Wed, Nov 01, 2017 at 04:23:51PM +0100, viq wrote: > Great work, and sorry for making more work for you by my laziness - most > of those were simply me not backporting current state of the port, > comments below. Oh no, your port was quite helpful. > > - The TLS certificate generation Makefile worked fine without your > > changes. Are they necessary > > Sorry, I'm not sure which part are you referring to here? > > - This diff was created with cvs diff instead of git Sorry, nevermind, I misread that. Looking at diffs for diffs can be confusing. -- Could a developer with commit rights look at this and pull it in, if OK? Henrik
Re: [UPDATE] net/prosody 0.9.12 -> 0.10.0
On 17-10-30 13:34:51, Henrik Friedrichsen wrote:
> Hey!
>
> On Sat, Oct 28, 2017 at 10:49:54PM +0200, viq wrote:
> > This updates prosody to 0.10.0 as announced [0]
>
> Thanks for this and sorry for the delay, that release slipped under my
> radar.
And my turn to apologise for delay in responding.
> Attached is my take at it. It's based on yours with some minor
> differences:
Great work, and sorry for making more work for you by my laziness - most
of those were simply me not backporting current state of the port,
comments below.
> - luaevent and prosody still don't seem to work well on OpenBSD, which
> is why I left out the dependency. More at [1]
Indeed, I just tested on my box and it's still an issue with 0.10
> - A while ago sthen@ migrated from SUBST_CMD and patches to the sed
> expression that is in the tree[2]. I left it at that.
Great, I completely missed that.
> - The TLS certificate generation Makefile worked fine without your
> changes. Are they necessary
Sorry, I'm not sure which part are you referring to here?
> - This diff was created with cvs diff instead of git
Yeah, again apologies for my laziness.
> [1]: https://prosody.im/issues/687
> [2]:
> http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/prosody/Makefile?rev=1.37&content-type=text/x-cvsweb-markup
>
> Let me know what you think
Seems better than mine, with only the question of what you meant by
"changes to TLS certificate generation Makefile".
> Best regards
> Henrik
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/prosody/Makefile,v
> retrieving revision 1.44
> diff -u -p -r1.44 Makefile
> --- Makefile 14 May 2017 16:36:55 - 1.44
> +++ Makefile 30 Oct 2017 12:26:36 -
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.44 2017/05/14 16:36:55 danj Exp $
>
> COMMENT= communications server for Jabber/XMPP written in Lua
> -DISTNAME=prosody-0.9.12
> +DISTNAME=prosody-0.10.0
> CATEGORIES= net
> MASTER_SITES=http://prosody.im/downloads/source/
>
> @@ -17,6 +17,7 @@ MODULES=lang/lua
> LIB_DEPENDS= devel/libidn
> MODLUA_RUN_DEPENDS+= archivers/luazlib \
> databases/luadbi \
> + devel/luabitop \
> devel/luafs \
> security/luasec \
> textproc/luaexpat>=1.3.0
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/prosody/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 14 May 2017 16:36:55 - 1.13
> +++ distinfo 30 Oct 2017 12:26:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (prosody-0.9.12.tar.gz) = GlmjIrcZKKIZhVIqoA0OqzVSII17+eyzGFQqGy/uPo0=
> -SIZE (prosody-0.9.12.tar.gz) = 267869
> +SHA256 (prosody-0.10.0.tar.gz) = dBTkRyVsYLJkVXjEpZExE810tBnKWgMrVNuQ2YqXhJg=
> +SIZE (prosody-0.10.0.tar.gz) = 330461
> Index: patches/patch-certs_Makefile
> ===
> RCS file: /cvs/ports/net/prosody/patches/patch-certs_Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-certs_Makefile
> --- patches/patch-certs_Makefile 14 May 2017 16:36:55 - 1.6
> +++ patches/patch-certs_Makefile 30 Oct 2017 12:26:36 -
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-certs_Makefile,v 1.6 2017/05/14 16:36:55 danj Exp $
> certs/Makefile.orig Mon Dec 5 13:54:23 2016
> -+++ certs/Makefile Mon Mar 27 19:18:16 2017
> +Index: certs/Makefile
> +--- certs/Makefile.orig
> certs/Makefile
> @@ -2,13 +2,13 @@
> keysize=2048
>
> @@ -19,9 +20,12 @@ $OpenBSD: patch-certs_Makefile,v 1.6 201
> # to generate a self signed certificate.
>
> .PRECIOUS: %.cnf %.key
> -@@ -28,3 +28,5 @@ keysize=2048
> +@@ -60,6 +60,8 @@ keysize=2048
> %.key:
> umask 0077 && openssl genrsa -out $@ $(keysize)
> @chmod 400 $@
> +@chown _prosody $@ || \
> +echo "***WARNING***: You will need to 'chown _prosody $@'"
> +
> + # Generate Diffie-Hellman parameters
> + dh-%.pem:
> Index: patches/patch-prosody_cfg_lua_dist
> ===
> RCS file: /cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-prosody_cfg_lua_dist
> --- patches/patch-prosody_cfg_lua_dist27 Nov 2014 08:12:51 -
> 1.6
> +++ patches/patch-prosody_cfg_lua_dist30 Oct 2017 12:26:36 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-prosody_cfg_lua_dist,v 1.6 2014/11/27 08:12:51 landry Exp $
> prosody.cfg.lua.dist.origWed Oct 15 11:33:36 2014
> -+++ prosody.cfg.lua.dist Thu Nov 27 09:10:35 2014
> -@@ -22,6 +22,14 @@
> +Index: prosody.cfg.lua.dist
> +--- prosody.cfg.lua.dist.orig
> prosody.cfg.lua.dist
> +@@ -23,6 +23,14 @@
> -- Example: admins = { "us...@example.com", "us...@example.net" }
> admins = { }
>
> @@ -14,29 +15,11 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1
Reduce duplication in ruby port Makefiles
Here's a diff to move most of the shared logic for building ruby
from the version specific Makefiles to Makefile.inc.
In order to allow this, a BINREV variable is added to track
the dotless version (REV 2.4 => BINREV 24). This also removes
the RUBYLIBREV variable. RUBYLIBREV was in the version specific
Makefiles, but it just duplicates REV from Makefile.inc. This
complicates update-plist and similar code.
Not shown here are changes to the PLISTs to use REV instead of
RUBYLIBREV, as those are large and mechanical.
This diff made work on a new port for ruby 2.5.0-preview1
significantly easier (will send that one later as it needs more work).
Will be committing in a day or so unless I hear objections.
Thanks,
Jeremy
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/ruby/Makefile.inc,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile.inc
--- Makefile.inc1 Nov 2017 10:52:06 - 1.17
+++ Makefile.inc1 Nov 2017 11:53:33 -
@@ -1,7 +1,20 @@
# $OpenBSD: Makefile.inc,v 1.17 2017/11/01 10:52:06 jeremy Exp $
+COMMENT-main ?=object oriented script language with threads
+COMMENT-gdbm ?=gdbm interface for ruby
+COMMENT-ri_docs ?= ri documentation files for ruby
+
DISTNAME ?=ruby-${VERSION}
+PKGNAME-main ?=ruby-${VERSION}
+PKGNAME-gdbm ?=ruby${BINREV}-gdbm-${VERSION}
+PKGNAME-ri_docs ?= ruby${BINREV}-ri_docs-${VERSION}
+
+PKG_ARCH-ri_docs ?=*
+WANTLIB-ri_docs ?= # empty
+
+PKGSPEC-main ?=ruby->=${REV},<${NEXTVER}
+
CATEGORIES ?= lang
HOMEPAGE ?=http://www.ruby-lang.org/
@@ -16,20 +29,73 @@ PERMIT_DISTFILES_FTP ?= Yes
MASTER_SITES ?=http://cache.ruby-lang.org/pub/ruby/${VERSION:R}/
CONFIGURE_STYLE ?= gnu
-CONFIGURE_ARGS += --enable-shared
-CONFIGURE_ENV += PREFIX="${PREFIX}" \
+CONFIGURE_ARGS += --enable-shared \
+ --program-suffix=${BINREV} \
+ --with-soname=ruby${BINREV} \
+ --with-ruby-version=minor \
+ --with-mantype=doc \
+ --enable-pthread \
+ --enable-ipv6 \
+ --without-bundled-libffi \
+ --disable-option-checking
+
+CONFIGURE_ENV += LIBruby${BINREV}_VERSION=${LIBruby${BINREV}_VERSION} \
+ PREFIX="${PREFIX}" \
CPPFLAGS="-DOPENSSL_NO_STATIC_ENGINE
-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ DLDFLAGS="-L${LOCALBASE}/lib" \
+ ac_cv_prog_DOXYGEN="" \
+ ac_cv_prog_DOT="" \
+
+MAKE_ENV +=DLDFLAGS="-I${LOCALBASE}/lib"
+
+
+WANTLIB-main +=c crypto ffi gmp m ncurses pthread readline ssl
\
+ util yaml z
+LIB_DEPENDS-main +=devel/gmp \
+ devel/libyaml \
+ devel/libffi
+
+WANTLIB-gdbm +=c m gdbm gmp pthread ruby${BINREV}
+LIB_DEPENDS-gdbm +=databases/gdbm \
+ devel/gmp \
+ lang/ruby/${REV},-main>=${VERSION},<${NEXTVER}
+RUN_DEPENDS-gdbm ?=
+
+ALL_TARGET = V=1 main
+INSTALL_TARGET = V=1 install-nodoc
+
+RI_DOCS ?= No
+
+TEST_DEPENDS ?=${FULLPKGNAME-main}:${BUILD_PKGPATH}
+
+POST_EXTRACT ?=rm -rf ${WRKSRC}/ext/fiddle/libffi-* \
+ ${WRKSRC}/tool/downloader.rb;
+
+# cc(1) uses too much ram to build ext/ripper/ripper.c
+# XXX remove arch if vmparam.h + login.conf give more than 1024M to pbuild
+.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Marm} || ${MACHINE_ARCH:Mhppa}
+CFLAGS_OVERRIDE = -O1
+.endif
+
+FIX_RIPPER ?= sed -i 's/%%CFLAGS_OVERRIDE%%/${CFLAGS_OVERRIDE}/g' \
+ ${WRKSRC}/ext/ripper/depend;
+
+PRE_INSTALL ?= find ${WRKSRC} -name '*.orig' -print0 | xargs -0r rm; \
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ruby \
+ ${PREFIX}/lib/ruby/gems/${REV}/extensions/${SUB} \
+ ${PREFIX}/lib/ruby/gems/${REV}/extensions/${SUB}/${REV};
# Ruby itself is clean, but some extensions (e.g. devel/ruby-therubyracer)
# need W|X mappings.
USE_WXNEEDED ?=Yes
REV ?= ${VERSION:R}
+BINREV ?= ${REV:S/.//}
SUB ?= ${MACHINE_ARCH:S/amd64/x86_64/}-openbsd
SUBST_VARS += SUB REV
FILESDIR ?=${.CURDIR}/../files
FIX_RBCONFIG ?=sed 's/INSTALL_ARGS/-c -o ${BINOWN} -g
${BINGRP}/' < \
${FILESDIR}/rbconfig_fix.rb >> \
-
${PREFIX}/lib/ruby/${RUBYLIBREV}/${SUB}/rbconfig.rb
+ ${PREFIX}/lib/ruby/${REV}/${SUB}/rbconfig.rb
Re: drop opencore-amr?
ping
On Sep 20 15:13:33, h...@stare.cz wrote:
> On Sep 20 15:05:01, h...@stare.cz wrote:
> > Below is a diff that unhooks opencore-amr from audio/Makefile
> > and removes the dependency from audio/sox, multimedia/imagination,
> > and telephony/pjsua. Please correct me where I missed something.
>
> On Sep 20 13:11:38, s...@spacehopper.org wrote:
> > multimedia/imagination just picks up the library dependency from sox.
> > Regen wantlib and bump REVISION to fix.
> > For telephony/pjsua just remove the dep/wantlib, add
> > --disable-opencore-amr to CONFIGURE_ARGS, and bump.
>
> Better diff below, except I don't know how to convey
> the actual removal of the audio/opencore-amr directory in a diff.
>
> Jan
>
>
> Index: audio/Makefile
> ===
> RCS file: /cvs/ports/audio/Makefile,v
> retrieving revision 1.391
> diff -u -p -r1.391 Makefile
> --- audio/Makefile17 Sep 2017 16:45:29 - 1.391
> +++ audio/Makefile20 Sep 2017 13:10:19 -
> @@ -142,7 +142,6 @@
> SUBDIR += ocp
> SUBDIR += oggtag
> SUBDIR += openal
> - SUBDIR += opencore-amr
> SUBDIR += opennap
> SUBDIR += opus
> SUBDIR += opus-tools
> Index: audio/sox/Makefile
> ===
> RCS file: /cvs/ports/audio/sox/Makefile,v
> retrieving revision 1.68
> diff -u -p -r1.68 Makefile
> --- audio/sox/Makefile22 Sep 2016 19:58:22 - 1.68
> +++ audio/sox/Makefile20 Sep 2017 13:10:19 -
> @@ -5,21 +5,19 @@ BROKEN-hppa = bend.c:155:12: internal co
> COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation
>
> DISTNAME=sox-14.4.2
> -REVISION=2
> +REVISION=3
> SHARED_LIBS += sox 4.0 # 3.0
>
> CATEGORIES= audio
> HOMEPAGE=http://sox.sourceforge.net/
> MAINTAINER= Jan Stary
>
> -# code is GPLv2+, however as opencore is under Apache License we must use
> -# sox under the terms of GPLv3 to avoid license conflict.
> +# GPLv2+
> PERMIT_PACKAGE_CDROM=Yes
>
> WANTLIB += c m z sndio
> WANTLIB += FLAC gsm mad id3tag mp3lame ogg
> WANTLIB += sndfile vorbis vorbisenc vorbisfile
> -WANTLIB += opencore-amrnb opencore-amrwb
> WANTLIB += opus opusfile twolame wavpack
> WANTLIB += iconv png
>
> @@ -35,7 +33,6 @@ LIB_DEPENDS=\
> audio/libogg\
> audio/libsndfile\
> audio/libvorbis \
> - audio/opencore-amr \
> audio/opus \
> audio/opusfile \
> audio/twolame \
> @@ -75,8 +72,8 @@ CONFIGURE_ARGS+=\
> --with-oggvorbis\
> --with-opus \
> --with-flac \
> - --with-amrwb\
> - --with-amrnb\
> + --without-amrwb \
> + --without-amrnb \
> --with-wavpack \
> --with-sndfile \
> --with-mp3 \
> Index: multimedia/imagination/Makefile
> ===
> RCS file: /cvs/ports/multimedia/imagination/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- multimedia/imagination/Makefile 22 Sep 2016 21:30:17 - 1.12
> +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 -
> @@ -2,7 +2,7 @@
>
> COMMENT =lightweight and simple DVD slide show maker
> DISTNAME = imagination-3.0
> -REVISION = 5
> +REVISION = 6
>
> CATEGORIES = multimedia
>
> @@ -17,8 +17,8 @@ WANTLIB += FLAC X11 Xcomposite Xcursor X
> WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig
> WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0 gtk-x11-2.0
> -WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg opencore-amrnb
> -WANTLIB += opencore-amrwb opus opusfile pango-1.0 pangocairo-1.0
> +WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg
> +WANTLIB += opus opusfile pango-1.0 pangocairo-1.0
> WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
> WANTLIB += sndfile sndio sox twolame vorbis vorbisenc vorbisfile
> WANTLIB += wavpack xcb xcb-render xcb-shm z
> Index: telephony/pjsua/Makefile
> ===
> RCS file: /cvs/ports/telephony/pjsua/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- telephony/pjsua/Makefile 5 Aug 2017 12:31:01 - 1.43
> +++ telephony/pjsua/Makefile 20 Sep 2017 13:10:43 -
> @@ -4,7 +4,7 @@ COMMENT-main= multimedia communication l
> COMMENT-pjsua= lightweight sip client
>
> V= 2.4.5
> -REVISION=2
> +REVISION=3
> DISTNAME=pjproject-$V
> PKGNAME-main=pjsip-$V
> PKGNAME-pjsua= pjsua-$V
> @@ -35,7 +35,7 @@ MASTER_SITES= ${HOMEPAGE}release/$V/
> #
Re: net/ircII: fix off-by-one in double_quote()
On Wed, Nov 01 2017, Theo Buehler wrote:
> any takers?
Looks good to me.
> On Tue, Oct 24, 2017 at 07:35:12PM +0200, Theo Buehler wrote:
>> The update to 20170704 broke tab completion, at least when running with
>> malloc.conf -> J. For example, typing '/msg '
>> on icb and holding down the tab-key for a while will crash ircII after a
>> while.
>>
>> The reason is that an off-by-one in double_quote() in source/ircaux.c
>> will prevent double_quote_work() from null terminating the returned
>> string. An example of a crash looks like this:
>>
>> #0 strlen () at /usr/src/lib/libc/arch/amd64/string/strlen.S:124
>> #1 0x101e17d32773 in malloc_strncat (ptr=0x7f7dc030,
>> src=0x1020f92f9ff0 "tb2", '\333' , > sequence \333>,
>> extra=0) at
>> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/ircaux.c:232
>> #2 0x101e17d32721 in malloc_strcat (ptr=0x7f7dc030,
>> src=0x1020f92f9ff0 "tb2", '\333' , > sequence \333>) at
>> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/ircaux.c:221
>> #3 0x101e17d08428 in expander_addition (buff=0x7f7dc030,
>> add=0x1020f92f9ff0 "tb2", '\333' , > sequence \333>,
>> length=0, quote_em=0x1020f92f9650 "\\^") at
>> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/alias.c:1360
>> #4 0x101e17d03c75 in alias_special_char (name=0x1021077f4340
>> "TK.GETMSG", lbuf=0x7f7dc030, ptr=0x10204fc8b8a6 " ",
>> args=0x1020f6738d4b "1 tb2 tb2", quote_em=0x1020f92f9650 "\\^",
>> args_flag=0x7f7dc0a4)
>> at /usr/ports/pobj/ircII-20170704/ircii-20170704/source/alias.c:1466
>> #5 0x101e17d0195f in expand_alias (name=0x1021077f4340 "TK.GETMSG",
>> string=0x1020c7fc5f98 "type ^U$tk.junk $^\\^^{[$($tk.msgcnt)]} ",
>> args=0x1020f6738d4b "1 tb2 tb2", args_flag=0x7f7dc0a4,
>> more_text=0x7f7dc0c0) at
>> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/alias.c:1625
>> (More stack frames follow...)
>
>
> Index: Makefile
> ===
> RCS file: /var/cvs/ports/net/ircII/Makefile,v
> retrieving revision 1.50
> diff -u -p -r1.50 Makefile
> --- Makefile 13 Oct 2017 14:56:22 - 1.50
> +++ Makefile 24 Oct 2017 14:48:38 -
> @@ -3,6 +3,7 @@
> COMMENT= Internet Relay Chat client
>
> VERSION= 20170704
> +REVISION=0
> DISTNAME=ircii-${VERSION}
> PKGNAME= ircII-${VERSION}
> CATEGORIES= net
> Index: patches/patch-source_ircaux_c
> ===
> RCS file: patches/patch-source_ircaux_c
> diff -N patches/patch-source_ircaux_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-source_ircaux_c 24 Oct 2017 14:45:30 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +fix off-by-one responsible for failing to null terminate dst
> +
> +Index: source/ircaux.c
> +--- source/ircaux.c.orig
> source/ircaux.c
> +@@ -965,7 +965,7 @@ double_quote(u_char *str, u_char *stuff)
> + return empty_string();
> +
> + dst = new_malloc(len + 1);
> +-len2 = double_quote_work(str, stuff, dst, len);
> ++len2 = double_quote_work(str, stuff, dst, len + 1);
> + if (len != len2)
> + yell("--- double_quote() error: len %zu len2 %zu", len, len2);
> +
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: net/ircII: fix off-by-one in double_quote()
any takers?
On Tue, Oct 24, 2017 at 07:35:12PM +0200, Theo Buehler wrote:
> The update to 20170704 broke tab completion, at least when running with
> malloc.conf -> J. For example, typing '/msg '
> on icb and holding down the tab-key for a while will crash ircII after a
> while.
>
> The reason is that an off-by-one in double_quote() in source/ircaux.c
> will prevent double_quote_work() from null terminating the returned
> string. An example of a crash looks like this:
>
> #0 strlen () at /usr/src/lib/libc/arch/amd64/string/strlen.S:124
> #1 0x101e17d32773 in malloc_strncat (ptr=0x7f7dc030,
> src=0x1020f92f9ff0 "tb2", '\333' , \333>, extra=0) at
> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/ircaux.c:232
> #2 0x101e17d32721 in malloc_strcat (ptr=0x7f7dc030,
> src=0x1020f92f9ff0 "tb2", '\333' , \333>) at
> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/ircaux.c:221
> #3 0x101e17d08428 in expander_addition (buff=0x7f7dc030,
> add=0x1020f92f9ff0 "tb2", '\333' , \333>, length=0,
> quote_em=0x1020f92f9650 "\\^") at
> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/alias.c:1360
> #4 0x101e17d03c75 in alias_special_char (name=0x1021077f4340
> "TK.GETMSG", lbuf=0x7f7dc030, ptr=0x10204fc8b8a6 " ",
> args=0x1020f6738d4b "1 tb2 tb2", quote_em=0x1020f92f9650 "\\^",
> args_flag=0x7f7dc0a4)
> at /usr/ports/pobj/ircII-20170704/ircii-20170704/source/alias.c:1466
> #5 0x101e17d0195f in expand_alias (name=0x1021077f4340 "TK.GETMSG",
> string=0x1020c7fc5f98 "type ^U$tk.junk $^\\^^{[$($tk.msgcnt)]} ",
> args=0x1020f6738d4b "1 tb2 tb2", args_flag=0x7f7dc0a4,
> more_text=0x7f7dc0c0) at
> /usr/ports/pobj/ircII-20170704/ircii-20170704/source/alias.c:1625
> (More stack frames follow...)
Index: Makefile
===
RCS file: /var/cvs/ports/net/ircII/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile13 Oct 2017 14:56:22 - 1.50
+++ Makefile24 Oct 2017 14:48:38 -
@@ -3,6 +3,7 @@
COMMENT= Internet Relay Chat client
VERSION= 20170704
+REVISION= 0
DISTNAME= ircii-${VERSION}
PKGNAME= ircII-${VERSION}
CATEGORIES=net
Index: patches/patch-source_ircaux_c
===
RCS file: patches/patch-source_ircaux_c
diff -N patches/patch-source_ircaux_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-source_ircaux_c 24 Oct 2017 14:45:30 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+fix off-by-one responsible for failing to null terminate dst
+
+Index: source/ircaux.c
+--- source/ircaux.c.orig
source/ircaux.c
+@@ -965,7 +965,7 @@ double_quote(u_char *str, u_char *stuff)
+ return empty_string();
+
+ dst = new_malloc(len + 1);
+- len2 = double_quote_work(str, stuff, dst, len);
++ len2 = double_quote_work(str, stuff, dst, len + 1);
+ if (len != len2)
+ yell("--- double_quote() error: len %zu len2 %zu", len, len2);
+
MAINTAINER UPDATE: puppet5 and puppetdb5
This brings puppet up to the latest 5.3.2, as well as puppetdb to 5.1.1. Works for me on my puppetmaster (with gunicorn behind nginx), also puppet4 clients still seem to be fine. Put the puppetdb as databases/puppetdb5 as it was done similarily for puppetdb4. Puppet5 to live in sysutils/ruby-puppet/5 When they get in, plan is to unlink databases/puppetdb4 and sysutils/ruby-puppet/4 from build. To make the Puppet5 port to build, manually remove the two lines regarding emacs from sysutils/ruby-puppet/Makefile.inc from the post-install target. That part is not included in the tarball. Afterward, clean up the tree from old puppet and puppetdb versions as well as dependencies for these older versions. Any Puppet users around and willing to test, or otherwise comments, OK? puppet5.tar.gz Description: application/gzip puppetdb5.tar.gz Description: application/gzip
UPDATE py-sphinx_guzzle_theme
The Makefile for textproc/py-sphinx_guzzle_theme contains an error in the
MAINTAINER line. Diff below corrects my mistake.
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git textproc/py-sphinx_guzzle_theme/Makefile
textproc/py-sphinx_guzzle_theme/Makefile
index 9ba705d1c30..c5b5a162e6f 100644
--- textproc/py-sphinx_guzzle_theme/Makefile
+++ textproc/py-sphinx_guzzle_theme/Makefile
@@ -3,12 +3,13 @@
COMMENT = sphinx theme used by guzzle
MODPY_EGG_VERSION =0.7.11
+REVISION = 0
DISTNAME = guzzle_sphinx_theme-${MODPY_EGG_VERSION}
PKGNAME = py-sphinx_guzzle_theme-${MODPY_EGG_VERSION}
CATEGORIES = textproc
-MAINTAINER = Bjorn Ketelaars
+MAINTAINER = Bjorn Ketelaars
# MIT/OFL
PERMIT_PACKAGE_CDROM = Yes
UPDATE lastpass-cli 1.2.2
The diff below brings lastpass-cli to the latest version. Changelog can be
found at https://github.com/lastpass/lastpass-cli/releases/tag/v1.2.2
Comments / OK's?
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git security/lastpass-cli/Makefile security/lastpass-cli/Makefile
index d923eed42b7..e4e46ce055a 100644
--- security/lastpass-cli/Makefile
+++ security/lastpass-cli/Makefile
@@ -4,8 +4,7 @@ COMMENT = LastPass command line interface tool
GH_ACCOUNT = lastpass
GH_PROJECT = lastpass-cli
-GH_TAGNAME = v1.2.1
-REVISION = 0
+GH_TAGNAME = v1.2.2
CATEGORIES = security
MAINTAINER = Bjorn Ketelaars
diff --git security/lastpass-cli/distinfo security/lastpass-cli/distinfo
index ace40671eac..2bbf379ee21 100644
--- security/lastpass-cli/distinfo
+++ security/lastpass-cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lastpass-cli-1.2.1.tar.gz) =
GkmjemepcyluIYMG5tNsk4M0exgz5ah468CDVbHHdFY=
-SIZE (lastpass-cli-1.2.1.tar.gz) = 108780
+SHA256 (lastpass-cli-1.2.2.tar.gz) =
Jsk65hCTITnayv8uD5FsVije9Iu0EptAmRAc9ObHxJk=
+SIZE (lastpass-cli-1.2.2.tar.gz) = 110045
diff --git security/lastpass-cli/patches/patch-http_c
security/lastpass-cli/patches/patch-http_c
deleted file mode 100644
index 323bf3aee97..000
--- security/lastpass-cli/patches/patch-http_c
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-http_c,v 1.1 2017/09/29 15:56:40 sthen Exp $
-
-From 68cfae08b22954fe952cfe590daa4b81a7f7124b Mon Sep 17 00:00:00 2001
-Date: Fri, 29 Sep 2017 14:06:25 +0200
-Subject: [PATCH] use-after-free bug in http.c
-
-Index: http.c
http.c.orig
-+++ http.c
-@@ -310,8 +310,8 @@ char *http_post_lastpass_v_noexit(const char *server,
- ret = curl_easy_perform(curl);
- unset_interrupt_detect();
-
-- curl_easy_cleanup(curl);
- curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, http_code);
-+ curl_easy_cleanup(curl);
- *curl_ret = ret;
-
- if (ret != CURLE_OK) {
Re: UPDATE: borgbackup 1.1.1
On Thu 26/10/2017 15:13, Björn Ketelaars wrote: > As of yet a diff for bringing borgbackup to 1.1.0 [0] has not been picked up. > In the meantime borgbackup 1.1.1 has been released, which fixes some bugs. > I've been running this version on amd64 for a couple of days without any > issues. Restoring an (old) backup works as advertised. > > make test outputs: > > 1142 passed, 185 skipped, 2 xfailed in 1392.05 seconds > > OK? > Any comments / OK's?
Re: UPDATE: www/py-flask-wtf 0.9.4 to 0.14.2
Hi,
this is still needed for an update of puppetboard.
On Monday, October 23, 2017 15:52 CEST, "Sebastian Reitenbach"
wrote:
> On Friday, October 20, 2017 11:43 CEST, Stuart Henderson
> wrote:
>
> > On 2017/10/19 10:43, Sebastian Reitenbach wrote:
> > > Hi,
> > >
> > > My bad, bcallah@ pointed out that it's not building with python 2.7,
> > > seems I only tested with python3 flavor.
> > >
> > > The post-install running sphinx fails, the get_distribution('Flask-WTF')
> > > for setuptools works well
> > > with the python3 flavor, but fails with a DistributionNotFound error with
> > > python 2.7.
> > > The current version doesn't use get_distribution there, but just had the
> > > version and release
> > > hardcoded, so I took the same approach.
> > >
> > > If someone has a cluebat why the get_distribution() call fails with
> > > python2.7, I'd be all ears,
> > > otherwise, this seems to do the trick.
> >
> > Have you asked upstream? If people are having problems using it on py2.7
> > they'd probably like to know..
> >
>
> good point, I opened this here:
> https://github.com/lepture/flask-wtf/issues/310
>
> for the time being, would my way around the issue OK?
> I'd add the link to the issue to the patch file.
link to PR added to the patch, any other comments, rants, OK?
Index: Makefile
===
RCS file: /cvs/ports/www/py-flask-wtf/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile3 Jan 2017 19:28:48 - 1.10
+++ Makefile1 Nov 2017 09:34:27 -
@@ -2,10 +2,9 @@
COMMENT= simple integration of Flask and WTForms
-MODPY_EGG_VERSION=0.9.4
+MODPY_EGG_VERSION=0.14.2
DISTNAME= Flask-WTF-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME:L}
-REVISION= 5
CATEGORIES=www
# BSD
@@ -27,6 +26,11 @@
TEST_DEPENDS= devel/py-nose
USE_GMAKE= Yes
+
+MAIN_VERSION = ${MODPY_EGG_VERSION:C/.[0-9]$//}
+SUBST_VARS += MAIN_VERSION
+pre-build:
+ ${SUBST_CMD} ${WRKSRC}/docs/conf.py
post-build:
@cd ${WRKSRC}/docs && \
Index: distinfo
===
RCS file: /cvs/ports/www/py-flask-wtf/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo27 Dec 2013 09:24:04 - 1.1.1.1
+++ distinfo1 Nov 2017 09:34:27 -
@@ -1,2 +1,2 @@
-SHA256 (Flask-WTF-0.9.4.tar.gz) = RqGOEabiEvESCo9AcrgUyDPoLzaa8kEbG0Kok5ns6/k=
-SIZE (Flask-WTF-0.9.4.tar.gz) = 245677
+SHA256 (Flask-WTF-0.14.2.tar.gz) = XRTVXP019hPZnufLoPw/u+Y7oC9UTTSRWMFMoVVhzDY=
+SIZE (Flask-WTF-0.14.2.tar.gz) = 254903
Index: patches/patch-docs_conf_py
===
RCS file: patches/patch-docs_conf_py
diff -N patches/patch-docs_conf_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-docs_conf_py 1 Nov 2017 09:34:27 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+For python 2.7, the get_distribution fails with:
+raise DistributionNotFound(req, requirers)
+DistributionNotFound: The 'Flask-WTF' distribution was not found and is
+required by the application
+
+hardcode the version and release as prior versions of flask-wtf did.
+see: https://github.com/lepture/flask-wtf/issues/310
+
+Index: docs/conf.py
+--- docs/conf.py.orig
docs/conf.py
+@@ -49,11 +49,11 @@ author = 'Dan Jacob'
+ # The version info for the project you're documenting, acts as replacement for
+ # |version| and |release|, also used in various other places throughout the
+ # built documents.
+-dist = get_distribution('Flask-WTF')
++#dist = get_distribution('Flask-WTF')
+ # The short X.Y version.
+-version = '.'.join(dist.version.split('.', 2)[:2])
++version = '${MAIN_VERSION}'
+ # The full version, including alpha/beta/rc tags.
+-release = dist.version
++release = '${MODPY_EGG_VERSION}'
+
+ # The language for content autogenerated by Sphinx. Refer to documentation
+ # for a list of supported languages.
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 27 Dec 2013 09:24:04 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2013/12/27 09:24:04 jasper Exp $
setup.py.orig Fri Dec 27 10:22:02 2013
-+++ setup.py Fri Dec 27 10:22:08 2013
-@@ -51,7 +51,6 @@ setup(
- ],
- tests_require=[
- 'nose',
--'Flask-Babel',
- ],
- classifiers=[
- 'Development Status :: 4 - Beta',
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-flask-wtf/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 31 May 2016 13:43:15 - 1.4
+++ pkg/PLIST 1 Nov 2017 09:34:27 -
@@ -72,12 +72,10 @@
share/doc/${MODPY_PY_PREFIX}flask-wtf/config.html
share/doc/${MODPY_PY_PREFIX}flask-w
Re: NEW: textproc/py-commonmark
still needed for an puppetboard update. reattached for ease of review, any comments, remarks or OK? cheers, Sebastian On Monday, October 23, 2017 15:56 CEST, "Sebastian Reitenbach" wrote: > On Tuesday, October 17, 2017 23:42 CEST, "Sebastian Reitenbach" > wrote: > > > cat pkg/DESCR > > Python parser for the CommonMark Markdown spec. > > > > this is a new required dependency for www/puppetboard update > > > > comments, OK? > anyone? > py-commonmark.tar.gz Description: application/gzip
Re: OpenBSD ports: PostgreSQL PL/R
Jeremy Evans wrote: > Indeed. I worked on a port for PL/R during p2k12, but it never received an > OK and didn't get committed: > > https://marc.info/?l=openbsd-ports&m=134987038209838&w=2 > > If anyone wants to give a shot at updating that port or submitting a new > port for PL/R within a week, I'll be happy to review it. Based on your existing work it was easy to update (see attachment). "OK feinerer@" if you want to import it after your review. Remarks: - I had to increase openfiles in login.conf (as suggested in the "Tuning for busy servers" section of databases/postgresql/pkg/README-server) so that R is able to initialize. I do not know if that is worth a pkg/MESSAGE. Your original note in your pkg/MESSAGE on pthread seems no issue any longer. - "make port-lib-depends-check" reports Bogus WANTLIB: R.33 (/usr/local/lib/postgresql/plr.so) (NOT REACHABLE) I *think* this is fine in this case because of the RPATH mangling (and there is a proper LIB_DEPENDS). Works fine for me on amd64 (tested with "CREATE EXTENSION plr;" and then several examples from expected/plr.out (located in $WRKDIST after "make extract")). Best regards, Ingo postgresql-plr.tar.gz Description: application/tar-gz
