Re: UPDATE: archivers/libtar
Rafael Sadowskiwrites: > Hi @ports, > > I found this port because the HOMEPAGE is unreachable. The diff fix > MASTER_SITES and update to last stable release. > > Okay? Comments? Comments and updated diff below, > Kind regards, > > Rafael > > Index: Makefile > === > RCS file: /cvs/ports/archivers/libtar/Makefile,v > retrieving revision 1.13 > diff -u -p -u -p -r1.13 Makefile > --- Makefile 24 Nov 2015 09:11:02 - 1.13 > +++ Makefile 25 Sep 2016 20:08:24 - > @@ -2,25 +2,39 @@ > > COMMENT= C library for manipulating tar files > > -DISTNAME=libtar-1.2.11 > -REVISION=2 > +VERSION= 1.2.20 > +DISTNAME=libtar-${VERSION} > > -SHARED_LIBS= tar 0.0 # .1.2 > +SHARED_LIBS= tar 0.1 # .1.3 0.1 is right, but there is no .1.3 version-info upstream. > CATEGORIES= archivers devel > > -HOMEPAGE=http://www.feep.net/libtar/ > - > # BSD-like > PERMIT_PACKAGE_CDROM=Yes > > WANTLIB= c z > > -MASTER_SITES=https://distfiles.nl/ \ > - ftp://ftp.feep.net/pub/software/libtar/ > +DISTFILES= libtar-{libtar/archive/}v${VERSION}${EXTRACT_SUFX} > +MASTER_SITES=https://github.com/tklauser/ Instead of those, better use GH_* variables. However, I'm a bit unsure whether we want to use this repo and not http://repo.or.cz/w/libtar.git/ "This is a maintenance repo for the libtar project, temporarily run by Chris Frey until Mark Roth decides to pick up development again. No tarball releases will be done, but just grab the tagged sources from this repo. If you wish to contribute a patch, feel free to post to the libtar mailing list, where Chris Frey and Mark Roth hang out." Well, the mailing-list seems down down. The guy at github cloned the repo, the few modifications he added seem valuable but there aren't any additional tags compared to the repo.or.cz > + > +BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ > + ${MODGNU_AUTOMAKE_DEPENDS} > + > +USE_GMAKE= Yes > +CONFIGURE_STYLE= gnu > + > +MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" Not needed. > +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ > + LDFLAGS="-L${LOCALBASE}/lib" Not needed. > +AUTOCONF_VERSION=2.69 > +AUTOMAKE_VERSION=1.11 > > -NO_TEST= Yes > +NO_TEST= Yes > > -CONFIGURE_STYLE=gnu > +pre-configure: > + cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ > + AUTOCONF_VERSION=${AUTOCONF_VERSION} autoreconf --force > --install Index: Makefile === RCS file: /d/cvs/ports/archivers/libtar/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile24 Nov 2015 09:11:02 - 1.13 +++ Makefile2 Nov 2016 01:14:08 - @@ -2,25 +2,33 @@ COMMENT= C library for manipulating tar files -DISTNAME= libtar-1.2.11 -REVISION= 2 +GH_ACCOUNT=tklauser +GH_PROJECT=libtar +GH_TAGNAME=v1.2.20 -SHARED_LIBS= tar 0.0 # .1.2 +SHARED_LIBS= tar 0.1 # unknown CATEGORIES=archivers devel -HOMEPAGE= http://www.feep.net/libtar/ - # BSD-like PERMIT_PACKAGE_CDROM= Yes WANTLIB= c z -MASTER_SITES= https://distfiles.nl/ \ - ftp://ftp.feep.net/pub/software/libtar/ +BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/libtool + +USE_GMAKE= Yes +CONFIGURE_STYLE= gnu + +AUTOCONF_VERSION= 2.69 +AUTOMAKE_VERSION= 1.11 -NO_TEST= Yes +NO_TEST= Yes -CONFIGURE_STYLE=gnu +pre-configure: + cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} autoreconf --force --install .include Index: distinfo === RCS file: /d/cvs/ports/archivers/libtar/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo4 Apr 2013 16:03:55 - 1.2 +++ distinfo2 Nov 2016 00:56:39 - @@ -1,2 +1,2 @@ -SHA256 (libtar-1.2.11.tar.gz) = Si7vtrcIj0HeVzVuUFnL8fkXUJtKgQ98YUYlo3joe7g= -SIZE (libtar-1.2.11.tar.gz) = 145354 +SHA256 (libtar-1.2.20.tar.gz) = MVL8Yc8DyC77+ZZFWW79rbopfqw+haUq4YmQKgcsmhY= +SIZE (libtar-1.2.20.tar.gz) = 63544 Index: patches/patch-lib_Makefile_in === RCS file: patches/patch-lib_Makefile_in diff -N patches/patch-lib_Makefile_in --- patches/patch-lib_Makefile_in 10 Oct 2013 07:02:56 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,35 +0,0 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.3 2013/10/10 07:02:56 jasper Exp $ - -Enable shared library, from pkgsrc. - lib/Makefile.in.orig Sun Dec 15 19:02:30 2002 -+++ lib/Makefile.inThu Oct 10 08:59:32 2013 -@@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: czark...@cvs.openbsd.org2016/11/01 17:50:23 Modified files: net/ucspi-tcp : Makefile distinfo Log message: New revision of ipv6 patch removes duplicate text in tcpclient.1 and tcpsetver.1 manual pages. No changes in generated binaries. OK MAINTAINER
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/11/01 16:26:34 Modified files: x11/gnome/anjuta: Makefile x11/gnome/builder: Makefile x11/gnome/color-manager: Makefile x11/gnome/vinagre: Makefile Log message: Bump GNOME ports that have pcre2 in WANTLIB so that they get updated.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2016/11/01 16:26:18 Modified files: editors/zile : Makefile distinfo Log message: Update for Zile to 2.4.13: OK naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 16:20:46 Modified files: devel/pcre2: Makefile Log message: move USE_WXNEEDED to the top of the file as per common practice
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 16:19:23 Modified files: devel/vte3 : Makefile x11/gnome/terminal: Makefile Log message: update LDEP to use the fixed pcre2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 16:18:36 Modified files: devel/pcre2: Makefile Log message: update pkgconfig files to propagate wxneeded to dependant ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2016/11/01 16:17:55 Modified files: devel/py-tox : Makefile distinfo Log message: Update to py-tox-2.4.1
[UPDATE] www/ap2-mod_perl to 2.0.10
Oh my! mod_perl released a new version that includes the perl 5.22+ patches! https://metacpan.org/pod/release/SHAY/mod_perl-2.0.10/Changes Anyone who actually uses this want to test? I was able to get all the tests passing except one that seems to be a problem in others are seeing: http://marc.info/?l=apache-modperl=147541037913776=2 More details and showing it happened in 2.09, but still no response: http://www.gossamer-threads.com/lists/modperl/modperl/108837 Index: Makefile === RCS file: /cvs/ports/www/ap2-mod_perl/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- Makefile12 Oct 2016 11:05:05 - 1.39 +++ Makefile1 Nov 2016 21:58:50 - @@ -2,8 +2,7 @@ COMMENT= module that embeds a Perl interpreter into Apache2 -DISTNAME= mod_perl-2.0.9 -REVISION= 2 +DISTNAME= mod_perl-2.0.10 PKGNAME= ap2-${DISTNAME:S/-rc/rc/} CATEGORIES=www net @@ -23,6 +22,9 @@ LIB_DEPENDS= converters/libiconv \ devel/apr-util RUN_DEPENDS= www/apache-httpd BUILD_DEPENDS= ${RUN_DEPENDS} + +# Addtional dependencies to avoid skipping tests +TEST_DEPENDS= devel/p5-BSD-Resource PORTHOME= ${WRKDIR} Index: distinfo === RCS file: /cvs/ports/www/ap2-mod_perl/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo28 Apr 2016 16:41:22 - 1.7 +++ distinfo1 Nov 2016 21:58:50 - @@ -1,2 +1,2 @@ -SHA256 (mod_perl-2.0.9.tar.gz) = AmDyardxwclfrcZ1RLNADkILswuKd1ZdLQKtBUmO9Ss= -SIZE (mod_perl-2.0.9.tar.gz) = 3846584 +SHA256 (mod_perl-2.0.10.tar.gz) = 0c+D7U6jqd/Oqm2WYv9kUXcJB0mIEJMFECC/QvmHK2Q= +SIZE (mod_perl-2.0.10.tar.gz) = 3846211 Index: patches/patch-src_modules_perl_mod_perl_c === RCS file: patches/patch-src_modules_perl_mod_perl_c diff -N patches/patch-src_modules_perl_mod_perl_c --- patches/patch-src_modules_perl_mod_perl_c 12 Oct 2016 11:05:05 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,37 +0,0 @@ -$OpenBSD: patch-src_modules_perl_mod_perl_c,v 1.1 2016/10/12 11:05:05 sthen Exp $ - -From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 -From: Steve Hay-Date: Tue, 1 Dec 2015 17:39:43 + -Subject: [PATCH] Add support for Perl 5.22.x. - src/modules/perl/mod_perl.c.orig Thu Jun 18 21:13:55 2015 -+++ src/modules/perl/mod_perl.cWed Oct 12 11:51:59 2016 -@@ -262,6 +262,8 @@ PerlInterpreter *modperl_startup(server_rec *s, apr_po - exit(1); - } - -+modperl_env_init(aTHX); -+ - /* suspend END blocks to be run at server shutdown */ - endav = PL_endav; - PL_endav = (AV *)NULL; -@@ -576,9 +578,6 @@ static apr_status_t modperl_sys_init(void) - /* modifies PL_ppaddr */ - modperl_perl_pp_set_all(); - --/* modifies PL_vtbl_env{elem} */ --modperl_env_init(); -- - return APR_SUCCESS; - } - -@@ -596,8 +595,6 @@ static apr_status_t modperl_sys_term(void *data) - MP_PERL_FREE_THREAD_KEY_WORKAROUND; - - MP_TRACE_i(MP_FUNC, "mod_perl sys term"); -- --modperl_env_unload(); - - modperl_perl_pp_unset_all(); - Index: patches/patch-src_modules_perl_modperl_env_c === RCS file: patches/patch-src_modules_perl_modperl_env_c diff -N patches/patch-src_modules_perl_modperl_env_c --- patches/patch-src_modules_perl_modperl_env_c12 Oct 2016 11:05:05 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,160 +0,0 @@ -$OpenBSD: patch-src_modules_perl_modperl_env_c,v 1.1 2016/10/12 11:05:05 sthen Exp $ - -From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 -From: Steve Hay -Date: Tue, 1 Dec 2015 17:39:43 + -Subject: [PATCH] Add support for Perl 5.22.x. - -From a6629db9dacd3c6152df599397cfa913928d18d2 Mon Sep 17 00:00:00 2001 -From: Steve Hay -Date: Fri, 4 Mar 2016 08:23:32 + -Subject: [PATCH] Fix compile errors since SVN revision 1717474 for unthreaded perl - src/modules/perl/modperl_env.c.origWed Oct 12 11:52:43 2016 -+++ src/modules/perl/modperl_env.c Wed Oct 12 11:52:36 2016 -@@ -121,6 +121,7 @@ static void modperl_env_table_populate(pTHX_ apr_table - const apr_array_header_t *array; - apr_table_entry_t *elts; - -+modperl_env_init(aTHX); - modperl_env_untie(mg_flags); - - array = apr_table_elts(table); -@@ -431,14 +432,10 @@ void modperl_env_request_untie(pTHX_ request_rec *r) - #endif - } - --/* to store the original virtual tables -- * these are global, not per-interpreter -+/* handy access to perl's original virtual tables - */ --static MGVTBL MP_PERL_vtbl_env; --static MGVTBL MP_PERL_vtbl_envelem; -- - #define MP_PL_vtbl_call(name, meth) \ --
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2016/11/01 16:11:23 Modified files: devel/ocaml-dose: Makefile Log message: Oops. Missed one REVISION bump. Update ocaml-pcre to 7.2.3. Bump revision of ports depending on ocaml-pcre.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2016/11/01 16:10:24 Modified files: devel/py-setproctitle: Makefile distinfo devel/py-setproctitle/patches: patch-Makefile patch-tests_pyrun_c patch-tests_setproctitle_test_py devel/py-setproctitle/pkg: PLIST Log message: Update to py-setproctitle-1.1.10 ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2016/11/01 16:02:59 Modified files: devel/coccinelle: Makefile devel/ocaml-net: Makefile devel/ocaml-pcre: Makefile distinfo textproc/ocaml-text: Makefile Added files: devel/ocaml-pcre/patches: patch-_oasis patch-myocamlbuild_ml patch-setup_ml Log message: Update ocaml-pcre to 7.2.3. Bump revision of ports depending on ocaml-pcre.
Re: krb5-config --libs
Jiri Bwrites: > On Tue, Nov 01, 2016 at 10:30:22AM +0100, Jeremie Courreges-Anglas wrote: >> Using only your diff I can't get gssapi detected. I suspect you have >> local changes somewhere, perhaps in krb5-config? > > Could it be caused by shlib_dirs="/usr/local/heimdal/lib" in my rc.conf.local? Ah, yes indeed. Please always state this when you send mails regarding heimdal. ;) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2016/11/01 15:55:04 ports/devel/ocaml-pcre/patches Update of /cvs/ports/devel/ocaml-pcre/patches In directory cvs.openbsd.org:/tmp/cvs-serv89499/patches Log Message: Directory /cvs/ports/devel/ocaml-pcre/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 15:25:05 Modified files: graphics/gprof2dot: Makefile distinfo Log message: update to gprof2dot-2016.10.13
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 15:15:23 Modified files: games/xcowsay : Makefile distinfo Log message: update to xcowsay-1.4
Re: GHC in snapshots with non-existent ld.
On 2016/11/01 17:12, Matthias Kilian wrote: > I'll try to revert my latest USE_WXNEEDED change in lang/ghc and > again explicitely pass -Wl,-z,wxneeded to the linker (which would > then be /usr/bin/ld or just ld). > > That would be the diff below. > > I keep the USE_WXNEEDED but leaving it commented out, so people > know why it's done this way. > > Any comments about this? That makes sense to me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 15:07:25 Modified files: editors/joe: Makefile distinfo editors/joe/pkg: PLIST Log message: update to joe-4.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/11/01 15:07:18 Modified files: x11/gnome/todo : Makefile distinfo x11/gnome/todo/pkg: PLIST Log message: Update to gnome-todo-3.22.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 15:05:37 Modified files: net/isc-bind : Tag: OPENBSD_6_0 Makefile distinfo Removed files: net/isc-bind/patches: Tag: OPENBSD_6_0 patch-lib_isc_unix_socket_c Log message: update to BIND 9.10.4-P1, fixing a resolver DoS in DNAME handling. CVE-2016-8864
Re: GHC in snapshots with non-existent ld.
Hi, On Tue, Nov 01, 2016 at 09:45:32PM +0100, Karel Gardas wrote: > On Tue, Nov 1, 2016 at 5:12 PM, Matthias Kilian> wrote: > > -# XXX: wxneeded is a hack. Fix rts/Linker.c, mmapForLinker() and > > -# loadObj_() instead. > > -USE_WXNEEDED = Yes > > +# We can't use the wrapper script, because it then gets hardcoded into > > +# the packaged ghc. So we explicitely use -Wl,-z,wxneeded (see > > +# CONFIGURE_ENV below) > > +# USE_WXNEEDED = Yes > > > > WANTLIB += c iconv m ncursesw pthread util > > > > @@ -106,12 +107,14 @@ CFLAGS += -fno-pie > > CONFIGURE_STYLE = gnu > > CONFIGURE_ARGS += --with-iconv-includes=${LOCALBASE}/include \ > > --with-iconv-libraries=${LOCALBASE}/lib > > Have you tried to use USE_WXNEEDED = Yes and add > CONFIGURE_ARGS += --with-ld=/usr/bin/ld This would probably cause the build to not use the ld wrapper script, ending with ghc binaries linked without -Wl,-z,wxneeded. I don't even watn to spend time on trying it. Ciao, Kili
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 15:02:03 Modified files: net/isc-bind : Makefile distinfo Removed files: net/isc-bind/patches: patch-lib_isc_unix_socket_c Log message: update to BIND 9.10.4-P1, fixing a resolver DoS in DNAME handling. CVE-2016-8864
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 14:53:21 Modified files: sysutils/ggrep : Makefile distinfo Log message: maintenance update to 2.26
Re: GHC in snapshots with non-existent ld.
On Tue, Nov 1, 2016 at 5:12 PM, Matthias Kilianwrote: > -# XXX: wxneeded is a hack. Fix rts/Linker.c, mmapForLinker() and > -# loadObj_() instead. > -USE_WXNEEDED = Yes > +# We can't use the wrapper script, because it then gets hardcoded into > +# the packaged ghc. So we explicitely use -Wl,-z,wxneeded (see > +# CONFIGURE_ENV below) > +# USE_WXNEEDED = Yes > > WANTLIB += c iconv m ncursesw pthread util > > @@ -106,12 +107,14 @@ CFLAGS += -fno-pie > CONFIGURE_STYLE = gnu > CONFIGURE_ARGS += --with-iconv-includes=${LOCALBASE}/include \ > --with-iconv-libraries=${LOCALBASE}/lib Have you tried to use USE_WXNEEDED = Yes and add CONFIGURE_ARGS += --with-ld=/usr/bin/ld ? Anyway, thanks for fixing this, Karel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 14:43:14 Modified files: sysutils/ansible/patches: patch-lib_ansible_module_utils_facts_py Log message: dmi facts merged upstream
Re: UPDATE: graphics/opencv
On 2016/11/01 19:01, Rafael Sadowski wrote: > I do not want to give up. Maybe someone in the Budapest hackroom ;) I'm not there but I'll have a look. > > > ONLY_FOR_ARCHS = ${GCC4_ARCHS} > > > -ONLY_FOR_ARCHS-java =amd64 i386 > > > +ONLY_FOR_ARCHS-java =${ONLY_FOR_ARCHS} This is redundant, setting ONLY_FOR_ARCHS sets the variable for all subpackages, so there's no point writing "+ONLY_FOR_ARCHS-anything = ${ONLY_FOR_ARCHS}". > > > -SHARED_LIBS =opencv_calib3d 1.1 #1.2 > > > -SHARED_LIBS += opencv_contrib 1.1 #1.2 > > > -SHARED_LIBS += opencv_core 1.1 #1.2 > > > -SHARED_LIBS += opencv_features2d 1.1 #1.2 > > > -SHARED_LIBS += opencv_flann1.1 #1.2 > > > -SHARED_LIBS += opencv_gpu 1.1 #1.2 > > > -SHARED_LIBS += opencv_highgui 1.1 #1.2 > > > -SHARED_LIBS += opencv_imgproc 1.1 #1.2 > > > -SHARED_LIBS += opencv_legacy 1.1 #1.2 > > > -SHARED_LIBS += opencv_ml 1.1 #1.2 > > > -SHARED_LIBS += opencv_nonfree 0.1 #0.2 > > > -SHARED_LIBS += opencv_objdetect1.1 #1.2 > > > -SHARED_LIBS += opencv_photo0.1 #0.2 > > > -SHARED_LIBS += opencv_stitching0.1 #0.2 > > > -SHARED_LIBS += opencv_superres 0.1 #0.2 > > > -SHARED_LIBS += opencv_ts 0.1 #0.2 > > > -SHARED_LIBS += opencv_video1.1 #1.2 > > > -SHARED_LIBS += opencv_videostab0.1 #0.2 > > > -SHARED_LIBS += opencv_ocl 0.1 #2.5 > > > +SHARED_LIBS =opencv_calib3d 1.2 #1.3 > > > +SHARED_LIBS += opencv_contrib 1.2 #1.3 > > > +SHARED_LIBS += opencv_core 1.2 #1.3 > > > +SHARED_LIBS += opencv_features2d 1.2 #1.3 > > > +SHARED_LIBS += opencv_flann1.2 #1.3 > > > +SHARED_LIBS += opencv_gpu 1.2 #1.3 > > > +SHARED_LIBS += opencv_highgui 1.2 #1.3 > > > +SHARED_LIBS += opencv_imgproc 1.2 #1.3 > > > +SHARED_LIBS += opencv_legacy 1.2 #1.3 > > > +SHARED_LIBS += opencv_ml 1.2 #1.3 > > > +SHARED_LIBS += opencv_nonfree 0.2 #0.3 > > > +SHARED_LIBS += opencv_objdetect1.2 #1.3 > > > +SHARED_LIBS += opencv_photo0.2 #0.3 > > > +SHARED_LIBS += opencv_stitching0.2 #0.3 > > > +SHARED_LIBS += opencv_superres 0.2 #0.3 > > > +SHARED_LIBS += opencv_ts 0.2 #0.3 > > > +SHARED_LIBS += opencv_video1.2 #1.3 > > > +SHARED_LIBS += opencv_videostab0.2 #0.3 > > > +SHARED_LIBS += opencv_ocl 0.2 #2.6 It looks like you've just bumped the shared library minor by 1 for everything here. That isn't how this works. Unless you're going to properly check ABI compatibility and selectively bump where needed, the only safe thing to do is bump major. For this port I think you might as well just do it like this and be done with it. .for i in opencv_calib3d opencv_contrib opencv_core opencv_features2d \ opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy \ opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_stitching \ opencv_superres opencv_ts opencv_video opencv_videostab opencv_ocl SHARED_LIBS += $i 2.0 .endfor > > > @@ -122,11 +119,12 @@ CONFIGURE_ARGS =-DBUILD_opencv_nonfree: > > > -DWITH_PNG:Bool=On \ > > > -DWITH_TIFF:Bool=On \ > > > -DWITH_V4L:Bool=Off \ > > > + -DENABLE_SSE3:Bool=Off \ Is this really needed on amd64? Only the first couple of generations of 64-bit-capable AMDs (2003/2004) lack SSE3, I only spot one such machine in the current rotation of dmesglog (since Jan 2015) and the things depending on this library in ports don't *really* look like things you'd run on such a machine.. I'm testing this diff now (it has a bit of other cleanup too), what do you think? Index: Makefile === RCS file: /cvs/ports/graphics/opencv/Makefile,v retrieving revision 1.37 diff -u -p -r1.37 Makefile --- Makefile15 Apr 2016 08:53:49 - 1.37 +++ Makefile1 Nov 2016 20:28:55 - @@ -1,83 +1,65 @@ # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $ ONLY_FOR_ARCHS = ${GCC4_ARCHS} -ONLY_FOR_ARCHS-java = amd64 i386 CATEGORIES = graphics devel
Re: krb5-config --libs (was: Re: building curl with gssapi disables ssl)
On Tue, Nov 01, 2016 at 10:30:22AM +0100, Jeremie Courreges-Anglas wrote: > Using only your diff I can't get gssapi detected. I suspect you have > local changes somewhere, perhaps in krb5-config? Could it be caused by shlib_dirs="/usr/local/heimdal/lib" in my rc.conf.local? > Using the following heimdal diff, I have curl detect both gssapi and > libssl. > > - krb5-config --libs should pass -R/usr/local/heimdal/libs to help ld.so > find heimdal libs at runtime > - krb5-config --libs should pass -L/usr/local/lib because that's where > libcom_err is. If we add only -R/usr/local/heimdal/lib, later tests > for functions in libcrypto/libssl fail because libcom_err isn't in the > library search path. > > Robert, any opinion regarding the following patch? With the path and my original path I was able to build curl with gssapi and ssl: $ curl -V curl 7.50.3 (x86_64-unknown-openbsd6.0) libcurl/7.50.3 LibreSSL/2.0.0 zlib/1.2.3 libidn/1.33 nghttp2/1.16.0 Protocols: dict file ftp ftps gopher http https imap imaps pop3 pop3s rtsp smb smbs smtp smtps telnet tftp Features: IDN IPv6 Largefile GSS-API Kerberos SPNEGO NTLM NTLM_WB SSL libz HTTP2 UnixSockets Although I still have some issues to tested in our krb env. Thanks! j. > Index: Makefile > === > RCS file: /d/cvs/ports/security/heimdal/Makefile,v > retrieving revision 1.17 > diff -u -p -r1.17 Makefile > --- Makefile 11 Mar 2016 20:28:30 - 1.17 > +++ Makefile 1 Nov 2016 02:12:38 - > @@ -12,7 +12,7 @@ PKGNAME-devel-docs= heimdal-devel-docs-$ > PKGNAME-libs=heimdal-libs-${V} > > REVISION-main= 1 > -REVISION-libs= 0 > +REVISION-libs= 1 > > CATEGORIES= security net > > @@ -132,6 +132,9 @@ RM_MAN= man1/afslog.1 \ > man8/ftpd.8 \ > man8/kxd.8 \ > man8/push.8 > + > +post-patch: > + sed -i 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/tools/krb5-config.in > > post-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/heimdal > Index: patches/patch-tools_krb5-config_in > === > RCS file: patches/patch-tools_krb5-config_in > diff -N patches/patch-tools_krb5-config_in > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-tools_krb5-config_in1 Nov 2016 02:49:49 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +- help ld.so(1) find libs out of its default search path > +- help ld(1) find libcom_err in ${LOCALBASE} > + > +--- tools/krb5-config.in.origTue Nov 1 02:23:30 2016 > tools/krb5-config.in Tue Nov 1 02:23:53 2016 > +@@ -120,7 +120,7 @@ if test "$print_exec_prefix" = "yes"; then > + fi > + > + if test "$do_libs" = "yes"; then > +-lib_flags="-L${libdir}" > ++lib_flags="-L${libdir} -R${libdir} -L%%LOCALBASE%%/lib" > + case $library in > + gssapi) > + lib_flags="$lib_flags -lgssapi -lheimntlm" > > > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE >
Re: NEW comms/gammu wammu
On Tue, October 9, 2012 12:07, Kirill Bychkov wrote: > Hi. > I've made a port of gammu and wammu. Resending this after 4 years of testing :) > >>From DESCR: > Gammu command line utility provides access to wide range of phone > features, however support level differs from phone to phone and you > might want to check Gammu Phone Database for user experiences with > various phones. Generally following features are supported: > * Call listing, initiating and handling > * SMS retrieval, backup and sending > * MMS retrieval > * Phonebook listing, export and import (also from standard >formats such as vCard) > * Calendar and tasks listing, export and import (also from >standard formats such as vCalendar or iCalendar) > * Retrieval of phone and network information > * Access to phone file system. > > Wammu is a GUI to gammu. I'm currently using it to backup contacts from my old cellphone. OK to import? gammu.tar.gz Description: application/gzip py-gammu.tar.gz Description: application/gzip wammu.tar.gz Description: application/gzip
Re: UPDATE: net/nbtscan
Rafael Sadowskiwrites: > Lost in October. Nope, committed. Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2016/11/01 12:19:17 Modified files: devel/py-nosexcover: Makefile distinfo Log message: Update to py-nosexcover-1.0.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2016/11/01 12:14:05 Modified files: lang/ghc : Makefile Log message: Instead of setting USE_WXNEEDED=Yes, explicitely pass -Wl,-z,wxneeded the linker again. Otherwise, the ld wrapper script installed when USE_WXNEEDED=Yes will be used by the installed ghc package. Problem noticed by Karel Gardas.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 12:05:56 Modified files: editors/nano : Makefile distinfo editors/nano/patches: patch-doc_man_nano_1 Removed files: editors/nano/patches: patch-doc_man_nanorc_5 Log message: update to 2.7.1: add the ability to display line numbers in front of the text
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 12:04:06 Modified files: productivity/grisbi: Makefile distinfo Removed files: productivity/grisbi/patches: patch-src_bet_data_c Log message: Actually, grisbi moved to github, so just update to the 1.0.1 found there. Add plumbing to run autogen.sh and the necessary BDEPs on autohell.
Re: UPDATE: net/nbtscan
Lost in October. On Sat Oct 08, 2016 at 10:12:21AM +0200, Rafael Sadowski wrote: > Hi ports@ > > update after distfile update from new homepage and mastersite. > > Kind regards, > > Rafael Sadowski > > Index: Makefile > === > RCS file: /cvs/ports/net/nbtscan/Makefile,v > retrieving revision 1.12 > diff -u -p -u -p -r1.12 Makefile > --- Makefile 13 Mar 2014 10:22:52 - 1.12 > +++ Makefile 8 Oct 2016 08:09:06 - > @@ -2,15 +2,16 @@ > > COMMENT= NetBIOS name network scanner > > -DISTNAME=nbtscan-1.5.1 > -REVISION=0 > -WRKDIST= ${WRKDIR}/${DISTNAME}a > +DISTNAME=nbtscan_1.5.1 > +PKGNAME= ${DISTNAME:S/_/-/} > +REVISION=1 > +WRKDIST= ${WRKDIR}/${PKGNAME}a > > CATEGORIES= net > > -MASTER_SITES=http://www.inetcat.net/software/ > +MASTER_SITES=http://www.inetcat.org/software/ > > -HOMEPAGE=http://www.inetcat.net/software/nbtscan.html > +HOMEPAGE=http://www.inetcat.org/software/nbtscan.html > > # GPLv2+ > PERMIT_PACKAGE_CDROM=Yes > Index: distinfo > === > RCS file: /cvs/ports/net/nbtscan/distinfo,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 distinfo > --- distinfo 13 Mar 2014 10:22:52 - 1.6 > +++ distinfo 8 Oct 2016 08:09:06 - > @@ -1,2 +1,2 @@ > -SHA256 (nbtscan-1.5.1.tar.gz) = +fldVVU1bI1GelduadnTSL8qgh3tmoX4lbXm0h4qp+s= > -SIZE (nbtscan-1.5.1.tar.gz) = 82107 > +SHA256 (nbtscan_1.5.1.tar.gz) = FDfaavm1mNkf6TnLljzTyNLgQ0Vbc/tMRjUqsNLiEnw= > +SIZE (nbtscan_1.5.1.tar.gz) = 82114 > Index: patches/patch-statusq_h > === > RCS file: /cvs/ports/net/nbtscan/patches/patch-statusq_h,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-statusq_h > --- patches/patch-statusq_h 13 Mar 2014 10:22:52 - 1.1 > +++ patches/patch-statusq_h 8 Oct 2016 08:09:06 - > @@ -1,7 +1,7 @@ > $OpenBSD: patch-statusq_h,v 1.1 2014/03/13 10:22:52 sthen Exp $ > statusq.h.orig Thu May 23 04:31:35 2002 > -+++ statusq.hWed Mar 12 11:58:56 2014 > -@@ -103,4 +103,7 @@ > +--- statusq.h.orig Thu May 23 13:31:35 2002 > statusq.hSat Oct 8 10:08:07 2016 > +@@ -103,4 +103,7 @@ typedef struct nb_service { > char* service_name; > } nb_service_t ; >
Re: UPDATE: graphics/opencv
On Tue Oct 04, 2016 at 08:55:55PM +0200, Rafael Sadowski wrote: > On Mon Sep 12, 2016 at 12:20:10AM +0200, Rafael Sadowski wrote: > > On Fri Aug 12, 2016 at 07:29:34AM +0200, Rafael Sadowski wrote: > > > On Sat Jun 25, 2016 at 08:07:36PM +0200, Rafael Sadowski wrote: > > > > Hi ports@, > > > > > > > > update OpenCV stable branch to 2.4.13. OpenCV 3 from WIP githup is not > > > > ready for other ports in tree. > > > > > > > > core ports features: > > > > - remove XXX tags in digikam-kde4 and kde-applications. > > > > -- Not more necessary since the last opencv update > > > > - use OpenCVs testsuite to run tests (looks much better) > > > > - update to MODJAVA_VER 1.8 (burn in hell insecure JAVA) > > > > > > > > > > naddy@ informed me that I forgot to update the distinfo in my last > > > diff. Here is a new version, tested last night with -current ports tree. > > > Thanks naddy@ > > > > > > > Updated diff number 2. without MODGETTEXT_WANTLIB. Tested amd64 with > > current ports tree and kernel/userland. Test looks still good. > > > > Kind regards, > > > > Rafael > > Hm, nobody? I do not want to give up. Maybe someone in the Budapest hackroom ;) Kind Regards, Rafael > > > > > > > Index: graphics/digikam-kde4/Makefile > > === > > RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v > > retrieving revision 1.21 > > diff -u -p -u -p -r1.21 Makefile > > --- graphics/digikam-kde4/Makefile 6 May 2016 21:39:03 - 1.21 > > +++ graphics/digikam-kde4/Makefile 11 Sep 2016 22:12:22 - > > @@ -178,11 +178,6 @@ TEST_IS_INTERACTIVE = X11 > > > > .include > > > > -# XXX should fix OpenCV CMake config on Java-enabled archs instead! > > -.if ${ARCH} == "amd64" > > -BUILD_DEPENDS +=graphics/opencv,-java > > -.endif > > - > > #.if ${ARCH} == "i386" > > CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} > > -DOPENBSD_LIBKDCRAW_NO_CRASH=0" > > #.else > > Index: graphics/opencv/Makefile > > === > > RCS file: /cvs/ports/graphics/opencv/Makefile,v > > retrieving revision 1.37 > > diff -u -p -u -p -r1.37 Makefile > > --- graphics/opencv/Makefile15 Apr 2016 08:53:49 - 1.37 > > +++ graphics/opencv/Makefile11 Sep 2016 22:12:23 - > > @@ -1,46 +1,45 @@ > > # $OpenBSD: Makefile,v 1.37 2016/04/15 08:53:49 shadchin Exp $ > > > > ONLY_FOR_ARCHS = ${GCC4_ARCHS} > > -ONLY_FOR_ARCHS-java = amd64 i386 > > +ONLY_FOR_ARCHS-java = ${ONLY_FOR_ARCHS} > > > > CATEGORIES = graphics devel > > COMMENT-docs = OpenCV documentation and examples > > COMMENT-main = library of programming functions for real time > > cv > > COMMENT-java = Java bindings for OpenCV > > > > -V =2.4.12.3 > > +V =2.4.13 > > DISTNAME = opencv-$V > > PKGNAME-main = ${PKGNAME} > > PKGNAME-docs = opencv-docs-$V > > PKGNAME-java = opencv-java-$V > > -REVISION-docs =0 > > > > HOMEPAGE = http://www.opencv.org/ > > MAINTAINER = Rafael Sadowski> > > > -SHARED_LIBS = opencv_calib3d 1.1 #1.2 > > -SHARED_LIBS += opencv_contrib 1.1 #1.2 > > -SHARED_LIBS += opencv_core 1.1 #1.2 > > -SHARED_LIBS += opencv_features2d 1.1 #1.2 > > -SHARED_LIBS += opencv_flann1.1 #1.2 > > -SHARED_LIBS += opencv_gpu 1.1 #1.2 > > -SHARED_LIBS += opencv_highgui 1.1 #1.2 > > -SHARED_LIBS += opencv_imgproc 1.1 #1.2 > > -SHARED_LIBS += opencv_legacy 1.1 #1.2 > > -SHARED_LIBS += opencv_ml 1.1 #1.2 > > -SHARED_LIBS += opencv_nonfree 0.1 #0.2 > > -SHARED_LIBS += opencv_objdetect1.1 #1.2 > > -SHARED_LIBS += opencv_photo0.1 #0.2 > > -SHARED_LIBS += opencv_stitching0.1 #0.2 > > -SHARED_LIBS += opencv_superres 0.1 #0.2 > > -SHARED_LIBS += opencv_ts 0.1 #0.2 > > -SHARED_LIBS += opencv_video1.1 #1.2 > > -SHARED_LIBS += opencv_videostab0.1 #0.2 > > -SHARED_LIBS += opencv_ocl 0.1 #2.5 > > +SHARED_LIBS = opencv_calib3d 1.2 #1.3 > > +SHARED_LIBS += opencv_contrib 1.2 #1.3 > > +SHARED_LIBS += opencv_core 1.2 #1.3 > > +SHARED_LIBS += opencv_features2d 1.2 #1.3 > > +SHARED_LIBS += opencv_flann1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2016/11/01 11:53:44 Modified files: devel/py-jsonrpclib: Makefile distinfo Log message: Update to py-jsonrpclib-0.1.7
Re: UPDATE: archivers/libtar
Nobody? On Sun Sep 25, 2016 at 10:09:18PM +0200, Rafael Sadowski wrote: > Hi @ports, > > I found this port because the HOMEPAGE is unreachable. The diff fix > MASTER_SITES and update to last stable release. > > Okay? Comments? > > Kind regards, > > Rafael > > Index: Makefile > === > RCS file: /cvs/ports/archivers/libtar/Makefile,v > retrieving revision 1.13 > diff -u -p -u -p -r1.13 Makefile > --- Makefile 24 Nov 2015 09:11:02 - 1.13 > +++ Makefile 25 Sep 2016 20:08:24 - > @@ -2,25 +2,39 @@ > > COMMENT= C library for manipulating tar files > > -DISTNAME=libtar-1.2.11 > -REVISION=2 > +VERSION= 1.2.20 > +DISTNAME=libtar-${VERSION} > > -SHARED_LIBS= tar 0.0 # .1.2 > +SHARED_LIBS= tar 0.1 # .1.3 > > CATEGORIES= archivers devel > > -HOMEPAGE=http://www.feep.net/libtar/ > - > # BSD-like > PERMIT_PACKAGE_CDROM=Yes > > WANTLIB= c z > > -MASTER_SITES=https://distfiles.nl/ \ > - ftp://ftp.feep.net/pub/software/libtar/ > +DISTFILES= libtar-{libtar/archive/}v${VERSION}${EXTRACT_SUFX} > +MASTER_SITES=https://github.com/tklauser/ > + > +BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ > + ${MODGNU_AUTOMAKE_DEPENDS} > + > +USE_GMAKE= Yes > +CONFIGURE_STYLE= gnu > + > +MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" > + > +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ > + LDFLAGS="-L${LOCALBASE}/lib" > + > +AUTOCONF_VERSION=2.69 > +AUTOMAKE_VERSION=1.11 > > -NO_TEST= Yes > +NO_TEST= Yes > > -CONFIGURE_STYLE=gnu > +pre-configure: > + cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ > + AUTOCONF_VERSION=${AUTOCONF_VERSION} autoreconf --force > --install > > .include > Index: distinfo > === > RCS file: /cvs/ports/archivers/libtar/distinfo,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 distinfo > --- distinfo 4 Apr 2013 16:03:55 - 1.2 > +++ distinfo 25 Sep 2016 20:08:24 - > @@ -1,2 +1,2 @@ > -SHA256 (libtar-1.2.11.tar.gz) = Si7vtrcIj0HeVzVuUFnL8fkXUJtKgQ98YUYlo3joe7g= > -SIZE (libtar-1.2.11.tar.gz) = 145354 > +SHA256 (libtar-v1.2.20.tar.gz) = MVL8Yc8DyC77+ZZFWW79rbopfqw+haUq4YmQKgcsmhY= > +SIZE (libtar-v1.2.20.tar.gz) = 63544 > Index: patches/patch-lib_Makefile_in > === > RCS file: patches/patch-lib_Makefile_in > diff -N patches/patch-lib_Makefile_in > --- patches/patch-lib_Makefile_in 10 Oct 2013 07:02:56 - 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,35 +0,0 @@ > -$OpenBSD: patch-lib_Makefile_in,v 1.3 2013/10/10 07:02:56 jasper Exp $ > - > -Enable shared library, from pkgsrc. > - > lib/Makefile.in.orig Sun Dec 15 19:02:30 2002 > -+++ lib/Makefile.in Thu Oct 10 08:59:32 2013 > -@@ -69,13 +69,15 @@ all: ${ALL} > - .PHONY: clean distclean install > - > - libtar.a: ${LIBTAR_OBJS} ${LIBOBJS} > --${AR} rc libtar.a ${LIBTAR_OBJS} ${LIBOBJS} > --${RANLIB} libtar.a > -+${LIBTOOL} --mode=link --tag=CC \ > -+${CC} -o libtar.la ${LIBTAR_OBJS:.o=.lo} ${LIBOBJS:.o=.lo} \ > -+${LDFLAGS} -rpath ${TRUEPREFIX}/lib -version-info 1:2 > - > - ${LIBTAR_OBJS}: ${LIBTAR_HDRS} > - > - .c.o: > --${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $< > -+${LIBTOOL} --mode=compile --tag=CC \ > -+${CC} ${CFLAGS} ${CPPFLAGS} -c -o ${@:.o=.lo} $< -prefer-pic > - > - clean: > - rm -f *~ *.o ${ALL} core > -@@ -85,7 +87,8 @@ distclean: clean > - > - install: ${ALL} > - ${MKDIR} ${DESTDIR}${libdir} > --${INSTALL_DATA} libtar.a ${DESTDIR}${libdir} > -+${LIBTOOL} --mode=install \ > -+${INSTALL_DATA} libtar.la ${DESTDIR}${libdir} > - ${MKDIR} ${DESTDIR}${includedir} > - ${INSTALL_DATA} ${srcdir}/libtar.h ${DESTDIR}${includedir} > - ${INSTALL_DATA} ../listhash/libtar_listhash.h ${DESTDIR}${includedir} > Index: patches/patch-lib_block_c > === > RCS file: patches/patch-lib_block_c > diff -N patches/patch-lib_block_c > --- patches/patch-lib_block_c 10 Oct 2013 07:16:28 - 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,85 +0,0 @@ > -$OpenBSD: patch-lib_block_c,v 1.1 2013/10/10 07:16:28 jasper Exp $ > - > -Security fix for CVE-2013-4397 Integer overflow in libtar > - > -Patch from > http://repo.or.cz/w/libtar.git/commit/45448e8bae671c2f7e80b860ae0fc0cedf2bdc04 > - > lib/block.c.orig Tue Jan 7 02:40:59 2003 > -+++ lib/block.c Thu Oct 10 08:59:51 2013 > -@@ -90,8 +90,8 @@ th_read_internal(TAR *t) > - int > - th_read(TAR *t) > - { > --int i, j; > --size_t sz; > -+int i; > -+size_t sz, j, blocks; > - char *ptr; > - > - #ifdef DEBUG > -@@ -118,21 +118,26 @@ th_read(TAR *t) > - if
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 11:46:09 Modified files: graphics/povray: Makefile distinfo Log message: use the latest release from the png 1.2 branch, 1.2.56
Re: NEW: devel/py-entrypoints 0.2.2
On Tue, 11 Oct 2016 14:47:27 +0500, Alexandr Shadchinwrote: > Hi, > > ok to import? ok danj@ You should submit to upstream the setup.py patch ;)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 11:29:38 Modified files: graphics/png : Makefile distinfo Log message: maintenance update to 1.6.26; from Brad
Re: openvpn-auth-ldap problem
"Leclerc, Sebastien"writes: >> -Message d'origine- >> De : Jeremie Courreges-Anglas [mailto:j...@wxcvbn.org] >> Envoyé : 18 octobre 2016 15:29 >> >> Anyway, is the plugin broken right now, or is that report just about >> runtime linker warnings? > > It is broken, ldap authentication does not work, but is ok with 5.9 amd64. Does the following patch fix your problem? Make sure you have the gcc-libs package installed before rebuilding and testing. Here, I can now run ''make test'' successfully, and openvpn --config /dev/null --plugin /usr/local/lib/openvpn-auth-ldap.so doesn't print linker warnings any more. Index: Makefile === RCS file: /cvs/ports/net/openvpn-auth-ldap/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile1 Oct 2016 11:54:16 - 1.7 +++ Makefile1 Nov 2016 17:07:55 - @@ -3,7 +3,7 @@ COMMENT = LDAP authentication plugin for OpenVPN 2.x VERSION = 2.0.3 -REVISION = 2 +REVISION = 3 DISTNAME = auth-ldap-${VERSION} PKGNAME = openvpn-${DISTNAME} CATEGORIES = net security @@ -22,6 +22,7 @@ MASTER_SITES =${MASTER_SITE_GOOGLECODE RUN_DEPENDS = net/openvpn LIB_DEPENDS = databases/openldap BUILD_DEPENDS =${RUN_DEPENDS} \ + devel/check \ devel/re2c SEPARATE_BUILD = Yes @@ -29,8 +30,11 @@ SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --prefix=${LOCALBASE} \ + --with-check=${LOCALBASE} \ --with-openldap=${LOCALBASE} \ --with-openvpn=${LOCALBASE}/include/openvpn + +TEST_TARGET = test SAMPLES_DIR = ${PREFIX}/share/examples/openvpn-auth-ldap Index: patches/patch-src_Makefile_in === RCS file: patches/patch-src_Makefile_in diff -N patches/patch-src_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_Makefile_in 1 Nov 2016 17:07:55 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/Makefile.in.orig Fri Sep 15 04:45:57 2006 src/Makefile.inTue Nov 1 17:52:06 2016 +@@ -37,7 +37,7 @@ TEST_OBJS= testplugin.o + + CFLAGS+= -fPIC $(LDAP_CFLAGS) $(OPENVPN_CFLAGS) + OBJCFLAGS+= -fPIC $(LDAP_CFLAGS) $(OPENVPN_CFLAGS) +-LIBS+=$(LDAP_LIBS) $(OBJC_LIBS) $(FLEX_LIBS) ++LIBS+=-L/usr/lib $(LDAP_LIBS) $(OBJC_LIBS) $(FLEX_LIBS) + + + INSTALL_LIB= $(INSTALL) -m 755 Index: patches/patch-tests_Makefile_in === RCS file: patches/patch-tests_Makefile_in diff -N patches/patch-tests_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-tests_Makefile_in 1 Nov 2016 17:07:55 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tests/Makefile.in.orig Tue Aug 1 05:51:52 2006 tests/Makefile.in Tue Nov 1 17:52:23 2016 +@@ -26,7 +26,7 @@ TEST_OBJS= tests.o \ + CFLAGS+= @CHECK_CFLAGS@ -DTEST_DATA=\"${srcdir}/data\" + OBJCFLAGS+= @CHECK_CFLAGS@ -DTEST_DATA=\"${srcdir}/data\" + LIBS+=-lauth-ldap-testing $(OBJC_LIBS) $(LDAP_LIBS) @CHECK_LIBS@ +-LDFLAGS+= -L${top_builddir}src $(LIBS) ++LDFLAGS+= -L${top_builddir}/src -L/usr/lib $(LIBS) + + # Recompile the tests every time + all: tests -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2016/11/01 11:11:55 Modified files: devel/py-configargparse: Makefile distinfo devel/py-configargparse/pkg: PLIST Log message: Update to py-ConfigArgParse-0.11.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2016/11/01 11:04:10 ports/net/openvpn-auth-ldap/patches Update of /cvs/ports/net/openvpn-auth-ldap/patches In directory cvs.openbsd.org:/tmp/cvs-serv11949/patches Log Message: Directory /cvs/ports/net/openvpn-auth-ldap/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 10:58:19 Modified files: productivity/grisbi: Makefile Log message: Touche pas au grisbi, salope! (set PORTROACH annotation so that it stops bothering me about the instable/broken snapshot hosted on the garbage dump^Wsourceforge)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2016/11/01 10:55:13 Modified files: math/R : Makefile distinfo math/R/patches : patch-configure math/R/pkg : PLIST Log message: Update to R 3.3.2 ok dcoppa@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 10:51:30 Log message: import consul-template-0.16.0 This project provides a convenient way to populate values from Consul into the file system using the consul-template daemon. ok aja@ Status: Vendor Tag: jasper Release Tags: jasper_20160111 N ports/sysutils/consul-template/Makefile N ports/sysutils/consul-template/distinfo N ports/sysutils/consul-template/files/default.conf N ports/sysutils/consul-template/pkg/consul_template.rc N ports/sysutils/consul-template/pkg/DESCR N ports/sysutils/consul-template/pkg/PLIST N ports/sysutils/consul-template/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 10:52:07 Modified files: sysutils : Makefile Log message: +consul-template
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 10:43:51 Modified files: devel/intellij : Makefile distinfo devel/intellij/pkg: PLIST Log message: update to intellij-2016.2.5 from Caspar Schutijser (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 10:50:34 Modified files: infrastructure/db: user.list Log message: add _consul-template
Re: UPDATE: math/R
On 2016/11/01 09:53, Ingo Feinerer wrote: > - remove two FTP mirrors (there are plenty of HTTP) Personally I don't mind either way for math/R, but just in case this prompts someone to go and kill a whole bunch of them: some ports have ftp:// URLs on purpose (though lower in the MASTER_SITES list) in order that "make peek-ftp" works.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 10:38:27 Modified files: sysutils/py-psutil: Makefile distinfo sysutils/py-psutil/patches: patch-psutil_tests___init___py Log message: Update to py-psutil 4.4.2. ok danj@
Re: UPDATE: math/R
On Tue, Nov 1, 2016 at 9:53 AM, Ingo Feinererwrote: > Dear useRs, > > update math/R 3.3.1 -> 3.3.2 > > - remove two FTP mirrors (there are plenty of HTTP) > - add print/texinfo to RUN_DEPENDS as 'R CMD build' needs it > - regen patch > > Works for me on amd64. > > OK? Looks good portswise, and works as expected. ok dcoppa@ Ciao! David > Index: Makefile > === > RCS file: /cvs/ports/math/R/Makefile,v > retrieving revision 1.87 > diff -u -p -r1.87 Makefile > --- Makefile2 Sep 2016 13:02:24 - 1.87 > +++ Makefile1 Nov 2016 08:44:32 - > @@ -1,8 +1,7 @@ > # $OpenBSD: Makefile,v 1.87 2016/09/02 13:02:24 dcoppa Exp $ > > COMMENT= powerful math/statistics/graphics language > -DISTNAME= R-3.3.1 > -REVISION= 1 > +DISTNAME= R-3.3.2 > > SO_VERSION=32.0 > .for _lib in R Rblas Rlapack > @@ -23,8 +22,6 @@ WANTLIB += lzma m ncurses nghttp2 pango- > WANTLIB += png readline ssl tiff z ${MODTK_WANTLIB} > > MASTER_SITES= https://cran.r-project.org/src/base/R-3/ \ > - ftp://cran.r-project.org/pub/R/src/base/R-3/ \ > - ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/R-3/ \ > http://cran.at.r-project.org/src/base/R-3/ \ > http://cran.br.r-project.org/src/base/R-3/ \ > http://cran.ch.r-project.org/src/base/R-3/ \ > @@ -67,6 +64,7 @@ RUN_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS} > archivers/zip \ > devel/gmake \ > devel/xdg-utils \ > + print/texinfo \ > print/texlive/base>=2014p1 > > CONFIGURE_STYLE=gnu > Index: distinfo > === > RCS file: /cvs/ports/math/R/distinfo,v > retrieving revision 1.31 > diff -u -p -r1.31 distinfo > --- distinfo21 Jun 2016 18:21:52 - 1.31 > +++ distinfo1 Nov 2016 08:44:32 - > @@ -1,2 +1,2 @@ > -SHA256 (R-3.3.1.tar.gz) = PcWa5YMfU4D4PBabrCEDrQUu/g7OxP+nS95NhaD9qeI= > -SIZE (R-3.3.1.tar.gz) = 29848329 > +SHA256 (R-3.3.2.tar.gz) = 0pStIen1dPtIKOuzqUuMs09PMEpBaHqZS+AN1BpOUUw= > +SIZE (R-3.3.2.tar.gz) = 29440670 > Index: patches/patch-configure > === > RCS file: /cvs/ports/math/R/patches/patch-configure,v > retrieving revision 1.28 > diff -u -p -r1.28 patch-configure > --- patches/patch-configure 6 May 2016 08:52:28 - 1.28 > +++ patches/patch-configure 1 Nov 2016 08:44:32 - > @@ -1,8 +1,8 @@ > $OpenBSD: patch-configure,v 1.28 2016/05/06 08:52:28 feinerer Exp $ > > configure.orig Tue May 3 12:17:51 2016 > -+++ configure Tue May 3 12:19:33 2016 > -@@ -35481,8 +35481,8 @@ fi > +--- configure.orig Mon Oct 24 13:34:26 2016 > configure Tue Nov 1 09:06:08 2016 > +@@ -35492,8 +35492,8 @@ fi > > fi > if test "${have_zlib}" = yes; then > @@ -13,7 +13,7 @@ $OpenBSD: patch-configure,v 1.28 2016/05 > if ${r_cv_header_zlib_h+:} false; then : > $as_echo_n "(cached) " >&6 > else > -@@ -35499,7 +35499,7 @@ int main() { > +@@ -35510,7 +35510,7 @@ int main() { > #ifdef ZLIB_VERSION > /* Work around Debian bug: it uses 1.2.3.4 even though there was no such > version on the master site zlib.net */ > Index: pkg/PLIST > === > RCS file: /cvs/ports/math/R/pkg/PLIST,v > retrieving revision 1.31 > diff -u -p -r1.31 PLIST > --- pkg/PLIST 21 Jun 2016 18:21:52 - 1.31 > +++ pkg/PLIST 1 Nov 2016 08:44:33 - > @@ -1910,14 +1910,12 @@ share/doc/R/manual/images/fig12.png > share/doc/R/manual/images/hist.png > share/doc/R/manual/images/ice.png > share/doc/pkg-readmes/${FULLPKGNAME} > -share/texmf-local/ > share/texmf-local/bibtex/ > share/texmf-local/bibtex/bib/ > share/texmf-local/bibtex/bib/RJournal.bib > share/texmf-local/bibtex/bib/Rnews.bib > share/texmf-local/bibtex/bst/ > share/texmf-local/bibtex/bst/jss.bst > -share/texmf-local/tex/ > share/texmf-local/tex/latex/ > share/texmf-local/tex/latex/Rd.sty > share/texmf-local/tex/latex/Sweave.sty > -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 10:34:57 Modified files: security/letsencrypt/client: Makefile Log message: py-psutil no longer needed, spotted by landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 10:31:57 Modified files: shells/bash: Makefile distinfo Log message: update to 4.3 patchlevel 48
[new] ympd 0.13
Hi, because we all need a new MPD web client, here's one written in C, using websockets and bootstrap/js, drops privileges to a separate user and listens on a local port - see https://www.ympd.org/. Works fine here, nice ideas. ok/feedback ? ympd-0.13.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/11/01 10:26:11 Modified files: sysutils/consul: Makefile distinfo Removed files: sysutils/consul/patches: patch-temporary_hack-stat_openbsd_go patch-temporary_hack_stat_unsupported_go Log message: - update to consul 0.7.0: https://www.hashicorp.com/blog/consul-0-7.html ok aja@ (MAINTAINER)
Re: GHC in snapshots with non-existent ld.
[cc'd ports, in case someone wants to comment] Hi, On Tue, Nov 01, 2016 at 01:39:56PM +0100, Karel Gardas wrote: [ghc from packages not able to link anything outside of ports, especially ghc HEAD] > which is caused by this: > > $ ghc --version > The Glorious Glasgow Haskell Compilation System, version 7.10.3 > $ ghc --info|grep ld > ,("ld command","/usr/obj/ports/ghc-7.10.3/bin/ld") > > > I think you should probably fix this to point to well known ld > command? Or shall I work around this in GHC HEAD? Of course if I edit > ports ghc settings file and change the ld command to /usr/bin/ld, then > everything is working well here. Please don't put a workaround into ghc HEAD. I'll try to revert my latest USE_WXNEEDED change in lang/ghc and again explicitely pass -Wl,-z,wxneeded to the linker (which would then be /usr/bin/ld or just ld). That would be the diff below. I keep the USE_WXNEEDED but leaving it commented out, so people know why it's done this way. Any comments about this? Ciao, Kili Index: Makefile === RCS file: /cvs/ports/lang/ghc/Makefile,v retrieving revision 1.142 diff -u -p -r1.142 Makefile --- Makefile13 Sep 2016 18:52:05 - 1.142 +++ Makefile1 Nov 2016 16:03:05 - @@ -12,7 +12,7 @@ COMMENT = compiler for the functional l NO_CCACHE =Yes DISTNAME = ghc-${MODGHC_VER} -REVISION = 6 +REVISION = 7 CATEGORIES = lang devel HOMEPAGE = https://www.haskell.org/ghc/ @@ -34,9 +34,10 @@ BUILD_DEPENDS = archivers/gtar \ textproc/docbook-xsl RUN_DEPENDS = -# XXX: wxneeded is a hack. Fix rts/Linker.c, mmapForLinker() and -# loadObj_() instead. -USE_WXNEEDED = Yes +# We can't use the wrapper script, because it then gets hardcoded into +# the packaged ghc. So we explicitely use -Wl,-z,wxneeded (see +# CONFIGURE_ENV below) +# USE_WXNEEDED = Yes WANTLIB += c iconv m ncursesw pthread util @@ -106,12 +107,14 @@ CFLAGS += -fno-pie CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib +# XXX: wxneeded is a hack. Fix rts/Linker.c, mmapForLinker() and +# loadObj_() instead. CONFIGURE_ENV += CONF_CC_OPTS_STAGE0="-fno-pie -nopie" \ CONF_CC_OPTS_STAGE1="-fno-pie -nopie" \ CONF_CC_OPTS_STAGE2="-fno-pie -nopie" \ CONF_GCC_LINKER_OPTS_STAGE0="-fno-pie -nopie" \ - CONF_GCC_LINKER_OPTS_STAGE1="-fno-pie -nopie" \ - CONF_GCC_LINKER_OPTS_STAGE2="-fno-pie -nopie" + CONF_GCC_LINKER_OPTS_STAGE1="-fno-pie -nopie -Wl,-z,wxneeded" \ + CONF_GCC_LINKER_OPTS_STAGE2="-fno-pie -nopie -Wl,-z,wxneeded" # Do not pick up gpatch CONFIGURE_ENV += ac_cv_path_PatchCmd=/usr/bin/patch
py-psutil 4.4.2
Hi, update to py-psutil 4.4.2, test it with certbot or pg_activity :) Landry Index: Makefile === RCS file: /cvs/ports/sysutils/py-psutil/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile31 Aug 2016 12:44:52 - 1.5 +++ Makefile1 Nov 2016 16:05:20 - @@ -2,14 +2,13 @@ COMMENT = library to retrieve system information and utilisation -MODPY_EGG_VERSION =4.1.0 +MODPY_EGG_VERSION =4.4.2 GH_ACCOUNT = giampaolo GH_PROJECT = psutil GH_TAGNAME = release-${MODPY_EGG_VERSION} DISTNAME = psutil-${MODPY_EGG_VERSION} PKGNAME = py-psutil-${MODPY_EGG_VERSION} CATEGORIES = sysutils -REVISION = 0 HOMEPAGE = https://github.com/giampaolo/psutil Index: distinfo === RCS file: /cvs/ports/sysutils/py-psutil/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo26 Apr 2016 13:03:40 - 1.3 +++ distinfo1 Nov 2016 16:05:20 - @@ -1,2 +1,2 @@ -SHA256 (psutil-4.1.0.tar.gz) = XT+yx07Hnyu+usy5NdkpsmyQUfBV9zQZGga6aYfeArE= -SIZE (psutil-4.1.0.tar.gz) = 292325 +SHA256 (psutil-4.4.2.tar.gz) = VpsGHjiS4gcGSr6wD6Dd/vfHKmYbPlOWSVyW0PYvbAI= +SIZE (psutil-4.4.2.tar.gz) = 1825011 Index: patches/patch-psutil_tests___init___py === RCS file: /cvs/ports/sysutils/py-psutil/patches/patch-psutil_tests___init___py,v retrieving revision 1.1 diff -u -r1.1 patch-psutil_tests___init___py --- patches/patch-psutil_tests___init___py 26 Apr 2016 13:03:40 - 1.1 +++ patches/patch-psutil_tests___init___py 1 Nov 2016 16:05:20 - @@ -1,11 +1,11 @@ $OpenBSD: patch-psutil_tests___init___py,v 1.1 2016/04/26 13:03:40 landry Exp $ the scripts/ subdir is only present in the tarball, not on the system psutil/tests/__init__.py.orig Tue Apr 26 14:57:59 2016 -+++ psutil/tests/__init__.py Tue Apr 26 14:58:48 2016 -@@ -91,7 +91,7 @@ if not PY3: +--- psutil/tests/__init__.py.orig Wed Oct 5 14:16:05 2016 psutil/tests/__init__.py Tue Nov 1 16:51:06 2016 +@@ -118,7 +118,7 @@ PYPY = '__pypy__' in sys.builtin_module_names ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), -'..', '..')) + '..', '..')) -SCRIPTS_DIR = os.path.join(ROOT_DIR, 'scripts') +SCRIPTS_DIR = 'scripts'
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2016/11/01 10:00:05 Modified files: x11/spice-gtk : Makefile Removed files: x11/spice-gtk/patches: patch-configure_ac Log message: Drop unneeded patch ... and bump REVISION Just In Case (tm)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2016/11/01 09:58:18 Modified files: devel/spice-protocol: Makefile devel/spice-protocol/patches: patch-spice_macros_h Log message: Simplify endianness goo. spice-gtk breaks on sparc64 because endianness can't be detected, because not all source files in spice-gtk include the same config.h file. So instead of requiring consumer ports to define HAVE_ENDIAN_H, let's just assume that we have it. ok jasper@
urlwatch update/'TypeError: expected string or buffer' [Re: CVS: cvs.openbsd.org: ports]
On 2016/11/01 08:20, Robert Peichaer wrote: > CVSROOT: /cvs > Module name: ports > Changes by: r...@cvs.openbsd.org2016/11/01 08:20:15 > > Modified files: > www/urlwatch : Makefile distinfo > www/urlwatch/pkg: PLIST > Removed files: > www/urlwatch/patches: patch-lib_urlwatch_html2txt_py > > Log message: > Update www/urlwatch to version 2. > > This is a major update for urlwatch which is now a python3 program. > Consider looking at the README.md at https://github.com/thp/urlwatch > if you are migrating from version 1. > > Noteable changes: > - the urls file is now in PyYaml format and will be auto-convertert > - watching ftp:// URLs needs a workaround like: > kind: shell > command: curl ftp://url/path/ > - custom hooks are different and need rewriting > > Feedback from and OK sthen@ aja@ > It was working when I first tried, but now command execution is resulting in errors like this, --- ERROR: curl -s ftp://ftp.astron.com/pub/file/ --- Traceback (most recent call last): File "/usr/local/lib/python3.4/site-packages/urlwatch/handler.py", line 69, in process data = FilterBase.auto_process(self, data) File "/usr/local/lib/python3.4/site-packages/urlwatch/filters.py", line 73, in auto_process if filter_instance.match(): File "/usr/local/lib/python3.4/site-packages/urlwatch/filters.py", line 115, in match result = all(v.match(d.get(k, None)) for k, v in self.MATCH.items()) File "/usr/local/lib/python3.4/site-packages/urlwatch/filters.py", line 115, in result = all(v.match(d.get(k, None)) for k, v in self.MATCH.items()) TypeError: expected string or buffer --- With 'urlwatch -v', 2016-11-01 15:30:21,996 handler INFO: Processing: 2016-11-01 15:30:23,553 filters DEBUG: Matching with result: False 2016-11-01 15:30:23,553 urlwatch DEBUG: Job finished: 2016-11-01 15:30:23,554 handler DEBUG: Got exception while processing : expected string or buffer Does anyone have an idea what might be wrong?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2016/11/01 09:48:00 Added files: infrastructure/db: .cvsignore Log message: Ignore network.conf db/network.conf can be used to override MASTER_SITE* entries in templates/network.conf.template, let cvs(1) be silent about it. ok phessler@
Re: Update to scapy-2.3.3
On 2016/11/01 15:59, Daniel Jakots wrote: > On Tue, 1 Nov 2016 10:31:47 +, Stuart Henderson >wrote: > > > On 2016/11/01 11:24, Daniel Jakots wrote: > > > Updated diff: aja noticed that without py-ecdsa installed it says: > > > INFO: Can't import python ecdsa lib. Disabled certificate > > > manipulation tools. So add a RDEP on it. I remove py-gnuplot as it > > > seems it's not imported. I opened an issue to ask them to clarify > > > scapy's requirements. > > > > They switched to matplotlib. > > > > https://github.com/secdev/scapy/commit/9cb4a70de3c57dd3779a0aa87ea25914ac6ef98d > > > > Thanks, I saw that they use matplotlib but I didn't know that they > switched to it. I tried to add graphics/py-matplotlib as RDEP but it > was taken into account (so I removed it before sending the diff). The > problem is "ImportError: No module named _backend_gdk". I looked at > py-matplotlib but I didn't find anything suspicious. > > Daniel, do you have any idea? > > Here's a diff for debug purpose: > > $ scapy > > Traceback (most recent call last): > File "/usr/local/bin/scapy", line 25, in > interact() > File "/usr/local/lib/python2.7/site-packages/scapy/main.py", line 300, in > interact > scapy_builtins = __import__("all",globals(),locals(),".").__dict__ > File "/usr/local/lib/python2.7/site-packages/scapy/all.py", line 16, in > > from scapy.arch import * > File "/usr/local/lib/python2.7/site-packages/scapy/arch/__init__.py", line > 19, in > import matplotlib.pyplot as plt > File "/usr/local/lib/python2.7/site-packages/matplotlib/pyplot.py", line > 109, in > _backend_mod, new_figure_manager, draw_if_interactive, _show = > pylab_setup() > File > "/usr/local/lib/python2.7/site-packages/matplotlib/backends/__init__.py", > line 32, in pylab_setup > globals(),locals(),[backend_name],0) > File > "/usr/local/lib/python2.7/site-packages/matplotlib/backends/backend_gtkagg.py", > line 14, in > from matplotlib.backends.backend_gtk import gtk, FigureManagerGTK, > FigureCanvasGTK,\ > File > "/usr/local/lib/python2.7/site-packages/matplotlib/backends/backend_gtk.py", > line 36, in > from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK > File > "/usr/local/lib/python2.7/site-packages/matplotlib/backends/backend_gdk.py", > line 33, in > from matplotlib.backends._backend_gdk import pixbuf_get_pixels_array > ImportError: No module named _backend_gdk I don't actually see that here, if matplotlib is installed it looks like this: $ scapy INFO: Can't import PyX. Won't be able to use psdump() or pdfdump(). WARNING: can't import layer tls: No module named _MD2 Welcome to Scapy (unknown.version) And if it isn't installed: $ scapy Traceback (most recent call last): File "/usr/local/bin/scapy", line 25, in interact() File "/usr/local/lib/python2.7/site-packages/scapy/main.py", line 300, in interact scapy_builtins = __import__("all",globals(),locals(),".").__dict__ File "/usr/local/lib/python2.7/site-packages/scapy/all.py", line 16, in from scapy.arch import * File "/usr/local/lib/python2.7/site-packages/scapy/arch/__init__.py", line 18, in from matplotlib import get_backend as matplotlib_get_backend ImportError: No module named matplotlib
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2016/11/01 09:34:39 Modified files: infrastructure/bin: register-plist Log message: When there is a package with a matching name, but with a different pkgpath, print a message showing the packages that weren't matched due to the differing pkgpath. Help and OK espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:24:47 Modified files: x11/xfce4/xfce4-smartbookmark: Makefile distinfo x11/xfce4/xfce4-smartbookmark/pkg: PLIST Log message: Update to xfce4-smartbookmark 0.5.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:28:30 Modified files: x11/xfce4/xfce4-mpc: Makefile distinfo x11/xfce4/xfce4-mpc/pkg: PLIST Log message: Update to xfce4-mpc 0.5.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 09:27:24 Modified files: www/urlwatch : Makefile www/urlwatch/patches: patch-urlwatch Log message: regen patch (no pkg change) enable tests
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:26:02 Modified files: x11/xfce4/xfce4-wavelan: Makefile distinfo Log message: Update to xfce4-wavelan 0.6.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:25:01 Modified files: x11/xfce4/xfce4-systemload: Makefile distinfo x11/xfce4/xfce4-systemload/pkg: PLIST Log message: Update to xfce4-systemload 1.2.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:24:18 Modified files: x11/xfce4/xfce4-fsguard: Makefile distinfo x11/xfce4/xfce4-fsguard/pkg: PLIST Log message: Update to xfce4-fsguard 1.1.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:24:33 Modified files: x11/xfce4/xfce4-netload: Makefile distinfo x11/xfce4/xfce4-netload/pkg: PLIST Log message: Update to xfce4-netload 1.3.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:24:03 Modified files: x11/xfce4/xfce4-diskperf: Makefile distinfo x11/xfce4/xfce4-diskperf/pkg: PLIST Log message: Update to xfce4-diskperf 2.6.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:23:28 Modified files: x11/xfce4/xfce4-battery: Makefile distinfo x11/xfce4/xfce4-battery/pkg: PLIST Log message: Update to xfce4-battery 1.1.0, ported to Gtk3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/11/01 09:23:48 Modified files: x11/xfce4/xfce4-datetime: Makefile distinfo x11/xfce4/xfce4-datetime/pkg: PLIST Log message: Update xfce4-datetime 0.7.0, ported to Gtk3
Re: Update to scapy-2.3.3
On Tue, 1 Nov 2016 10:31:47 +, Stuart Hendersonwrote: > On 2016/11/01 11:24, Daniel Jakots wrote: > > Updated diff: aja noticed that without py-ecdsa installed it says: > > INFO: Can't import python ecdsa lib. Disabled certificate > > manipulation tools. So add a RDEP on it. I remove py-gnuplot as it > > seems it's not imported. I opened an issue to ask them to clarify > > scapy's requirements. > > They switched to matplotlib. > > https://github.com/secdev/scapy/commit/9cb4a70de3c57dd3779a0aa87ea25914ac6ef98d > Thanks, I saw that they use matplotlib but I didn't know that they switched to it. I tried to add graphics/py-matplotlib as RDEP but it was taken into account (so I removed it before sending the diff). The problem is "ImportError: No module named _backend_gdk". I looked at py-matplotlib but I didn't find anything suspicious. Daniel, do you have any idea? Here's a diff for debug purpose: $ scapy Traceback (most recent call last): File "/usr/local/bin/scapy", line 25, in interact() File "/usr/local/lib/python2.7/site-packages/scapy/main.py", line 300, in interact scapy_builtins = __import__("all",globals(),locals(),".").__dict__ File "/usr/local/lib/python2.7/site-packages/scapy/all.py", line 16, in from scapy.arch import * File "/usr/local/lib/python2.7/site-packages/scapy/arch/__init__.py", line 19, in import matplotlib.pyplot as plt File "/usr/local/lib/python2.7/site-packages/matplotlib/pyplot.py", line 109, in _backend_mod, new_figure_manager, draw_if_interactive, _show = pylab_setup() File "/usr/local/lib/python2.7/site-packages/matplotlib/backends/__init__.py", line 32, in pylab_setup globals(),locals(),[backend_name],0) File "/usr/local/lib/python2.7/site-packages/matplotlib/backends/backend_gtkagg.py", line 14, in from matplotlib.backends.backend_gtk import gtk, FigureManagerGTK, FigureCanvasGTK,\ File "/usr/local/lib/python2.7/site-packages/matplotlib/backends/backend_gtk.py", line 36, in from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK File "/usr/local/lib/python2.7/site-packages/matplotlib/backends/backend_gdk.py", line 33, in from matplotlib.backends._backend_gdk import pixbuf_get_pixels_array ImportError: No module named _backend_gdk Cheers, Daniel Index: Makefile === RCS file: /cvs/ports/net/scapy/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 31 Jan 2016 23:21:37 - 1.21 +++ Makefile 1 Nov 2016 14:55:51 - @@ -2,7 +2,7 @@ COMMENT= powerful interactive packet manipulation in python -MODPY_EGG_VERSION= 2.3.2 +MODPY_EGG_VERSION= 2.3.3 DISTNAME= scapy-${MODPY_EGG_VERSION} GH_ACCOUNT= secdev @@ -23,10 +23,11 @@ DISTFILES= ${DISTNAME}.tar.gz ethertypes EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MODULES= lang/python -RUN_DEPENDS= net/libdnet,-python \ +RUN_DEPENDS= graphics/py-matplotlib \ + net/libdnet,-python \ net/py-libpcap \ security/py-crypto \ - math/py-gnuplot + security/py-ecdsa TEST_DEPENDS=${RUN_DEPENDS} PKG_ARCH= * Index: distinfo === RCS file: /cvs/ports/net/scapy/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 31 Jan 2016 23:21:37 - 1.7 +++ distinfo 1 Nov 2016 14:55:51 - @@ -1,4 +1,4 @@ SHA256 (ethertypes-20120703) = 7Tj51kS+/IfrQahknDEAcyQNmozXWy+cEVtdnX5dAzw= -SHA256 (scapy-2.3.2.tar.gz) = G4qG1of+uO0BEUwMAWtChnTL/sBOPrb1JJoBjEJ8T2o= +SHA256 (scapy-2.3.3.tar.gz) = Z2Qs97gG4C2u3dWIV3WIyuvdw0Jtt5BOeZmgsDNKY7U= SIZE (ethertypes-20120703) = 1362 -SIZE (scapy-2.3.2.tar.gz) = 1166056 +SIZE (scapy-2.3.3.tar.gz) = 1459132 Index: patches/patch-scapy_arch___init___py === RCS file: patches/patch-scapy_arch___init___py diff -N patches/patch-scapy_arch___init___py --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-scapy_arch___init___py 1 Nov 2016 14:55:51 - @@ -0,0 +1,33 @@ +$OpenBSD$ +--- scapy/arch/__init__.py.orig Tue Nov 1 15:54:12 2016 scapy/arch/__init__.py Tue Nov 1 15:53:37 2016 +@@ -15,22 +15,14 @@ from scapy.error import * + import scapy.config + from scapy.pton_ntop import inet_pton + +-try: +-from matplotlib import get_backend as matplotlib_get_backend +-import matplotlib.pyplot as plt +-MATPLOTLIB = 1 +-if "inline" in matplotlib_get_backend(): +-MATPLOTLIB_INLINED = 1 +-else: +-MATPLOTLIB_INLINED = 0 +-MATPLOTLIB_DEFAULT_PLOT_KARGS = {"marker": "+"} +-# RuntimeError to catch gtk "Cannot open display" error +-except (ImportError, RuntimeError): +-plt = None +-MATPLOTLIB = 0 ++from matplotlib import get_backend as matplotlib_get_backend ++import matplotlib.pyplot as plt ++MATPLOTLIB = 1 ++if "inline" in
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 08:24:11 Modified files: mail/dovecot-pigeonhole: Makefile distinfo mail/dovecot-pigeonhole/patches: patch-src_managesieve-login_Makefile_in mail/dovecot-pigeonhole/pkg: PLIST Log message: update to Pigeonhole 0.4.16, the final version is out and as pointed out by Brad there's a problem with older Pigeonhole with Dovecot 2.2.26.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2016/11/01 08:20:15 Modified files: www/urlwatch : Makefile distinfo www/urlwatch/pkg: PLIST Removed files: www/urlwatch/patches: patch-lib_urlwatch_html2txt_py Log message: Update www/urlwatch to version 2. This is a major update for urlwatch which is now a python3 program. Consider looking at the README.md at https://github.com/thp/urlwatch if you are migrating from version 1. Noteable changes: - the urls file is now in PyYaml format and will be auto-convertert - watching ftp:// URLs needs a workaround like: kind: shell command: curl ftp://url/path/ - custom hooks are different and need rewriting Feedback from and OK sthen@ aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 08:18:49 Modified files: multimedia/gstreamer1/plugins-base: Makefile Log message: BDEP on intltool for share/aclocal/intltool.m4; ok aja
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2016/11/01 08:16:44 Modified files: sysutils/firmware/iwm: Makefile Log message: Sync a comment with reality.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2016/11/01 08:14:49 Modified files: sysutils/firmware/iwm: Makefile distinfo sysutils/firmware/iwm/pkg: PLIST Log message: Remove obsolete iwm(4) firmware files for API version 9 (unused since 6.0). ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 08:12:04 Modified files: mail/dovecot : Makefile distinfo mail/dovecot/patches: patch-doc_example-config_Makefile_in patch-doc_example-config_conf_d_Makefile_in patch-src_auth_password-scheme-crypt_c mail/dovecot/pkg: PLIST-ldap PLIST-server Log message: update to Dovecot 2.2.26.0, ok brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/11/01 07:56:30 Modified files: x11/xscreensaver: Makefile distinfo x11/xscreensaver/pkg: PLIST Log message: update to xscreensaver-5.36
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 07:40:17 Modified files: audio/mpg123 : Tag: OPENBSD_6_0 Makefile distinfo Log message: Security update to 1.23.8: Fix an out-of-bounds memory read in the ID3v2 parser for tags that claim an unrealistically small length.
Re: luajit,lua52 uses the wrong lua abi
On Tue, Nov 1, 2016, at 06:23 AM, Jeremie Courreges-Anglas wrote: > Jonathan Graywrites: > > > On Mon, Oct 31, 2016 at 07:59:21PM +0100, Jeremie Courreges-Anglas wrote: > >> > >> lua.port.mk doesn't automatically add lua52 and lua53 to FLAVORS any > >> more. So right now the ,lua52 package is broken and I've removed it > >> from lang/Makefile. Either it is decided to keep this FLAVOR (which > >> requires explicitely declaring it in the port Makefile) or the port can > >> be cleaned up. > >> > >> I'd go with the latter, if this package doesn't work with any > >> non-trivial lua lib I see no reason to keep it. But I'm not a luajit > >> user. > > > > Or we remove the FLAVOR and unconditionally enable 5.2 compat > > which will be with 5.1 abi still? > > I guess you'd need to test whether existing luajit consumers still work > if LUAJIT_ENABLE_LUA52COMPAT is defined, because it introduces some > incompatible changes. > > On the other hand: > - other OSes don't seem to enable it (granted, I only checked Debian and > FreeBSD) > - I didn't hear anyone step up to keep LUAJIT_ENABLE_LUA52COMPAT. :) > > I'd just kill it, unless you or abieber@ see value in keeping it. IIRC tedu@ wanted it for something - I will ping him to see if he has any uses. Personally I don't. > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 > E7EE >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2016/11/01 07:23:21 Modified files: databases : Makefile Log message: +py-minidb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2016/11/01 07:20:11 Log message: import py-minidb minidb is a simple SQLite3 store for Python objects. OK aja@ sthen@ Status: Vendor Tag: rpe Release Tags: rpe_20161101 N ports/databases/py-minidb/Makefile N ports/databases/py-minidb/distinfo N ports/databases/py-minidb/pkg/PLIST N ports/databases/py-minidb/pkg/DESCR No conflicts created by this import
Re: [NEW] converters/lua-iconv
Frederic Cambuswrites: > Hi ports@, > > Here is a new port: converters/lua-iconv > > Comments? OK? ok -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2016/11/01 07:04:15 Modified files: games/scummvm-tools: Makefile distinfo games/scummvm-tools/patches: patch-configure Log message: update to scummvm-tools 1.9.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2016/11/01 07:03:14 Modified files: games/scummvm : Makefile distinfo games/scummvm/patches: patch-Makefile_common patch-configure games/scummvm/pkg: PLIST Log message: update to scummvm 1.9.0
update to py-flask-0.11.1
Hi, Here's a second attempt at updating www/py-flask (see first [0]). I updated/changed a few things, among them, I'd like to take maintainership. [0]: https://marc.info/?l=openbsd-ports=146541287727316=2 Comments? OK? Cheers, Danil Index: Makefile === RCS file: /cvs/ports/www/py-flask/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 16 Apr 2016 19:06:26 - 1.18 +++ Makefile 1 Nov 2016 12:28:03 - @@ -1,37 +1,39 @@ # $OpenBSD: Makefile,v 1.18 2016/04/16 19:06:26 shadchin Exp $ -COMMENT = microframework based on Werkzeug and Jinja 2 +COMMENT = microframework based on Werkzeug and Jinja 2 -MODPY_EGG_VERSION = 0.10.1 -REVISION = 2 -DISTNAME = Flask-${MODPY_EGG_VERSION} -PKGNAME = py-${DISTNAME:L} +MODPY_EGG_VERSION = 0.11.1 +DISTNAME = Flask-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME:L} -CATEGORIES = www devel +CATEGORIES = www devel -HOMEPAGE = http://flask.pocoo.org/ +HOMEPAGE = http://flask.pocoo.org/ + +MAINTAINER = Daniel Jakots# BSD PERMIT_PACKAGE_CDROM = Yes -MODULES = lang/python - -MODPY_PI = Yes +MODULES = lang/python +MODPY_PI = Yes MODPY_SETUPTOOLS = Yes -FLAVORS = python3 +FLAVORS = python3 FLAVOR ?= -RUN_DEPENDS = devel/py-blinker${MODPY_FLAVOR} \ - www/py-itsdangerous${MODPY_FLAVOR} \ - www/py-jinja2${MODPY_FLAVOR}>=2.4 \ - www/py-werkzeug${MODPY_FLAVOR}>=0.7 -BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR} \ - www/py-itsdangerous${MODPY_FLAVOR} \ - www/py-werkzeug${MODPY_FLAVOR}>=0.7 -TEST_DEPENDS = ${RUN_DEPENDS} +RUN_DEPENDS = devel/py-blinker${MODPY_FLAVOR} \ + www/py-itsdangerous${MODPY_FLAVOR} \ + www/py-jinja2${MODPY_FLAVOR} \ + www/py-werkzeug${MODPY_FLAVOR} \ + devel/py-click${MODPY_FLAVOR} +BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR} \ + www/py-itsdangerous${MODPY_FLAVOR} \ + www/py-werkzeug${MODPY_FLAVOR} +TEST_DEPENDS = ${RUN_DEPENDS} \ + devel/py-test${MODPY_FLAVOR} -MAKE_ENV = PYTHONPATH="${WRKSRC}" SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} +MAKE_ENV = PYTHONPATH="${WRKSRC}" SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} post-build: @cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html @@ -43,6 +45,11 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}flask cd ${WRKSRC}/examples && pax -rw * \ ${PREFIX}/share/examples/${MODPY_PY_PREFIX}flask - rm ${PREFIX}/share/examples/${MODPY_PY_PREFIX}flask/persona/{static/,}.DS_Store +.if ${FLAVOR:Mpython3} + mv ${PREFIX}/bin/flask ${PREFIX}/bin/flask${MODPY_BIN_SUFFIX} +.endif + +do-test: + cd ${WRKSRC} && ${MODPY_BIN} -m pytest tests examples .include Index: distinfo === RCS file: /cvs/ports/www/py-flask/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 25 Dec 2013 18:45:12 - 1.6 +++ distinfo 1 Nov 2016 12:28:03 - @@ -1,2 +1,2 @@ -SHA256 (Flask-0.10.1.tar.gz) = TIOCn/g9QIteHUmVRyJlQR0sQUESKY8utLNZ2eRWM3M= -SIZE (Flask-0.10.1.tar.gz) = 544247 +SHA256 (Flask-0.11.1.tar.gz) = tHE/K/uevClmuKSZA64NOYR4HVyHhZHPL3tITSh1aw4= +SIZE (Flask-0.11.1.tar.gz) = 564993 Index: patches/patch-docs_conf_py === RCS file: /cvs/ports/www/py-flask/patches/patch-docs_conf_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-docs_conf_py --- patches/patch-docs_conf_py 16 Apr 2016 19:06:26 - 1.1 +++ patches/patch-docs_conf_py 1 Nov 2016 12:28:03 - @@ -2,14 +2,13 @@ $OpenBSD: patch-docs_conf_py,v 1.1 2016/ Prevent build from calling out to the internet. docs/conf.py.orig Fri Apr 15 21:23:36 2016 -+++ docs/conf.py Fri Apr 15 21:23:50 2016 -@@ -26,7 +26,7 @@ sys.path.append(os.path.abspath('.')) - - # Add any Sphinx extension module names here, as strings. They can be extensions +--- docs/conf.py.orig Wed Jun 8 20:51:57 2016 docs/conf.py Wed Jun 8 20:52:21 2016 +@@ -28,7 +28,6 @@ sys.path.append(os.path.abspath('.')) # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. --extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', -+extensions = ['sphinx.ext.autodoc', - 'flaskdocext'] + extensions = [ + 'sphinx.ext.autodoc', +-'sphinx.ext.intersphinx', + 'flaskdocext' + ] - # Add any paths that contain templates here, relative to this directory. Index: patches/patch-flask_testsuite_signals_py === RCS file: patches/patch-flask_testsuite_signals_py diff -N patches/patch-flask_testsuite_signals_py --- patches/patch-flask_testsuite_signals_py 25 Dec 2013 18:45:12 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-flask_testsuite_signals_py,v 1.1 2013/12/25 18:45:12 fgsch Exp $ flask/testsuite/signals.py.orig Mon Dec 23 21:23:03 2013 -+++ flask/testsuite/signals.py Mon Dec 23
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 06:27:07 Modified files: audio/mpg123 : Makefile distinfo Log message: Security update to 1.23.8: Fix an out-of-bounds memory read in the ID3v2 parser for tags that claim an unrealistically small length.
Re: luajit,lua52 uses the wrong lua abi
Jonathan Graywrites: > On Mon, Oct 31, 2016 at 07:59:21PM +0100, Jeremie Courreges-Anglas wrote: >> >> lua.port.mk doesn't automatically add lua52 and lua53 to FLAVORS any >> more. So right now the ,lua52 package is broken and I've removed it >> from lang/Makefile. Either it is decided to keep this FLAVOR (which >> requires explicitely declaring it in the port Makefile) or the port can >> be cleaned up. >> >> I'd go with the latter, if this package doesn't work with any >> non-trivial lua lib I see no reason to keep it. But I'm not a luajit >> user. > > Or we remove the FLAVOR and unconditionally enable 5.2 compat > which will be with 5.1 abi still? I guess you'd need to test whether existing luajit consumers still work if LUAJIT_ENABLE_LUA52COMPAT is defined, because it introduces some incompatible changes. On the other hand: - other OSes don't seem to enable it (granted, I only checked Debian and FreeBSD) - I didn't hear anyone step up to keep LUAJIT_ENABLE_LUA52COMPAT. :) I'd just kill it, unless you or abieber@ see value in keeping it. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/11/01 06:01:10 Modified files: security/clamav: Makefile Added files: security/clamav/patches: patch-m4_reorganization_libs_pcre_m4 Log message: Prevent picking up pcre2 (for now). ok sthen@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2016/11/01 05:56:29 Modified files: editors/libreoffice: Makefile distinfo editors/libreoffice/pkg: PLIST-main Log message: update to 5.2.2.2
Re: PostgreSQL 9.6.1 + pg_upgrade support
On 10/31 07:57, Pierre-Emmanuel Andr? wrote: > On Mon, Oct 31, 2016 at 09:53:24AM -0700, Jeremy Evans wrote: > > This updates pea@'s earlier diff that targeted 9.6.0 to work with > > 9.6.1, and modifies it to separate pg_upgrade into a separate > > subpackage. The pg_upgrade subpackage depends on a new port > > containing the previous PostgreSQL major version. > > > > The new port is databases/postgresql-previous, and it installs > > into /usr/local/{bin,include,lib,share}/postgresql-9.5 directories. > > We could obviously use subdirectories in databases/postgresql, but > > that creates more ports churn. I didn't use subpackages for > > postgresql-previous, merging the client/server/contrib packages > > and dropping the docs and plpython packages. I also dropped the > > rc script and README. I suppose we could add back the rc script > > if there are users that really want to run the previous version > > in production and not just use it for pg_upgrade. > > > > This updates the postgresql-server README to mention the use of > > pg_upgrade as a possible upgrade option. Basically, instead of > > dumping before upgrade and reloading after, you do: > > > > pg_upgrade -b /usr/local/bin/postgresql-9.5/ \ > > -B /usr/local/bin -U postgres \ > > -d /var/postgresql/data.old/ -D /var/postgresql/data > > > > after stopping the old server and before starting the new server. > > > > Briefly tested with a small (~400MB) database on amd64, no problems > > noticed. > > > > Before this can be committed, we need to test everything that depends > > on PostgreSQL and make sure it still works with 9.6.1, or have working > > diffs that can be committed shortly after the upgrade to 9.6.1. I hope > > to start that work shortly. > > > > Thoughts? > > > > Hi, > > Thanks for your diff. I will look at it asap. > For PostgreSQL 9.6, ajacoutot@ ran a bulk and it breaks: > databases/postgresql-plv8, databases/pg_statsinfo, databases/skytools, > databases/postgresql-pllua Here's a diff that allows all 4 to build. No run time tests yet. Thanks, Jeremy Index: postgresql-plv8/Makefile === RCS file: /cvs/ports/databases/postgresql-plv8/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- postgresql-plv8/Makefile1 Jul 2016 11:38:35 - 1.8 +++ postgresql-plv8/Makefile1 Nov 2016 11:21:36 - @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS =amd64 i386 COMMENT = PostgreSQL V8 javascript procedual language VERSION = 1.4.2 -REVISION = 2 +REVISION = 3 DISTNAME = plv8-${VERSION} PKGNAME = postgresql-${DISTNAME} @@ -24,7 +24,7 @@ EXTRACT_SUFX =.zip BUILD_DEPENDS =${RUN_DEPENDS} LIB_DEPENDS = lang/libv8 -RUN_DEPENDS = postgresql-server->=9.5,<9.6:databases/postgresql,-server +RUN_DEPENDS = postgresql-server->=9.6,<9.7:databases/postgresql,-server MAKE_FLAGS = V8DIR=${LOCALBASE}/lib \ CUSTOM_CC="${CXX}" \ Index: postgresql-pllua/Makefile === RCS file: /cvs/ports/databases/postgresql-pllua/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- postgresql-pllua/Makefile 13 May 2016 14:36:37 - 1.7 +++ postgresql-pllua/Makefile 1 Nov 2016 11:20:39 - @@ -5,7 +5,7 @@ COMMENT = Lua procedural language suppo VERSION = 1.0 DISTNAME = pllua-${VERSION} PKGNAME = postgresql-pllua-${VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = databases @@ -22,7 +22,7 @@ MASTER_SITES =http://pgfoundry.org/frs MODULES = lang/lua BUILD_DEPENDS =${RUN_DEPENDS} -RUN_DEPENDS = postgresql-server->=9.5,<9.6:databases/postgresql,-server +RUN_DEPENDS = postgresql-server->=9.6,<9.7:databases/postgresql,-server USE_GMAKE =Yes Index: pg_statsinfo/Makefile === RCS file: /cvs/ports/databases/pg_statsinfo/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- pg_statsinfo/Makefile 11 Sep 2016 20:54:12 - 1.8 +++ pg_statsinfo/Makefile 1 Nov 2016 11:52:48 - @@ -4,7 +4,7 @@ COMMENT = monitor PostgreSQL activity & DISTNAME = pg_statsinfo-3.2.1 CATEGORIES = databases -REVISION = 0 +REVISION = 1 HOMEPAGE = http://pgstatsinfo.sourceforge.net/ Index: pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c === RCS file: /cvs/ports/databases/pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-agent_lib_libstatsinfo_c --- pg_statsinfo/patches/patch-agent_lib_libstatsinfo_c 13 May 2016 22:09:21 - 1.3 +++
Re: krb5-config --libs
On 2016/11/01 11:39, Jeremie Courreges-Anglas wrote: > krb5-config is in /usr/local/heimdal/bin Ah, this is the piece I missed. In that case, no objection.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/11/01 05:12:57 Modified files: archivers/libarchive: Tag: OPENBSD_6_0 Makefile distinfo archivers/libarchive/patches: Tag: OPENBSD_6_0 patch-configure Removed files: archivers/libarchive/patches: Tag: OPENBSD_6_0 patch-libarchive_test_test_write_format_gnutar_filenames_c Log message: SECURITY update to 3.2.2. Numerous bugs appear to have been fixed, but there is no log of changes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/11/01 05:10:24 Modified files: x11/gnome/music: Makefile Log message: devel/py-gobject3${MODPY_FLAVOR} is also needed at build time. spotted by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/11/01 04:59:17 Modified files: sysutils/py-ghmi: Makefile Log message: Missing bdep on devel/py-pbr.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/11/01 04:55:14 Modified files: audio/gradio : Makefile Log message: Missing bdep on autoconf/automake.