Re: Update: graphics/dpic
Nigel writes: > On 09/03/15 22:04, Nigel wrote: >> Update to version 2015.08.31 >> >> Minor changes >> 2015 08 31 Ljust and rjust text offset equal for single and multiple >> strings. >> 2015 08 13 Catch return value of the sh command. >> 2015 06 29 Fixed a bug in svg output. >> 2015 06 15 Undeferred error messaging. Improved readability of C code. >> 2015 04 01 Fix comment lines containing braces in macro and for bodies. >> Revised messages for some errors. >> 2015 02 13 Reworked the handling of backslashes in strings in macro >> arguments. >> 2015 02 04 PDF output. Built-in variable dpicopt and variables added for >> detecting command options. Linear objects reworked for consistent fill. >> 2014 01 26 Tweak svg string output. >> >> >> Added some testing by using make on the examples. >> (Used browser/inkscape/ghostscript etc to view generated files.) >> >> Only tested on amd64. Please test on other. >> >> Ok? >> > There is a newer version 2015.10.28 available, attached a new diff for > this version. Looks fine ports wise, ok jca@ However, on amd64: ritchie /usr/ports/graphics/dpic$ make ===> Building for dpic-2015.10.28 cc -O2 -pipe -c dpic.c dpic.c: In function 'newstr': dpic.c:2384: warning: cast to pointer from integer of different size dpic.c: In function 'storestring': dpic.c:2408: warning: cast to pointer from integer of different size dpic.c: In function 'appendstring': dpic.c:2473: warning: cast to pointer from integer of different size dpic.c: In function 'newprim': dpic.c:2777: warning: cast to pointer from integer of different size dpic.c:2781: warning: cast to pointer from integer of different size dpic.c:2785: warning: cast to pointer from integer of different size dpic.c:2789: warning: cast to pointer from integer of different size dpic.c:2797: warning: cast to pointer from integer of different size dpic.c:2802: warning: cast to pointer from integer of different size dpic.c: In function 'resetenv': dpic.c:3348: warning: cast to pointer from integer of different size dpic.c: In function 'inheritenv': dpic.c:3465: warning: cast to pointer from integer of different size dpic.c: In function 'copyprim': dpic.c:3676: warning: cast to pointer from integer of different size dpic.c: In function 'produce': dpic.c:5361: warning: cast to pointer from integer of different size dpic.c: In function 'pdfstream': dpic.c:14154: warning: cast to pointer from integer of different size dpic.c: In function 'pdfprelude': dpic.c:14250: warning: cast to pointer from integer of different size dpic.c: In function 'newbuf': dpic.c:17364: warning: cast to pointer from integer of different size dpic.c:17365: warning: cast to pointer from integer of different size dpic.c: In function 'newarg': dpic.c:17420: warning: cast to pointer from integer of different size dpic.c: In function 'parse': dpic.c:19342: warning: cast to pointer from integer of different size dpic.c:19352: warning: cast to pointer from integer of different size dpic.c: In function 'main': dpic.c:19550: warning: cast to pointer from integer of different size cc -O2 -pipe -c p2clib.c cc -o dpic dpic.o p2clib.o -lm p2clib.o: In function `_ShowEscape': p2clib.c:(.text+0xc64): warning: warning: strcpy() is almost always misused, please use strlcpy() dpic.o: In function `produce': dpic.c:(.text+0x2844d): warning: warning: random() may return deterministic values, is that what you want? p2clib.o: In function `_ShowEscape': p2clib.c:(.text+0xc73): warning: warning: strcat() is almost always misused, please use strlcat() dpic.o: In function `pdfwstring': dpic.c:(.text+0x4987): warning: warning: sprintf() is often misused, please use snprintf() ritchie /usr/ports/graphics/dpic$ Scary. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: www/youtube-dl fetch fails due to ssl handshake failure
Markus Lude writes: > On Tue, Nov 03, 2015 at 10:32:36PM +, Stuart Henderson wrote: >> On 2015/11/03 22:13, Markus Lude wrote: >> > On Mon, Nov 02, 2015 at 08:53:41PM +, Stuart Henderson wrote: >> > > On 2015/11/02 19:45, Markus Lude wrote: >> > > > On Sat, Oct 24, 2015 at 09:05:27PM +0200, Markus Lude wrote: >> > > > > Hello Paul, >> > > > >> > > > Hello again, >> > > > >> > > > > make fetch fails for recent youtube-dl: >> > > > > >> > > > > ===> Checking files for youtube-dl-2015.10.24 >> > > > > >> Fetch >> > > > > >> https://yt-dl.org/downloads/2015.10.24/youtube-dl-2015.10.24.tar.gz >> > > > > ftp: SSL read error: read failed: error:140940E5:SSL >> > > > > routines:SSL3_READ_BYTES:ssl handshake failure >> > > > >> > > > recent update to youtube-dl-2015.11.01 fails too at the dowenload >> > > > stage: >> > > > >> > > > ===> Checking files for youtube-dl-2015.11.01 >> > > > >> Fetch >> > > > >> https://yt-dl.org/downloads/2015.11.01/youtube-dl-2015.11.01.tar.gz >> > > > ftp: SSL read error: read failed: error:140940E5:SSL >> > > > routines:SSL3_READ_BYTES:ssl handshake failure >> > > > >> > > > >> > > > quick workaround: use http instead? >> > > > >> > > > Regards, >> > > > Markus >> > > > >> > > >> > > The https server for yt-dl.org requires SNI, is there anything unusual >> > > about the way you're connecting to it (weird proxy or something)? >> > >> > I'm not aware of any proxy (yet). >> > >> > > It would be interesting to see what 'nc -vvc yt-dl.org 443' says. >> > >> > $ nc -vvc yt-dl.org 443 >> > Connection to yt-dl.org 443 port [tcp/https] succeeded! >> > TLS handshake negotiated TLSv1.2/DHE-RSA-AES256-GCM-SHA384 with host >> > yt-dl.org >> > Peer name yt-dl.org >> > Subject: /OU=Domain Control Validated/OU=PositiveSSL/CN=yt-dl.org >> > Issuer: /C=GB/ST=Greater Manchester/L=Salford/O=COMODO CA >> > Limited/CN=COMODO RSA Domain Validation Secure Server CA >> > Cert Hash: >> > SHA256:a396c2fb2644a50328b208e335e897a7639a7a2f2a22ae7f04d6908322a9429c >> > >> >> That's exactly what I'd expect from nc - that's odd though... if nc can >> connect, I don't think there's any reason why ftp shouldn't be able to >> (since jca added SNI support in 2014). >> >> Not really sure what to suggest... > > Unfortunately I forgot to mention that the problem occurs on 2 sparc64 > machines running snapshot from 3rd october. > It works on my notebook running i386 -current. > > on sparc64: > > $ /usr/bin/ftp -4 -d -o youtube-dl-2015.11.01.part > https://yt-dl.org/downloads/2015.11.01/ > host yt-dl.org, port (null), path downloads/2015.11.01/, save as > youtube-dl-2015.11.01.part, auth (null). > Trying 95.143.172.170... > Requesting https://yt-dl.org/downloads/2015.11.01/GET /downloads/2015.11.01/ > HTTP/1.0 > Host: yt-dl.org > User-Agent: OpenBSD ftp > > > ftp: SSL read error: read failed: error:140940E5:SSL > routines:SSL3_READ_BYTES:ssl handshake failure > > > on i386: > > $ /usr/bin/ftp -4 -d -o youtube-dl-2015.11.01.part > https://yt-dl.org/downloads/2015.11.01/ > host yt-dl.org, port (null), path downloads/2015.11.01/, save as > youtube-dl-2015.11.01.part, auth (null). > Trying 95.143.172.170... > Requesting https://yt-dl.org/downloads/2015.11.01/GET /downloads/2015.11.01/ > HTTP/1.0 > Host: yt-dl.org > User-Agent: OpenBSD ftp > > > received 'HTTP/1.1 200 OK' > [...] > > > on amd64 same as i386 Smells like a LibreSSL issue to me; Markus, could you report a bug about it? (on bugs@, preferably with sendbug(1)) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: new port: net/rabbitmq-c
Gregor Best writes:
> On Mon, Oct 12, 2015 at 04:46:03PM +0200, Gregor Best wrote:
>> On Mon, Oct 12, 2015 at 01:31:36AM +0300, Vadim Zhukov wrote:
>> > [...]
>> > This software changes default CMake variables depending on presence of
>> > popt library and xmlto binary at least. So you have hidden
>> > dependencies there. You'd either explicitly disable picking up those
>> > by -DCMAKE_DISABLE_FIND_PACKAGE_Foo=True, or add what you think worths
>> > it to BUILD/LIB/RUN_DEPENDS.
>> > [...]
>>
>> Whoops, fixed that. I've disabled API-doc generation because it pulls in
>> devel/doxygen as a build dependency and explicitly added popt and xmlto
>> to lib and build dependencies.
>>
>> This one also installs the manual pages into the right place.
>> [...]
>
> Ping.
>
> Is there something still missing about the port?
A few tweaks:
- please follow the ordering as show in
infrastructure/templates/Makefile.template, it helps a lot to have
consistency here
- the shared library version in the OpenBSD ports tree does not follow
the one defined upstream, thus we start with 0.0 for a new port. For
more about shared libs in ports, see
http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
I think it is ready to import, can I get other reviews / oks?
Updated tarball attached, diff of the changes I introduced below.
Cheers,
diff -pruN rabbitmq-c.orig/Makefile rabbitmq-c/Makefile
--- rabbitmq-c.orig/MakefileMon Oct 12 16:45:39 2015
+++ rabbitmq-c/Makefile Thu Nov 5 13:29:14 2015
@@ -1,3 +1,5 @@
+# $OpenBSD$
+
COMMENT= rabbitmq C library and commandline AMQP utilities
V= 0.7.0
@@ -6,12 +8,17 @@ GH_PROJECT= rabbitmq-c
GH_TAGNAME=v${V}
DISTNAME= ${GH_PROJECT}-${V}
+SHARED_LIBS = rabbitmq 0.0 # 4.1
+
CATEGORIES=net
HOMEPAGE= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
MAINTAINER=Gregor Best
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
+
MODULES= devel/cmake
WANTLIB= c crypto popt pthread ssl
@@ -22,10 +29,5 @@ BUILD_DEPENDS= textproc/xmlto
CONFIGURE_ARGS=-DBUILD_TOOLS_DOCS=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=True \
-DBUILD_API_DOCS=OFF
-
-SHARED_LIBS = rabbitmq 4.1
-
-# MIT
-PERMIT_PACKAGE_CDROM = Yes
.include
rabbitmq-c.tgz
Description: Binary data
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/readline 6.3
Paul Irofti writes:
> Hi,
Hi,
> here's an update to GNU readline that I need for getting history working
> with the new Octave port. Okay?
Looks fine to me, tested a bit with net/lftp and devel/cgdb.
A few global functions have been removed. Even if they seem to be in
the private namespace, please bump the library's major version, then
it's ok with me
> Paul
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/readline/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 12 Jul 2014 20:34:36 - 1.12
> +++ Makefile 1 Nov 2015 16:09:15 -
> @@ -2,18 +2,21 @@
>
> COMMENT =library to edit command lines as they are typed in
>
> -V = 6.2
> +V = 6.3
> DISTNAME = readline-${V}
> -PKGNAME =readline-${V}pl4
> -PATCHFILES = readline62-001:0 \
> - readline62-002:0 \
> - readline62-003:0 \
> - readline62-004:0
> +PKGNAME =readline-${V}
> +PATCHFILES = readline63-001:0 \
> + readline63-002:0 \
> + readline63-003:0 \
> + readline63-004:0 \
> + readline63-005:0 \
> + readline63-006:0 \
> + readline63-007:0 \
> + readline63-008:0
>
> -LIBV = 0.1
> +LIBV = 0.2
> SHARED_LIBS += ehistory ${LIBV}
> SHARED_LIBS += ereadline ${LIBV}
> -REVISION = 2
>
> CATEGORIES = devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/readline/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 18 Apr 2013 15:08:01 - 1.3
> +++ distinfo 1 Nov 2015 16:09:15 -
> @@ -1,10 +1,18 @@
> -SHA256 (readline-6.2.tar.gz) = eaaWBwoFjCM8ct1qxpcCHMZKvV7VHlnbhn1m0Zaok4E=
> -SHA256 (readline62-001) = OKhsQXQ3aS2wEGnIq0CpqPVI5nrZrwOQIhsCSxw5tOM=
> -SHA256 (readline62-002) = HmNJEoy1cxcgY+oAfGeveSVoicgJlzACymbF38UDx9Q=
> -SHA256 (readline62-003) = yyEx/zUtbl+C7cCXVRkfdCILFfAmvbbFJiSTHHliI3Q=
> -SHA256 (readline62-004) = Cb00JHnqW7i2QRv999MC+rLlIdHSQby4NE07rV2fVHY=
> -SIZE (readline-6.2.tar.gz) = 2277926
> -SIZE (readline62-001) = 1388
> -SIZE (readline62-002) = 1714
> -SIZE (readline62-003) = 1911
> -SIZE (readline62-004) = 3335
> +SHA256 (readline-6.3.tar.gz) = VrpgcblGL5gMWnKrACOJO2W6beu07rR116Vj3GXK/UM=
> +SHA256 (readline63-001) = Gnm7turudQ4Nb389BZswpF/FTo44io4F6cOuWYWQFG8=
> +SHA256 (readline63-002) = OeMEx6UmiI+eES5zOEghVzb7e51UBym54x8zR7eh4KU=
> +SHA256 (readline63-003) = 7EG92LAP2IToR3CFE99B1RsSQ87LaAGJ4xtxc9AcpS8=
> +SHA256 (readline63-004) = RUe5BvslcIZsIYh4B95d7hmDimChr7ZjhbJyFV5DVcw=
> +SHA256 (readline63-005) = h3eI+SKNGpkHpLz+PW3QQ5wI1yiUlFi0EgjZv5BgJ0s=
> +SHA256 (readline63-006) = XCN6s8bJfCPPUrKhGK3CZbf7QRtXyTpffCIdUPr75VY=
> +SHA256 (readline63-007) = TXm1oq3sPC6BFMvT1jwXcffGz2QDU2hiSQPSVwFPW+o=
> +SHA256 (readline63-008) = O8CTz1Js6sI+uAJWsOyH+hc1VA1ll0IQe2KE1jXEN4c=
> +SIZE (readline-6.3.tar.gz) = 2468560
> +SIZE (readline63-001) = 1366
> +SIZE (readline63-002) = 1297
> +SIZE (readline63-003) = 985
> +SIZE (readline63-004) = 1363
> +SIZE (readline63-005) = 1664
> +SIZE (readline63-006) = 1982
> +SIZE (readline63-007) = 1428
> +SIZE (readline63-008) = 1452
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/devel/readline/patches/patch-Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Makefile_in
> --- patches/patch-Makefile_in 18 Apr 2013 15:08:01 - 1.2
> +++ patches/patch-Makefile_in 1 Nov 2015 16:09:15 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile_in,v 1.2 2013/04/18 15:08:01 sthen Exp $
> Makefile.in.orig Mon Oct 11 16:53:52 2010
> -+++ Makefile.in Thu Apr 18 11:55:26 2013
> -@@ -97,8 +97,8 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT_FLAGS) @CFLAG
> +--- Makefile.in.orig Mon Jan 27 16:52:00 2014
> Makefile.in Sat Oct 31 12:58:35 2015
> +@@ -101,8 +101,8 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT_FLAGS) @CFLAG
> $(CC) -c $(CCFLAGS) $<
>
> # The name of the main library target.
> @@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2013/0
>
> # The C code source files for this library.
> CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
> -@@ -154,12 +154,12 @@ everything: all examples
> +@@ -164,12 +164,12 @@ everything: all examples
>
> static: $(STATIC_LIBS)
>
> @@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2013/0
> $(RM) $@
> $(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o xfree.o
> -test -n "$(RANLIB)" && $(RANLIB) $@
> -@@ -225,12 +225,12 @@ uninstall-headers:
> +@@ -235,12 +235,12 @@ uninstall-headers:
> maybe-uninstall-headers:
Re: [UPDATE] security/libssh
Remi Pointel writes: > Hi, Hi, > this is the diff to update libssh to latest release. > > Ok? Looks fine to me. Is there a reason to bump the lib's major? I see symbol additions, and no deletion. Bumps are cheap, sure, but... ok jca@ anyway. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: py-requests 2.8.1
Alexandr Shadchin writes: > Hi, > > This diff updates py-requests to the latest release. > Tested on amd64. > > Comments ? OK ? ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: py-tz 2015.7
ok -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: textproc/wkhtmltopdf
Landry Breuil writes: > On Tue, Nov 03, 2015 at 07:53:21PM +0100, Frank Groeneveld wrote: >> On 10/31/15 16:47, Frank Groeneveld wrote: >> >Ping? >> > >> >It's quite a simple port which only takes a few minutes to build on my >> >machine. You can then test it by running something like: >> >wkhtmltopdf http://www.openbsd.org/ openbsd.pdf >> > >> >Frank >> >> As noted by somebody off-list, it might be useful to have the port attached >> again to my ping mail, so people don't have to search for it. I've attached >> it to this mail. Please let me know what you think about it. > > That reads good to me - minor nit, if you run make update-plist it > should remove the man/ man/man1/ dirs from the PLIST which i think are > not needed. Confirmed. Another nit: the first word in COMMENT should not be capitalized: Convert -> convert. Other than that, ok jca@ to import. Frank: it would be nice to discuss upstream how the manpage install path should be handled. OTOH I don't think that gzip'ed manpages are a problem. > As for the background dep on QT4, i highly prefer depending on the > existing one instead of building another bundled copy, so the way you > did it makes perfect sense. Well, the only place where I've seen wkhtmltopdf used is within Odoo (https://www.odoo.com/), where it's used to produce invoices, quotations, etc. And there you *need* a wkhtmltopdf program built against the bundled and patched Qt. But since I don't see anyone porting Odoo to OpenBSD tomorrow I think we're fine with using Qt from ports. (: -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] Imapfilter 2.6.3
Michael McConville writes:
> They added some new SSL conditions that don't compile. I took the simple
> route in the attached patches and defaulted to SSL23.
Well, simple but a bit intrusive...
> That uses the best
> available cipher, right?
That uses the default cipher suite.
> This approach is a little iffy because I think
> it ignores the user's cipher prefs. I wanted to get a working WiP so
> that people could review it because I haven't worked with SSL/TLS APIs
> before.
>
> What's attached builds and runs fine for me.
Here's an less intrusive diff that should be easy to push upstream.
(Except in special cases, please send diffs instead of tarballs for
existing ports).
If SSLv3 isn't available, this should print an error message an aborts
the connection. Disclaimer: not tested yet.
Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile18 Jul 2015 23:11:01 - 1.17
+++ Makefile2 Nov 2015 21:50:50 -
@@ -2,8 +2,7 @@
COMMENT= remote IMAP filtering utility
-V= 2.6.1
-REVISION= 0
+V= 2.6.3
DISTNAME= imapfilter-${V}
GH_TAGNAME=v${V}
Index: distinfo
===
RCS file: /cvs/ports/mail/imapfilter/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo29 Jun 2015 09:52:25 - 1.9
+++ distinfo2 Nov 2015 21:50:50 -
@@ -1,2 +1,2 @@
-SHA256 (imapfilter-2.6.1.tar.gz) = 2UlKUgg3aWh+eA2kHPmk0hvrVq9YY6+z28SiEJ7VwdM=
-SIZE (imapfilter-2.6.1.tar.gz) = 55450
+SHA256 (imapfilter-2.6.3.tar.gz) = EXSGLW1cpJiyWnixJ8Jba/vUwM7DD439S2sQ+GlM0kQ=
+SIZE (imapfilter-2.6.3.tar.gz) = 55757
Index: patches/patch-src_imapfilter_c
===
RCS file: /cvs/ports/mail/imapfilter/patches/patch-src_imapfilter_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_imapfilter_c
--- patches/patch-src_imapfilter_c 18 Jul 2015 23:11:01 - 1.2
+++ patches/patch-src_imapfilter_c 2 Nov 2015 21:50:50 -
@@ -1,6 +1,9 @@
$OpenBSD: patch-src_imapfilter_c,v 1.2 2015/07/18 23:11:01 sthen Exp $
src/imapfilter.c.orig Mon Jun 29 02:33:17 2015
-+++ src/imapfilter.c Sat Jul 18 18:34:04 2015
+
+Cope with SSLv3 removal.
+
+--- src/imapfilter.c.orig Wed Sep 30 22:55:26 2015
src/imapfilter.c Mon Nov 2 22:37:03 2015
@@ -21,7 +21,10 @@
extern buffer ibuf, obuf, nbuf, cbuf;
@@ -13,16 +16,7 @@ $OpenBSD: patch-src_imapfilter_c,v 1.2 2
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
extern SSL_CTX *tls11ctx, *tls12ctx;
#endif
-@@ -52,7 +55,7 @@ main(int argc, char *argv[])
- opts.config = NULL;
- opts.oneline = NULL;
- opts.debug = NULL;
-- opts.truststore = "/etc/ssl/certs";
-+ opts.truststore = "/etc/ssl/cert.pem";
-
- env.home = NULL;
- env.pathmax = -1;
-@@ -109,7 +112,9 @@ main(int argc, char *argv[])
+@@ -114,7 +117,9 @@ main(int argc, char *argv[])
SSL_library_init();
SSL_load_error_strings();
@@ -32,9 +26,9 @@ $OpenBSD: patch-src_imapfilter_c,v 1.2 2
ssl23ctx = SSL_CTX_new(SSLv23_client_method());
tls1ctx = SSL_CTX_new(TLSv1_client_method());
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
-@@ -121,7 +126,9 @@ main(int argc, char *argv[])
+@@ -125,7 +130,9 @@ main(int argc, char *argv[])
capath = opts.truststore;
- if (exists_file(opts.truststore))
+ else if (exists_file(opts.truststore))
cafile = opts.truststore;
+#ifndef OPENSSL_NO_SSL3_METHOD
SSL_CTX_load_verify_locations(ssl3ctx, cafile, capath);
@@ -42,7 +36,7 @@ $OpenBSD: patch-src_imapfilter_c,v 1.2 2
SSL_CTX_load_verify_locations(ssl23ctx, cafile, capath);
SSL_CTX_load_verify_locations(tls1ctx, cafile, capath);
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
-@@ -146,7 +153,9 @@ main(int argc, char *argv[])
+@@ -150,7 +157,9 @@ main(int argc, char *argv[])
#endif
stop_lua();
Index: patches/patch-src_socket_c
===
RCS file: patches/patch-src_socket_c
diff -N patches/patch-src_socket_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_socket_c 2 Nov 2015 21:50:50 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Cope with SSLv3 removal.
+
+--- src/socket.c.orig Wed Sep 30 22:55:26 2015
src/socket.c Mon Nov 2 22:47:35 2015
+@@ -16,8 +16,10 @@
+ #include "imapfilter.h"
+ #include "session.h"
+
+-
+-SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
++SSL_CTX *ssl23ctx, *tls1ctx;
++#ifndef OPENSSL_NO_SSL3_METHOD
++SSL_CTX *ssl3ctx;
++#endif
+ #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
+ SSL_CTX *tls11ctx, *tls12ctx;
+ #endif
+@@ -95,7 +97,12 @@ open_secure_connection(session *ssn)
+ if (!ssn->sslproto) {
+
Re: NEW: net/tinc
Rafael Sadowski writes:
> Hey @ports,
Hi,
> after really long time in jasperla/openbsd-wip and intensive testing from an
> openbsd-wip-user, I'm happy to push a ready tinc port.
>
> I hope this nice stuff will find some Okays or feedback.
I have been reviewing this port already, sadly the machine I tested it
on has since vanished. Here are the tweaks I found, mostly from memory:
- kill useless trailing backslashes
- fix tincd.rc header
- use ${rcexec} to start tincd, so that people can eg. put tincd in
a specific login class (eg. to have more file descriptors available)
tincd can change its uid after startup, is there any reason not to
enable this in the default config, by providing a dedicated
_tincd:_tincd user?
Updated tarball attached, diff below.
Cheers,
diff -pruN tinc.orig/Makefile tinc/Makefile
--- tinc.orig/Makefile Fri Oct 9 00:40:38 2015
+++ tinc/Makefile Mon Nov 2 22:06:59 2015
@@ -15,9 +15,9 @@ WANTLIB += c crypto lzo2 z
MASTER_SITES = http://www.tinc-vpn.org/packages/
-MODULES = converters/libiconv \
+MODULES = converters/libiconv
-LIB_DEPENDS += archivers/lzo2 \
+LIB_DEPENDS += archivers/lzo2
USE_GMAKE =Yes
USE_LIBTOOL= gnu
@@ -28,7 +28,7 @@ CONFIGURE_ENV=CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS = --sysconfdir=/etc \
---prefix=${LOCALBASE} \
+--prefix=${LOCALBASE}
.include
diff -pruN tinc.orig/pkg/tincd.rc tinc/pkg/tincd.rc
--- tinc.orig/pkg/tincd.rc Fri Oct 9 00:40:38 2015
+++ tinc/pkg/tincd.rc Mon Nov 2 22:08:40 2015
@@ -1,13 +1,13 @@
-# $OpenBSD:
#!/bin/sh
+#
+# $OpenBSD$
daemon="${TRUEPREFIX}/sbin/tincd"
. /etc/rc.d/rc.subr
-
rc_start() {
- ${daemon}
+ ${rcexec} "${daemon}"
}
rc_reload() {
tinc.tgz
Description: Binary data
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[update] netpbm-10.35.97
Trivial update to the latest version, tarball diff including ChangeLog at http://wxcvbn.org/~jca/tmp/netpbm-tarball-10.35.97.diff.txt Comments / oks? Index: Makefile === RCS file: /cvs/ports/graphics/netpbm/Makefile,v retrieving revision 1.72 diff -u -p -r1.72 Makefile --- Makefile8 Oct 2015 11:48:39 - 1.72 +++ Makefile28 Oct 2015 13:03:46 - @@ -2,7 +2,7 @@ COMMENT= toolkit for converting images between different formats -DISTNAME= netpbm-10.35.96 +DISTNAME= netpbm-10.35.97 SHARED_LIBS= netpbm 2.0 CATEGORIES=graphics HOMEPAGE= http://netpbm.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/graphics/netpbm/distinfo,v retrieving revision 1.28 diff -u -p -r1.28 distinfo --- distinfo8 Jul 2015 20:48:57 - 1.28 +++ distinfo28 Oct 2015 13:03:46 - @@ -1,2 +1,2 @@ -SHA256 (netpbm-10.35.96.tgz) = 5lLzZC6TAVavr/tMKOE17+AmtBzWS+IOJFsMgSSBnu4= -SIZE (netpbm-10.35.96.tgz) = 2559587 +SHA256 (netpbm-10.35.97.tgz) = b05fdTGxpOtoPClDbF/MKutwiwEoFL4s78F3tEpP0Wo= +SIZE (netpbm-10.35.97.tgz) = 2560007 -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: opendnssec and softhsm revisited
Hi,
Patrik Lundin writes:
> On Mon, Oct 12, 2015 at 11:34:46PM +0100, Stuart Henderson wrote:
>> On 2015/10/05 22:22, Patrik Lundin wrote:
>> > The 1.4.8.2 version of opendnssec was just released. This version
>> > incorporates the above mentioned fixes. You will find the port attached.
>>
>> Looks good to me. I've reserved uid/gid 757 so PLIST can be updated.
>>
>
> Great, thanks :).
>
>>
>> Only one thing I'm unsure about, I'd welcome other comments on this
>> though: the naming of the mariadb flavour. It is technically correct,
>> but we're not using -mariadb as a flavour name anywhere else, so I'd
>> be inclined to name it "mysql" for consistency with the rest of the
>> tree.
>>
>
> This sounds reasonable to me. Moving the ports tree from using "mysql"
> to "mariadb" in flavor names seems like something that should be done in
> a more controlled fashion than having some ports slowly start diverging.
+1
> Attached is a port with the uid/gid number updated to 757 in PLIST, as
> well as having the "mariadb" name reverted to "mysql" (except in the
> README file where I still refer to the mariadb-server package).
Here's an updated tarball that incorporates the following changes:
- merge two WANTLIB lines
- zap a redundant rc_reload=NO line
- tighten pexp
- use default rc_check()
opendnssec.tgz
Description: Binary data
diff -pruN opendnssec.orig/Makefile opendnssec/Makefile
--- opendnssec.orig/MakefileTue Oct 13 09:30:50 2015
+++ opendnssec/Makefile Tue Oct 13 12:42:05 2015
@@ -15,7 +15,7 @@ MAINTAINER= Patrik Lundin
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c crypto iconv ldns m pthread xml2 z
+WANTLIB += c crypto iconv ldns lzma m pthread xml2 z
MASTER_SITES= http://dist.opendnssec.org/source/
@@ -33,8 +33,6 @@ CONFIGURE_ARGS+= --disable-pedantic
FLAVORS= sqlite3 mysql
FLAVOR?= sqlite3
-
-WANTLIB+= lzma
.if ${FLAVOR:Msqlite3}
WANTLIB+= sqlite3
diff -pruN opendnssec.orig/pkg/opendnssec.rc opendnssec/pkg/opendnssec.rc
--- opendnssec.orig/pkg/opendnssec.rc Sun Apr 27 15:42:57 2014
+++ opendnssec/pkg/opendnssec.rcTue Oct 13 13:47:41 2015
@@ -8,20 +8,14 @@ daemon="${TRUEPREFIX}/sbin/ods-control"
rc_reload=NO
-pexp="ods-"
+pexp="${TRUEPREFIX}/sbin/ods-(enforcerd|signerd)"
-rc_reload=NO
-
rc_start() {
${rcexec} "${daemon} start"
}
rc_stop() {
${daemon} stop
-}
-
-rc_check() {
- pkill -0 "^${pexp}"
}
rc_cmd $1
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: devel/wxglade
Hi,
after feedback from landry and sthen:
- don't patch test.py, sthen improved python.port.mk to deal with
multiple spaces in shebang
- use ${INSTALL_DATA_DIR}, not "install -d"
- fix .desktop file, which tried to run "wxGlade"
- backport fix from upstream:
http://sourceforge.net/p/wxglade/mailman/message/32976385/
I have no time for this right now, but patching setup.py instead of
fixing paths in post-install was suggested
Updated tarball.
wxglade.tgz
Description: Binary data
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Remove^Wupdate net/tn5250?
"Jack J. Woehr" writes: > Jérémie Courrèges-Anglas wrote: >> I have just committed this update. Tests would be very much appreciated. > So I should: > > * Check out current > * Check out the current ports tree > * Build and test > > Correct? This is not 5.8, but the "current" current? > > Just making sure! Please install the base system from -current snapshots, not from source, eg. http://ftp.fr.openbsd.org/pub/OpenBSD/snapshots/amd64/ Then checkout the -current ports tree. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Remove^Wupdate net/tn5250?
"Jack J. Woehr" writes: > Stuart Henderson wrote: >> On 2015/10/07 13:32, Jérémie Courrèges-Anglas wrote: >>> >>> >>> Does anybody use this port? I can't really evaluate its usefulness, >>> and have no idea whether it actually still works. > > I used to use it and now use tn5250j, the Java one, exclusively. > > If it needs testing I might be able to set up a -current machine. I have just committed this update. Tests would be very much appreciated. >> I think it's worth keeping. One place where OpenBSD is a particularly >> good OS choice is as a bastion host used to access less-secure systems >> so I think terminal emulators for such systems are useful to have >> around. > > There are a few people who use OpenBSD to interoperate with IBM business > systems. Now if I could > only figure out how to VPN into Fortinet VPN's from OpenBSD ... I'm afraid I can't help. :) Cheers, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Remove^Wupdate net/tn5250?
Stuart Henderson writes:
> On 2015/10/07 13:32, Jérémie Courrèges-Anglas wrote:
>>
>> Hi,
>>
>> "tn5250 is a telnet client for the IBM iSeries and AS/400 that emulates
>> 5250 terminals and printers. This function is the same as that provided
>> by the 5250 emulator in IBM iSeries Access."
>>
>> Does anybody use this port? I can't really evaluate its usefulness,
>> and have no idea whether it actually still works. It hasn't been
>> updated since its initial import back in 2005 (upstream released a new
>> version in 2008). I sent a single mail upstream a few months ago, about
>> the SSLv3 fix, but got no reply.
>>
>> If we want to keep it, here's an update to the "latest" version:
>
> I think it's worth keeping. One place where OpenBSD is a particularly
> good OS choice is as a bastion host used to access less-secure systems
> so I think terminal emulators for such systems are useful to have around.
Indeed, good point.
> The update doesn't package for me though, perhaps missing 'make plist'?
Grmbl, sorry.
Index: Makefile
===
RCS file: /cvs/ports/net/tn5250/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile16 Mar 2015 18:07:53 - 1.14
+++ Makefile7 Oct 2015 13:24:18 -
@@ -2,9 +2,10 @@
COMMENT= 5250 telnet protocol and terminal
-DISTNAME= tn5250-0.17.3
-REVISION= 3
+DISTNAME= tn5250-0.17.4
+
SHARED_LIBS= 52500.0
+
CATEGORIES=net
HOMEPAGE= http://tn5250.sourceforge.net/
@@ -16,7 +17,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
WANTLIB= ncurses c ssl crypto
-AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-os-dir=no --with-ssl
Index: distinfo
===
RCS file: /cvs/ports/net/tn5250/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:14:53 - 1.3
+++ distinfo7 Oct 2015 13:24:18 -
@@ -1,2 +1,2 @@
-SHA256 (tn5250-0.17.3.tar.gz) = lW+8serGsrL6oKUXM838NwEDiY6v+rYRKGCLORYGGjY=
-SIZE (tn5250-0.17.3.tar.gz) = 38
+SHA256 (tn5250-0.17.4.tar.gz) = NUI31ADcRq+IfLP/pO0fLDcfW4vui+BGpoOkrJ20+cU=
+SIZE (tn5250-0.17.4.tar.gz) = 648452
Index: patches/patch-curses_cursesterm_h
===
RCS file: patches/patch-curses_cursesterm_h
diff -N patches/patch-curses_cursesterm_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-curses_cursesterm_h 7 Oct 2015 13:24:18 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- curses/cursesterm.h.orig Tue Oct 6 21:38:05 2015
curses/cursesterm.hTue Oct 6 21:39:49 2015
+@@ -29,8 +29,10 @@ extern "C" {
+ #if USE_CURSES
+ #ifdef HAVE_NCURSES_H
+ #include
++#include
+ #else
+ #include
++#include
+ #endif
+ #ifdef HAVE_TERMCAP_H
+ #include
Index: patches/patch-lib5250_sslstream_c
===
RCS file: patches/patch-lib5250_sslstream_c
diff -N patches/patch-lib5250_sslstream_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib5250_sslstream_c 7 Oct 2015 13:24:18 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Allow building against OpenSSL without SSLv2/SSLv3 support.
+
+--- lib5250/sslstream.c.orig Fri Nov 21 09:12:21 2008
lib5250/sslstream.cTue Oct 6 21:32:29 2015
+@@ -368,13 +368,19 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
+ methstr[4] = '\0';
+}
+
++#ifndef OPENSSL_NO_SSL2
+if (!strcmp(methstr, "ssl2")) {
+ meth = SSLv2_client_method();
+ TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
+- } else if (!strcmp(methstr, "ssl3")) {
++ } else
++#endif
++#ifndef OPENSSL_NO_SSL3
++ if (!strcmp(methstr, "ssl3")) {
+ meth = SSLv3_client_method();
+ TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
+- } else {
++ } else
++#endif
++ {
+ meth = SSLv23_client_method();
+ TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
+}
Index: patches/patch-src_sslstream_c
===
RCS file: patches/patch-src_sslstream_c
diff -N patches/patch-src_sslstream_c
--- patches/patch-src_sslstream_c 18 Jul 2015 04:59:42 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_sslstream_c,v 1.2 2015/07/18 04:59:42 sthen Exp $
-
-Allow building against OpenSSL without SSLv2/SSLv3 support.
-
src/sslstream.c.orig Fri Apr 1 17:08:55 2005
-+++ src/sslstream.cFri Jul 17 22:58:15 2015
-@@ -367,13 +367,19 @@ int tn5250_ssl_st
Remove^Wupdate net/tn5250?
Hi,
"tn5250 is a telnet client for the IBM iSeries and AS/400 that emulates
5250 terminals and printers. This function is the same as that provided
by the 5250 emulator in IBM iSeries Access."
Does anybody use this port? I can't really evaluate its usefulness,
and have no idea whether it actually still works. It hasn't been
updated since its initial import back in 2005 (upstream released a new
version in 2008). I sent a single mail upstream a few months ago, about
the SSLv3 fix, but got no reply.
If we want to keep it, here's an update to the "latest" version:
Index: Makefile
===
RCS file: /cvs/ports/net/tn5250/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile16 Mar 2015 18:07:53 - 1.14
+++ Makefile7 Oct 2015 11:31:54 -
@@ -2,9 +2,10 @@
COMMENT= 5250 telnet protocol and terminal
-DISTNAME= tn5250-0.17.3
-REVISION= 3
+DISTNAME= tn5250-0.17.4
+
SHARED_LIBS= 52500.0
+
CATEGORIES=net
HOMEPAGE= http://tn5250.sourceforge.net/
@@ -16,7 +17,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
WANTLIB= ncurses c ssl crypto
-AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-os-dir=no --with-ssl
Index: distinfo
===
RCS file: /cvs/ports/net/tn5250/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:14:53 - 1.3
+++ distinfo7 Oct 2015 11:31:54 -
@@ -1,2 +1,2 @@
-SHA256 (tn5250-0.17.3.tar.gz) = lW+8serGsrL6oKUXM838NwEDiY6v+rYRKGCLORYGGjY=
-SIZE (tn5250-0.17.3.tar.gz) = 38
+SHA256 (tn5250-0.17.4.tar.gz) = NUI31ADcRq+IfLP/pO0fLDcfW4vui+BGpoOkrJ20+cU=
+SIZE (tn5250-0.17.4.tar.gz) = 648452
Index: patches/patch-curses_cursesterm_h
===
RCS file: patches/patch-curses_cursesterm_h
diff -N patches/patch-curses_cursesterm_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-curses_cursesterm_h 7 Oct 2015 11:31:54 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- curses/cursesterm.h.orig Tue Oct 6 21:38:05 2015
curses/cursesterm.hTue Oct 6 21:39:49 2015
+@@ -29,8 +29,10 @@ extern "C" {
+ #if USE_CURSES
+ #ifdef HAVE_NCURSES_H
+ #include
++#include
+ #else
+ #include
++#include
+ #endif
+ #ifdef HAVE_TERMCAP_H
+ #include
Index: patches/patch-lib5250_sslstream_c
===
RCS file: patches/patch-lib5250_sslstream_c
diff -N patches/patch-lib5250_sslstream_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib5250_sslstream_c 7 Oct 2015 11:31:54 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Allow building against OpenSSL without SSLv2/SSLv3 support.
+
+--- lib5250/sslstream.c.orig Fri Nov 21 09:12:21 2008
lib5250/sslstream.cTue Oct 6 21:32:29 2015
+@@ -368,13 +368,19 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
+ methstr[4] = '\0';
+}
+
++#ifndef OPENSSL_NO_SSL2
+if (!strcmp(methstr, "ssl2")) {
+ meth = SSLv2_client_method();
+ TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
+- } else if (!strcmp(methstr, "ssl3")) {
++ } else
++#endif
++#ifndef OPENSSL_NO_SSL3
++ if (!strcmp(methstr, "ssl3")) {
+ meth = SSLv3_client_method();
+ TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
+- } else {
++ } else
++#endif
++ {
+ meth = SSLv23_client_method();
+ TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
+}
Index: patches/patch-src_sslstream_c
===
RCS file: patches/patch-src_sslstream_c
diff -N patches/patch-src_sslstream_c
--- patches/patch-src_sslstream_c 18 Jul 2015 04:59:42 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_sslstream_c,v 1.2 2015/07/18 04:59:42 sthen Exp $
-
-Allow building against OpenSSL without SSLv2/SSLv3 support.
-
src/sslstream.c.orig Fri Apr 1 17:08:55 2005
-+++ src/sslstream.cFri Jul 17 22:58:15 2015
-@@ -367,13 +367,19 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
- methstr[4] = '\0';
-}
-
-+#ifndef OPENSSL_NO_SSL2
-if (!strcmp(methstr, "ssl2")) {
- meth = SSLv2_client_method();
- TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
-- } else if (!strcmp(methstr, "ssl3")) {
-+ } else
-+#endif
-+#ifndef OPENSSL_NO_SSL3
-+ if (!strcmp(methstr, "ssl3")) {
- meth = SSLv3_client_method();
- TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
-- } else {
-+ } else
-+#endif
-+ {
- meth = SSLv23_client_method();
- TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
-}
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36
ocaml-ssl-0.5.1
Update to the latest version. CHANGES:
0.5.1 (2015-05-27)
=
* Fix META file for versions of OCaml older than 4.02.0 (thanks Anil
Madhavapeddy, closes #20).
0.5.0 (2015-05-18)
=
* Allow to honor server cipher preferences (thanks mfp, closes #18).
* Add functions for reading into/writing from bigarrays, avoiding copy (thanks
mfp, closes #15).
* Support disabling SSL protocol versions (thanks Edwin Török, closes #13).
* Use Bytes instead of String for read and write, changes the ABI thus the
version bump (thanks Vincent Bernardoff, closes #16, and mfp, closes #19).
* Make verbosity of client_verify_callback configurable (thanks Nicolas Trangez,
closes #12).
* Fix build with old versions of SSL (thanks Edwin Török, closes #10).
0.4.7 (2014-04-21)
=
* Add support for TLS1.1 and TLS1.2 (thanks Thomas Calderon).
* Add function to initialize Diffie-Hellman and elliptic curve parameters
(thanks Thomas Calderon and Edwin Török).
* Add set_client_SNI_hostname to specify client-side SNI hostname (thanks
Mauricio Fernandez).
* Fix double leave of blocking section in ocaml_ssl_accept (thanks Edwin Török).
* Check for errors in SSL_connect/SSL_accept (thanks Jérôme Vouillon).
* Clear the error queue before calling SSL_read and similar functions;
SSL_get_error does not work reliably otherwise (thanks Jérôme Vouillon).
* Allow static linking on Mingw64 (thanks schadinger).
This version does not integrate the patch I had submitted upstream,
which is a good thing because it can be improved: if SSLv3 is requested,
the error message should not be
"Unknown method (this should not have happened, please report)."
because there is no bug to report.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/ocaml-ssl/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile30 Aug 2015 16:27:32 - 1.7
+++ Makefile6 Oct 2015 16:58:25 -
@@ -4,9 +4,8 @@ COMMENT = OCaml bindings for libssl
CATEGORIES = devel security
NAME = ocaml-ssl
-DISTNAME = ${NAME}-0.4.6
+DISTNAME = ${NAME}-0.5.1
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=savonet/ocaml-ssl/}
-REVISION = 4
HOMEPAGE = http://sourceforge.net/projects/savonet/files/ocaml-ssl/
@@ -26,10 +25,9 @@ USE_GMAKE = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${NAME}/html
- ${INSTALL_DATA} ${WRKDIST}/{README,CHANGES} ${PREFIX}/share/doc/${NAME}/
+ ${INSTALL_DATA} ${WRKDIST}/{README.md,CHANGES}
${PREFIX}/share/doc/${NAME}/
${INSTALL_DATA} ${WRKDIST}/doc/html/* ${PREFIX}/share/doc/${NAME}/html/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${NAME}
${INSTALL_DATA} ${WRKDIST}/examples/* ${PREFIX}/share/examples/${NAME}/
-
.include
Index: distinfo
===
RCS file: /cvs/ports/security/ocaml-ssl/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo18 Aug 2012 22:34:57 - 1.1.1.1
+++ distinfo6 Oct 2015 16:52:57 -
@@ -1,2 +1,2 @@
-SHA256 (ocaml-ssl-0.4.6.tar.gz) = H/f7x3u17Htr/coEXGx6UdTZjtYKhl8p4G3ZEoWslJk=
-SIZE (ocaml-ssl-0.4.6.tar.gz) = 118798
+SHA256 (ocaml-ssl-0.5.1.tar.gz) = g7yPWypLmUPGS9+mYSOuHwmbNtdripigt7mc3ZSkd4c=
+SIZE (ocaml-ssl-0.5.1.tar.gz) = 125006
Index: patches/patch-src_ssl_stubs_c
===
RCS file: /cvs/ports/security/ocaml-ssl/patches/patch-src_ssl_stubs_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_ssl_stubs_c
--- patches/patch-src_ssl_stubs_c 28 Aug 2015 11:44:08 - 1.2
+++ patches/patch-src_ssl_stubs_c 6 Oct 2015 17:12:06 -
@@ -4,21 +4,21 @@ Fixed in
https://github.com/savonet/ocaml-ssl/commit/8f698ba93028f0b399f75079d4369f44db82182c
src/ssl_stubs.c.orig Sun Oct 16 12:57:56 2011
-+++ src/ssl_stubs.cSat Jul 18 12:28:06 2015
-@@ -269,6 +269,7 @@ static const SSL_METHOD *get_method(int protocol, int
- }
+--- src/ssl_stubs.c.orig Wed May 27 09:56:10 2015
src/ssl_stubs.cTue Oct 6 19:12:01 2015
+@@ -290,6 +290,7 @@ static const SSL_METHOD *get_method(int protocol, int
break;
-+#ifndef OPENSSL_NO_SSL3
case 1:
++#ifndef OPENSSL_NO_SSL3
switch (type)
{
-@@ -285,6 +286,7 @@ static const SSL_METHOD *get_method(int protocol, int
+ case 0:
+@@ -304,6 +305,7 @@ static const SSL_METHOD *get_method(int protocol, int
+ method = SSLv3_method();
break;
}
- break;
+#endif
+ break;
case 2:
- switch (type)
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/ocaml-ssl/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Aug 2012 22:34:57 - 1.1.1.1
+++ pkg/PLIST 6 Oct 2015 16:57:25 -
@@ -15,7 +15,7 @@ lib/ocaml/ss
Re: Kill the (tk) rat
Stuart Cassoff writes: > I believe that TkRat is a good candidate for removal. > It's old, unmaintained, ugly, no one uses it (most likely) > and it embeds an old imap library. As the website says, > The current stable release of TkRat is 2.1.5. Version 2.2 is nearing > completion. > Last modified 2007-04-21 17:59:51 by MaF. I think it makes more sense to remove it than to keep it. ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Remove www/yui?
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes: > Hi again, > > www/yui lags behind upstream, and it does little more than unzipping > a tarball. I think it belongs in this category: > > "web application with no benefit being packaged", #1 > > Any objection to remove it? Landry points out that YUI isn't maintained upstream anymore: http://yahooeng.tumblr.com/post/96098168666/important-announcement-regarding-yui#_=_ so I'll probably remove this *very* soon. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Remove www/yui?
Hi again, www/yui lags behind upstream, and it does little more than unzipping a tarball. I think it belongs in this category: "web application with no benefit being packaged", #1 Any objection to remove it? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [wip] clisp-2.49
Kenneth Westerback writes: > On 5 October 2015 at 11:51, Josh Elsasser wrote: [...] >> I thought I'd jumped in here but it looks like not. >> >> This builds and appears to pass tests on macppc, and builds an sbcl >> which also passes its tests. >> >> The fact that the configure script appears to be discovering and >> hardcoding random memory addresses is concerning, but I guess it was >> doing that already. >> >> Anyway, I'm OK with this and please feel free to remove me as >> maintainer and add yourself. My only interest in clisp is for >> bootstrapping sbcl anyway. > > Now I just feel bad. :-(. I'm ok with this going in as well unless you > want to wait for a sparc64 test. No need to wait! Markus Lude kindly reported that clisp packaged correctly on sparc64 and passes its regress test suite. Which means that amd64, i386, powerpc and sparc64 are fine (read: no worse than with clisp-2.48). I will now commit this, but will leave MAINTAINER empty. I don't want to have nightmares with clisp like I've had with emacs. ;) Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: par2cmdline 0.6.14 + fix for recovery issues
Mikolaj Kucharski writes: > On Mon, Oct 05, 2015 at 01:40:16PM +0200, Jrmie Courr??ges-Anglas wrote: >> Mikolaj: note that upstream already has AC_C_BIGENDIAN in its >> configure.ac and already uses it... *except* when the system has an >> include file. That special case is where the bug was >> introduced; what was the reason for this special case? > > Okay, I've looked at all this again and I think I know what you mean. > That part of the code which I think you are referring to (#if > HAVE_ENDIAN_H in par2cmdline.h) didn't change. There was par2cmdline 0.4 > in OpenBSD 5.5 and exactly the same version is in OpenBSD 5.6 and > __BYTE_ORDER define stopped to be defined properly in 5.6. > > Your question pointed me to look at endian.h detection under OpenBSD 5.5 > and 5.6 for par2cmdline 0.4 (as update to 0.6.14 is unrelated to > endianess problem) and bingo: Yup. [...] > However, I'm still not sure how to answer your question, about why they > wrote par2cmdline.h the way it's written, if it's that what you are actually > asking for, Jeremie. No idea either. Maybe this code is from a time where AC_C_BIGENDIAN didn't properly check endian.h (eg. only sys/param.h). But now it does, and the code could probably be simplified to check only WORDS_BIGENDIAN, not the presence of endian.h. Something like that in par2cmdline.h: #define __LITTLE_ENDIAN 1234 #define __BIG_ENDIAN4321 #define __PDP_ENDIAN3412 #if WORDS_BIGENDIAN # define __BYTE_ORDER __BIG_ENDIAN #else # define __BYTE_ORDER __LITTLE_ENDIAN #endif Further simplification is possible, as well as avoiding the use of these implementation-specific macros: #if WORDS_BIGENDIAN # define PAR2_BIGENDIAN 1 #else # define PAR2_BIGENDIAN 0 #endif Then use only #if PAR2_BIGENDIAN in the rest of the code. Other places which define __BYTE_ORDER in par2cmdline.h should be adapted too, of course. If you want to discuss this with upstream... -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Remove www/swfdec-plugin?
Hi, swfdec is unmaintained upstream[1] where the last release dates back to 2008. I doubt that it is of any (safe) use today. Linux distros have already removed it. Any objection to delete it? [1] http://swfdec.freedesktop.org/wiki/ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: devel/wxglade
Daniel Winters writes:
> Hi ports@,
Hi Daniel,
> attached is a tarball for a new port for wxGlade, a wxwidgets interface
> designer:
>
> wxGlade is a GUI designer written in Python with the popular GUI
> toolkit wxPython, that helps you create wxWidgets/wxPython user
> interfaces. At the moment it can generate Python, C++, Perl, Lisp and
> XRC (wxWidgets' XML resources) code.
>
> As you can guess by the name, its model is Glade, the famous GTK+/GNOME
> GUI builder, with which wxGlade shares the philosophy and the look &
> feel (but not a line of code).
>
> It is not (and will never be) a full featured IDE, but simply a
> "designer": the generated code does nothing apart from displaying the
> created widgets. If you are looking for a complete IDE, maybe Boa
> Constructor, PythonCard or Spe (which includes wxGlade itself, BTW...)
> is the right tool.
Looks fine to me, tested a bit with python code.
Some nits:
- I'd probably import it in x11 instead of devel.
("devel/ is too crowded".)
- the wxglade script should probably use ${SUBST_CMD} + ${MODPY_BIN}
(absolute path) instead of hardcoding python2.7. Actually this shell
script contains lots of stuff that don't make sense in a system-wide
install, looking for code to execute in nearby directories. Upstream,
it should probably be handled by setuptools entry_points/gui_scripts.
We could strip it down to:
#!/bin/sh
exec ${MODPY_BIN} -m wxglade.wxglade "$@"
- in DESCR:
It is not (and will never be) a full featured IDE, but simply a
"designer": the generated code does nothing apart from displaying the
created widgets. If you are looking for a complete IDE, maybe Boa
Constructor, PythonCard or Spe (which includes wxGlade itself, BTW...)
is the right tool.
I understand that this comes from upstream, but those projects look
pretty dead and aren't included in the ports tree. What about killing
the last sentence?
The tarball attached installs the manpage in the right place, adjusts
python shebangs and partially enables tests (some need X11).
Thoughts?
wxglade.tgz
Description: Binary data
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: par2cmdline 0.6.14 + fix for recovery issues
Stuart Henderson writes: > On 2015/10/04 22:41, Mikolaj Kucharski wrote: >> On Sun, Oct 04, 2015 at 10:15:12PM +0100, Mikolaj Kucharski wrote: >> > I would appreciate if someone look is my change sane. As this is long >> > overdue update from 0.4 to 0.6 which has also different upstream, I >> > decided to include whitespace changes in Makefile, as this update is >> > intrusive. >> >> - switch to sed -i >> - fix regress tests >> - all regress tests pass > > Looks good to me. The patch-README diff in your mail doesn't apply > directly, but it's just 'cvs rm' anyway so that's easy to fix. > > Would you be interested in taking MAINTAINER? FWIW, looks good to me too, ok jca@ Mikolaj: note that upstream already has AC_C_BIGENDIAN in its configure.ac and already uses it... *except* when the system has an include file. That special case is where the bug was introduced; what was the reason for this special case? Which reminds me that some versions of AC_C_BIGENDIAN are broken on powerpc... -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Newsbeuter segfaults on i386
Stuart Henderson writes:
> On 2015/10/04 20:22, Jérémie Courrèges-Anglas wrote:
>> I also had a diff for newsbeuter-2.9 but given the big changes - c++11
>> and wordexp - I kinda lost interest. ;)
>
> I think most actively-developed c++ programs seem to either already
> require c++11 or plan to need it soon (we are getting close to the
> situation we were in before we added gcc 4 to base). Since it has
> crash fixes I think updating makes sense.
>
> Requiring ports gcc won't restrict arch choices for newsbeuter - there
> are only packages for alpha, amd64, hppa, i386, sparc64.
ack
>> Looking at the differences between 2.7 and 2.9, I doubt that this issue
>> got fixed. newsbeuter stores rss feeds and items timestamps as integers
>> in cache.db, an sqlite database. sqlite3 uses 64 bits integers under
>> the hood, but the sqlite3 format strings used in newsbeuter specify '%u'
>> for timestamps. This can't work on i386, and may also be the reason for
>> a weird time_t value on amd64 in
>> https://marc.info/?l=openbsd-ports&m=144251853400773&w=2 .
>>
>> I can easily reproduce on i386 the crashes experienced by Raf, the
>> following patch seems to fix those, and also addresses other similar
>> problems. I could port it to 2.9 for inclusion in the ports tree, but
>> maybe it would be better to contact upstream, and fix both wordexp and
>> time_t problems there first.
>>
>> Anyway, here's the patch for 2.7. Thoughts?
>
> Definitely makes sense to me. OK (with a REVISION bump of course).
Sure.
> Side-note, -Wformat isn't triggered here. The sqlite printf-like
> functions aren't annotated, but even if I add this it doesn't help.
> I wonder what's up there.
Probably because sqlite3_vmprintf is wrapped in another function,
prepare_query. The following would activate warnings, but sqlite3
format strings are slightly different from printf format strings, making
the warnings unusable.
diff -pu /usr/obj/pobj/newsbeuter-2.7/newsbeuter-2.7/include/cache.h\~
/usr/obj/pobj/newsbeuter-2.7/newsbeuter-2.7/include/cache.h
--- /usr/obj/pobj/newsbeuter-2.7/newsbeuter-2.7/include/cache.h~Tue Aug
27 14:20:39 2013
+++ /usr/obj/pobj/newsbeuter-2.7/newsbeuter-2.7/include/cache.h Mon Oct 5
13:18:38 2015
@@ -44,7 +44,7 @@ class cache {
void clean_old_articles();
void update_rssitem_unlocked(std::tr1::shared_ptr
item, const std::string& feedurl, bool reset_unread);
- std::string prepare_query(const char * format, ...);
+ std::string prepare_query(const char * format, ...)
__attribute__((__format__ (printf, 2, 3)));;
sqlite3 * db;
configcontainer * cfg;
(For the curious, "2, 3" instead of "1, 2" because that function has an
implicit "this" argument.)
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Newsbeuter segfaults on i386
+cc MAINTAINER
Stuart Henderson writes:
> On 2015/10/04 16:18, Raf Czlonka wrote:
>> On Sun, Oct 04, 2015 at 01:30:15PM BST, Stuart Henderson wrote:
>> > On 2015/10/04 12:04, Raf Czlonka wrote:
>> > > Hi all,
>> > >
>> > > As suggested in the FAQ, I have emailed the port maintainer first but
>> > > hadn't heard back so forwarding the email here.
>> >
>> > Can you try running with the patch suggested in
>> > https://marc.info/?l=openbsd-ports&m=144257374414248&w=2 and see if you
>> > trigger the newly added log message?
>> >
>>
>> Hi Stuart,
>>
>> This was the very thread that prompted me to finally send an email to
>> ports@ about the issue.
>>
>> The OP experiences problems on amd64, the platform on which newsbeuter
>> always worked fine for me - hence my i386-specific subject.
>>
>> Nevertheless, I had built a package with the aforementioned patch -
>> still the same issue.
>>
>> Thanks for quick reply.
>>
>> Raf
>>
>
> I wonder if it got fixed in any of the updates upstream, can you try this?
> If you don't already have g++ 4.9 installed (eg++ doesn't exist) then pkg_add
> it first, you'll be there for ages if you have to build it from ports.
I also had a diff for newsbeuter-2.9 but given the big changes - c++11
and wordexp - I kinda lost interest. ;)
Looking at the differences between 2.7 and 2.9, I doubt that this issue
got fixed. newsbeuter stores rss feeds and items timestamps as integers
in cache.db, an sqlite database. sqlite3 uses 64 bits integers under
the hood, but the sqlite3 format strings used in newsbeuter specify '%u'
for timestamps. This can't work on i386, and may also be the reason for
a weird time_t value on amd64 in
https://marc.info/?l=openbsd-ports&m=144251853400773&w=2 .
I can easily reproduce on i386 the crashes experienced by Raf, the
following patch seems to fix those, and also addresses other similar
problems. I could port it to 2.9 for inclusion in the ports tree, but
maybe it would be better to contact upstream, and fix both wordexp and
time_t problems there first.
Anyway, here's the patch for 2.7. Thoughts?
Index: patches/patch-src_cache_cpp
===
RCS file: patches/patch-src_cache_cpp
diff -N patches/patch-src_cache_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_cache_cpp 4 Oct 2015 17:57:35 -
@@ -0,0 +1,77 @@
+$OpenBSD$
+--- src/cache.cpp.orig Tue Aug 27 14:20:39 2013
src/cache.cpp Sun Oct 4 19:56:03 2015
+@@ -80,7 +80,7 @@ static int lastmodified_callback(void * handler, int a
+ } else {
+ result->etag = "";
+ }
+- LOG(LOG_INFO, "lastmodified_callback: lastmodified = %d etag = %s",
result->lastmodified, result->etag.c_str());
++ LOG(LOG_INFO, "lastmodified_callback: lastmodified = %lld etag = %s",
(long long)result->lastmodified, result->etag.c_str());
+ return 0;
+ }
+
+@@ -295,7 +295,7 @@ void cache::fetch_lastmodified(const std::string& feed
+ }
+ t = result.lastmodified;
+ etag = result.etag;
+- LOG(LOG_DEBUG, "cache::fetch_lastmodified: t = %d etag = %s", t,
etag.c_str());
++ LOG(LOG_DEBUG, "cache::fetch_lastmodified: t = %lld etag = %s", (long
long)t, etag.c_str());
+ }
+
+ void cache::update_lastmodified(const std::string& feedurl, time_t t, const
std::string& etag) {
+@@ -306,7 +306,7 @@ void cache::update_lastmodified(const std::string& fee
+ scope_mutex lock(&mtx);
+ std::string query = "UPDATE rss_feed SET ";
+ if (t > 0)
+- query.append(utils::strprintf("lastmodified = '%d'", t));
++ query.append(utils::strprintf("lastmodified = '%lld'", (long
long)t));
+ if (etag.length() > 0)
+ query.append(utils::strprintf("%c etag = %s", (t > 0 ? ',' : '
'), prepare_query("'%q'", etag.c_str()).c_str()));
+ query.append(" WHERE rssurl = ");
+@@ -643,9 +643,9 @@ void cache::update_rssitem_unlocked(std::tr1::shared_p
+ }
+ } else {
+ std::string insert = prepare_query("INSERT INTO rss_item
(guid,title,author,url,feedurl,pubDate,content,unread,enclosure_url,enclosure_type,enqueued,
base) "
+- "VALUES
('%q','%q','%q','%q','%q','%u','%q','%d','%q','%q',%d, '%q')",
++ "VALUES
('%q','%q','%q','%q','%q','%lld','%q','%d','%q','%q',%d, '%q')",
+
item->guid().c_str(), item->title_raw().c_str(), item->author_raw().c_str(),
+-
item->link().c_str(), feedurl.c_str(), item->pubDate_timestamp(),
item->description_raw().c_str(), (item->unread() ? 1 : 0),
++
item->link().c_str(), feedurl.c_str(), (long long)item->pubDate_timestamp(),
item->description_raw().c_str(), (item->unread() ?
Re: update editors/joe
Daniel Jakots writes: > On Sat, 3 Oct 2015 14:14:59 +0100, Stuart Henderson > wrote: > >> On 2015/10/03 09:41, Daniel Jakots wrote: >> > Here's an update to the latest stable release. My really light >> > testing discovered a use after free. Thanks Quentin Rameau for >> > providing a patch for it (committed upstream now). > > Thanks for your input, updated diff. Regarding Stuart's comments, that your diff addresses: - joerc.zh_TW should indeed have been @sampled, it is a config file - .po files didn't need to be @sampled at all - the new syntax files should have been @sampled too Your updated diff also switched the bugfix in patches/ from a hand-rolled patch to the result of ''make update-patches'', which is desirable. Describing the changes you've done makes it easier for reviewers. ;) I have just committed your diff. Thanks! -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [wip] clisp-2.49
Kenneth Westerback writes: > On 30 September 2015 at 04:11, Jérémie Courrèges-Anglas > wrote: >> >> Last night I ran ''make; make clean'' in a loop on i386 and amd64. >> >> amd64: 142 builds / 0 failures >> i386: 58 builds / 2 failures >> >> (same failure as yours) >> >> Maybe this has something to do with this... >> >> [...] >> checking for the code address range... 0x1600 >> checking for the malloc address range... 0x8700 >> checking for the shared library address range... 0x2D00 >> checking for the stack address range... 0xCF00 >> [...] >> >> -- >> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE > > Black magic as far as I am concerned. :-) 2.48 fails at the same rate on i386. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [wip] clisp-2.49
Last night I ran ''make; make clean'' in a loop on i386 and amd64. amd64: 142 builds / 0 failures i386: 58 builds / 2 failures (same failure as yours) Maybe this has something to do with this... [...] checking for the code address range... 0x1600 checking for the malloc address range... 0x8700 checking for the shared library address range... 0x2D00 checking for the stack address range... 0xCF00 [...] -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [wip] clisp-2.49
Kenneth Westerback writes: [...] > That didn't take long. > > cc -I/usr/local/include > -I/home/packages/wrkobj/clisp-2.49/build-i386/gllib -O2 -pipe -W > -Wswitch -Wcomment -Wpointer-arith -Wimplicit -Wreturn-type > -Wmissing-declarations -Wno-sign-compare -Wno-format-nonliteral -O2 > -fexpensive-optimizations -falign-functions=4 -DNO_SINGLEMAP > -DNO_TRIVIALMAP -DENABLE_UNICODE -DDYNAMIC_FFI -I. -c spvw.c > In file included from > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/lispbibl.d:1983, > from > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/spvw.d:23: > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/unix.d:65:1: warning: > "MAP_ANON" redefined > In file included from > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/unix.d:62, > from > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/lispbibl.d:1983, > from > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/spvw.d:23: > /usr/include/sys/mman.h:59:1: warning: this is the location of the > previous definition > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/spvw.d: In function > 'init_memory': > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/spvw.d:2881: error: > 'MAP_ANON' undeclared (first use in this function) > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/spvw.d:2881: error: > (Each undeclared identifier is reported only once > /home/packages/wrkobj/clisp-2.49/clisp-2.49/src/spvw.d:2881: error: > for each function it appears in.) > Makefile:1382: recipe for target 'spvw.o' failed > gmake: *** [spvw.o] Error 1 > *** Error 2 in lang/clisp > (/usr/ports/infrastructure/mk/bsd.port.mk:2767 > '/home/packages/wrkobj/clisp-2.49/build-i386/.build_done') > *** Error 1 in lang/clisp > (/usr/ports/infrastructure/mk/bsd.port.mk:2488 'build') > ===> Exiting lang/clisp with an error > *** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'build') > Error: job failed 256 > > Full clisp-2.49.log at ~krw on cvs. Weird, I've just successfully built clisp on a freshly updated i386. Thanks for the log, I'm taking a look. [...] Real time: 117.58248 sec. Run time: 102.05 sec. Space: 1060930792 Bytes GC: 1410, GC time: 26.42 sec. 0 Bye. (echo *.erg | grep '*' >/dev/null) || (echo "Test failed:" ; ls -l *erg; echo "To see which tests failed, type" ; echo "cat "`pwd`"/*.erg" ; exit 1) echo "Test passed." Test passed. gmake[1]: Leaving directory '/usr/ports/pobj/clisp-2.49/build-i386/tests' shannon /usr/ports/lang/clisp$ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [wip] clisp-2.49
Kenneth Westerback writes: > I can probably set up build tests on i386 and sparc64 and eventually > macppc if that would help. That would be great. :) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[wip] clisp-2.49
I've had several tentative diffs to update clisp, but every time
I delete them because of frustrations with the build system.
This has to stop!
Here's a tentative diff, probably not perfect. I did not enable the use
of shared modules, cause I don't know how to use them. There are a few
missing entries in the PLIST, I did not investigate further yet.
Passes make test, builds a working sbcl on amd64. Dunno about other
archs.
Index: Makefile
===
RCS file: /cvs/ports/lang/clisp/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile21 Mar 2013 08:46:32 - 1.43
+++ Makefile28 Sep 2015 23:07:04 -
@@ -4,8 +4,7 @@ ONLY_FOR_ARCHS =amd64 i386 powerpc spar
COMMENT = ANSI Common Lisp implementation
-DISTNAME= clisp-2.48
-REVISION = 3
+DISTNAME= clisp-2.49
CATEGORIES=lang
HOMEPAGE= http://clisp.cons.org/
MAINTAINER = Joshua Elsasser
@@ -35,7 +34,9 @@ CONFIGURE_ARGS= --fsstnd=openbsd \
--docdir=${PREFIX}/share/doc/clisp \
--elispdir=${PREFIX}/share/emacs/site-lisp \
--vimdir=${PREFIX}/share/doc/clisp \
- --srcdir=${WRKSRC} ${WRKBUILD}
+ --srcdir=${WRKSRC} ${WRKBUILD} \
+ --without-dynamic-modules
+
CONFIGURE_ENV =ac_cv_prog_DVIPDF=''
.if ${MACHINE_ARCH} == "sparc64"
@@ -49,5 +50,8 @@ LDFLAGS +=-nopie
.else
CONFIGURE_ARGS += --without-gmalloc
.endif
+
+pre-build:
+ ln -sf ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/clisp/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo18 Jan 2015 03:14:18 - 1.10
+++ distinfo28 Sep 2015 18:58:02 -
@@ -1,2 +1,2 @@
-SHA256 (clisp-2.48.tar.bz2) = Bbg/VghZojZ5zPwHOhKKU3f+lInXNEMaPcMu+I8MPcI=
-SIZE (clisp-2.48.tar.bz2) = 7885098
+SHA256 (clisp-2.49.tar.bz2) = gTL/NTr6pw5rGTZ6Ja49WkNicnnCVkfCIGQf7QD46JA=
+SIZE (clisp-2.49.tar.bz2) = 8091011
Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/clisp/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 7 Jan 2010 10:55:28 - 1.3
+++ patches/patch-configure 28 Sep 2015 23:14:55 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2010/01/07 10:55:28 edd Exp $
configure.orig Thu Jan 15 08:37:34 2009
-+++ configure Wed Dec 30 01:35:49 2009
-@@ -389,7 +389,7 @@ do
+--- configure.orig Mon Dec 14 15:37:22 2009
configure Tue Sep 29 01:08:02 2015
+@@ -383,7 +383,7 @@ do
passnext=both ;;
--elispdir=* | --elispdi=* | --elispd=* | --elisp=* | --elis=* |
--eli=* | --el=*)
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.3 2010/01/
makemake_args="$makemake_args --elispdir="`getarg "$arg"` ;;
--elispdir | --elispdi | --elispd | --elisp | --elis | --eli | --el)
-@@ -399,7 +399,7 @@ do
+@@ -393,7 +393,7 @@ do
passnext=both ;;
--vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*)
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.3 2010/01/
makemake_args="$makemake_args --vimdir="`getarg "$arg"` ;;
--vimdir | --vimdi | --vimd | --vim | --vi)
-@@ -744,8 +744,7 @@ stacksizelimit=`ulimit -s 2>/dev/null || :` # cygwin /
+@@ -723,8 +723,7 @@ stacksizelimit=`ulimit -s 2>/dev/null || :` # cygwin /
# need 3 separate test calls because of "integer expression expected" errors
# when $stacksizelimit is "" or "unlimited" (no short-circuiting!)
set +e;
Index: patches/patch-src_clisp-link_in
===
RCS file: /cvs/ports/lang/clisp/patches/patch-src_clisp-link_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_clisp-link_in
--- patches/patch-src_clisp-link_in 7 Jan 2010 10:55:28 - 1.1
+++ patches/patch-src_clisp-link_in 28 Sep 2015 19:00:58 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_clisp-link_in,v 1.1 2010/01/07 10:55:28 edd Exp $
src/clisp-link.in.orig Wed Jun 17 19:30:31 2009
-+++ src/clisp-link.in Sat Jan 2 19:08:19 2010
-@@ -336,6 +336,7 @@ case "$1" in
- link_some "$sourcedir" "$destinationdir" ${LISPRUN} lispinit.mem
modules.h modules.o makevars ${FILES};
+--- src/clisp-link.in.orig Tue May 25 21:54:54 2010
src/clisp-link.in Mon Sep 28 20:59:27 2015
+@@ -382,6 +382,7 @@ case "$1" in
+ lncp_some "$sourcedir" "$destinationdir" ${LISPRUN} lispinit.mem
modules.h modules.o makevars ${FILES};
else
cp "$sourcedir"/modules.h "$destinationdir"/modules.h
-+ chmod +w "$destinationdir"/modules.h
- FILES=`link_some "$so
Re: [NEW] audio/libdiscid
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes: [...] audio/libdiscid has been imported, thanks Stuart for the review. > Looks good to me. I'm not sure whether TEST_IS_INTERACTIVE=Yes is > really needed, actually I don't really care. :) Maybe others have > a stronger opinion. I just zapped TEST_IS_INTERACTIVE=Yes, as hinted by Stuart. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [NEW] audio/libdiscid
Donovan Watteau writes:
[...]
>> > Looks fine to me, two nits:
>> >
>> > 1.
>> > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
>> >LDFLAGS="-L${LOCALBASE}/lib" \
>> >ac_cv_header_musicbrainz5_mb5_c_h=no
>> >
>> > If there is no dep on other packages then there is no need to tweak
>> > CPP/LDFLAGS. And if usr/local isn't in those flags,
>> > ac_cv_header_musicbrainz5_mb5_c_h=no is not needed (but you may want to
>> > keep it for documentation).
>>
>> OK, I'll simplify this. ac_cv_header_musicbrainz5_mb5_c_h=no is enough.
>>
>> > 2. Any idea why two tests out of four are skipped?
>> >
>> > ...
>>
>> Looks like it happens when you don't have a CD-ROM drive...
>>
>> On loongson, I see this:
>>
>> ===
>>libdiscid 0.6.1: ./test-suite.log
>> ===
>>
>> # TOTAL: 4
>> # PASS: 2
>> # SKIP: 2
>> # XFAIL: 0
>> # FAIL: 0
>> # XPASS: 0
>> # ERROR: 0
>>
>> .. contents:: :depth: 2
>>
>> SKIP: test_read
>> ===
>>
>> Testing discid_has_feature ... OK
>> Testing discid_read_sparse ... SKIP
>> Testing discid_get_error_msg ... OK
>> cannot open device `/dev/rcd0c'
>>
>>
>> SKIP: test_read_full
>>
>>
>> Testing discid_has_feature ... OK
>> Testing discid_read ... SKIP
>> Testing discid_get_error_msg ... OK
>> cannot open device `/dev/rcd0c'
>>
>>
>> Don't know what is the best way to deal with this. Adding a comment?
>> TEST_IS_INTERACTIVE=Yes ?
>>
>
> So, it looks like you even need an audio CD in your drive to pass all
> the tests. So TEST_IS_INTERACTIVE=Yes looks good to me.
>
> So here's my port again. Thanks.
Looks good to me. I'm not sure whether TEST_IS_INTERACTIVE=Yes is
really needed, actually I don't really care. :) Maybe others have
a stronger opinion.
Please folks, can I get reviews / oks to import this?
Re-attaching the port here for convenience,
libdiscid_v3.tgz
Description: Binary data
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
devel/py-nose test for the python3 flavor
Hi,
py-nose currently has python3 tests disabled, I think we can do better.
Moving twisted to python3 doesn't seem possible right now (I did not
look further than https://twistedmatrix.com/trac/wiki/Plan/Python3).
But the other test deps support a python3 flavor.
Result:
--8<--
Ran 226 tests in 5.784s
OK (SKIP=2)
-->8--
Comments / ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/py-nose/Makefile,v
retrieving revision 1.30
diff -u -p -p -u -r1.30 Makefile
--- Makefile26 Jun 2015 06:55:47 - 1.30
+++ Makefile23 Sep 2015 15:49:25 -
@@ -22,12 +22,10 @@ MODULES=lang/python
FLAVORS= python3
FLAVOR?=
-.if ${FLAVOR:Mpython3}
-NO_TEST= Yes
-.else
-TEST_DEPENDS= ${FULLPKGNAME}:devel/py-nose \
- devel/py-twisted/core \
- devel/py-coverage
+TEST_DEPENDS= ${FULLPKGNAME}:devel/py-nose${MODPY_FLAVOR} \
+ devel/py-coverage${MODPY_FLAVOR}
+.if !${FLAVOR:Mpython3}
+TEST_DEPENDS+= devel/py-twisted/core
.endif
USE_GROFF =Yes
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: patch-devel-flex
Hi, Yozo TODA writes: > (I sent this message yesterday, but the server rejected it because my > provider's mail server is > classified as UCEProtect level1. Now I'm sending this from gmail account...) > > I found that flex port tries to build flex.pdf, requiring TeX but no > dependency. > I believe the PDF document is not necessary because it already > contains info document > (flex.info, flex.info-1, flex.info-2). > > Here is a patch to remove pdf creation. Some people hate the info format and would probably prefer reading the pdf. Also, the only advantage is 500KB saved on disk, not even a reduction of the build deps. This is not a desirable change IMO. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: newsbeuter 2.7 dumps core
Dunno where newsbeuter logs stuff, but this might help to find the cause
of the problem:
Index: patches/patch-src_rss_cpp
===
RCS file: patches/patch-src_rss_cpp
diff -N patches/patch-src_rss_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_rss_cpp 18 Sep 2015 10:36:32 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- src/rss.cpp.orig Tue Aug 27 14:20:39 2013
src/rss.cppFri Sep 18 12:32:07 2015
+@@ -113,7 +113,11 @@ void rss_item::set_unread(bool u) {
+
+ std::string rss_item::pubDate() const {
+ char text[1024];
+- strftime(text,sizeof(text),"%a, %d %b %Y %T %z", localtime(&pubDate_));
++ struct tm *tm;
++ tm = localtime(&pubDate_);
++ if (tm == NULL)
++ LOG(LOG_ERROR, "localtime() failed with param %lld", (long
long)pubDate_);
++ strftime(text,sizeof(text),"%a, %d %b %Y %T %z", tm);
+ return std::string(text);
+ }
+
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [Update] npth-1.2
Pierre-Emmanuel André writes: > Hi, > > This diff updates npth to it's latest version. > Tested on @amd64 with gnupg-2.1.8. > Comments, ok ? Looks fine to me, ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: mail/libetpan update (hint: claws-mail)
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> Major bump because I'm not sure whether a minor one is actually enough.
> No more autotools goo, no more docs since it comes straight out of the
> git repo. Making releases is hard. Extra time_t fixes because it
> seemed easy in comparison to building the docs...
>
> sigh
Updated diff that adds feedback from sthen@: use
MODGNU_AUTO{CONF,MAKE}_DEPENDS and an additional cast/format string fix.
Index: Makefile
===
RCS file: /cvs/ports/mail/libetpan/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile21 Apr 2015 18:24:22 - 1.16
+++ Makefile17 Sep 2015 18:31:22 -
@@ -2,14 +2,15 @@
COMMENT= mail purpose library
-DISTNAME= libetpan-1.0
-REVISION= 3
+GH_ACCOUNT=dinhviethoa
+GH_PROJECT=libetpan
+GH_TAGNAME=1.6
+DISTNAME= libetpan-1.6
CATEGORIES=mail devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libetpan/}
-SHARED_LIBS= etpan 14.0
+SHARED_LIBS= etpan 15.0
-HOMEPAGE= http://libetpan.sourceforge.net/
+HOMEPAGE= http://www.etpan.org/libetpan.html
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -18,26 +19,28 @@ WANTLIB += crypto curl expat idn m pthre
MODULES= devel/gettext
-
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ devel/libtool
LIB_DEPENDS+= net/curl \
devel/libidn \
security/cyrus-sasl2
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --without-gnutls --with-sasl=${LOCALBASE}
+CONFIGURE_ARGS+= --with-curl=auto \
+ --with-sasl="${LOCALBASE}" \
+ --without-gnutls
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-NO_TEST= Yes
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libetpan/html/{API,README}
- ${INSTALL_DATA}
${WRKSRC}/{COPYRIGHT,doc/{DOCUMENTATION,{API,README}.txt}}
${PREFIX}/share/doc/libetpan
-. for d in API README
- ${INSTALL_DATA} ${WRKSRC}/doc/${d}.html
${PREFIX}/share/doc/libetpan/html
- cd ${WRKSRC}/doc/${d};\
- find * -exec ${INSTALL_DATA} {}
${PREFIX}/share/doc/libetpan/html/${d}/{} \;
-. endfor
+post-patch:
+ cd ${WRKSRC} && ${SETENV} \
+ AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
+ AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
+ NOCONFIGURE=1 \
+ ./autogen.sh
.include
Index: distinfo
===
RCS file: /cvs/ports/mail/libetpan/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:14:22 - 1.6
+++ distinfo17 Sep 2015 18:31:22 -
@@ -1,2 +1,2 @@
-SHA256 (libetpan-1.0.tar.gz) = z+PvZ0Jbta1XyMI6Re6hrf/Try51R5MujThOOt381V4=
-SIZE (libetpan-1.0.tar.gz) = 1669965
+SHA256 (libetpan-1.6.tar.gz) = eWKx+URb4k0ety2t2rrrtCcHTBSlDp2tDOvewETHHhc=
+SIZE (libetpan-1.6.tar.gz) = 6144117
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 17 Sep 2015 18:31:22 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Fix wrong logic that turns off curl and expat support.
+
+--- configure.ac.orig Fri Oct 31 22:41:02 2014
configure.ac Thu Sep 17 19:08:19 2015
+@@ -581,7 +581,7 @@ dnl libcurl
+ libcurl=no
+ AC_ARG_WITH(curl, [ --with-curl[=DIR]curl install directory
(default=auto)],
+ [], [with_curl=auto])
+-if test "x$with_curl" != "xno"; then
++if test "x$with_curl" = "xno"; then
+ :
+ elif test "x$with_curl" != "xauto"; then
+ OCPPFLAGS="$CPPFLAGS"
+@@ -639,7 +639,7 @@ dnl expat
+ libexpat=no
+ AC_ARG_WITH(expat, [ --with-expat[=DIR]expat install directory
(default=auto)],
+ [], [with_expat=auto])
+-if test "x$with_expat" != "xno"; then
++if test "x$with_expat" = "xno"; then
+ :
+ elif test "x$with_expat" != "xauto"; then
+ OCPPFLAGS="$CPPFLAGS"
Index: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
===
RCS file: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
diff -N patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
17 Sep 2015 18:31:22 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/driver/implementation/mh/m
mail/libetpan update (hint: claws-mail)
Major bump because I'm not sure whether a minor one is actually enough.
No more autotools goo, no more docs since it comes straight out of the
git repo. Making releases is hard. Extra time_t fixes because it
seemed easy in comparison to building the docs...
sigh
Index: Makefile
===
RCS file: /cvs/ports/mail/libetpan/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile21 Apr 2015 18:24:22 - 1.16
+++ Makefile17 Sep 2015 17:41:08 -
@@ -2,14 +2,15 @@
COMMENT= mail purpose library
-DISTNAME= libetpan-1.0
-REVISION= 3
+GH_ACCOUNT=dinhviethoa
+GH_PROJECT=libetpan
+GH_TAGNAME=1.6
+DISTNAME= libetpan-1.6
CATEGORIES=mail devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libetpan/}
-SHARED_LIBS= etpan 14.0
+SHARED_LIBS= etpan 15.0
-HOMEPAGE= http://libetpan.sourceforge.net/
+HOMEPAGE= http://www.etpan.org/libetpan.html
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -18,26 +19,28 @@ WANTLIB += crypto curl expat idn m pthre
MODULES= devel/gettext
-
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
+BUILD_DEPENDS= devel/autoconf/${AUTOCONF_VERSION} \
+ devel/automake/${AUTOMAKE_VERSION} \
+ devel/libtool
LIB_DEPENDS+= net/curl \
devel/libidn \
security/cyrus-sasl2
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --without-gnutls --with-sasl=${LOCALBASE}
+CONFIGURE_ARGS+= --with-curl=auto \
+ --with-sasl="${LOCALBASE}" \
+ --without-gnutls
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-NO_TEST= Yes
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libetpan/html/{API,README}
- ${INSTALL_DATA}
${WRKSRC}/{COPYRIGHT,doc/{DOCUMENTATION,{API,README}.txt}}
${PREFIX}/share/doc/libetpan
-. for d in API README
- ${INSTALL_DATA} ${WRKSRC}/doc/${d}.html
${PREFIX}/share/doc/libetpan/html
- cd ${WRKSRC}/doc/${d};\
- find * -exec ${INSTALL_DATA} {}
${PREFIX}/share/doc/libetpan/html/${d}/{} \;
-. endfor
+post-patch:
+ cd ${WRKSRC} && ${SETENV} \
+ AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
+ AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
+ NOCONFIGURE=1 \
+ ./autogen.sh
.include
Index: distinfo
===
RCS file: /cvs/ports/mail/libetpan/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:14:22 - 1.6
+++ distinfo17 Sep 2015 17:41:08 -
@@ -1,2 +1,2 @@
-SHA256 (libetpan-1.0.tar.gz) = z+PvZ0Jbta1XyMI6Re6hrf/Try51R5MujThOOt381V4=
-SIZE (libetpan-1.0.tar.gz) = 1669965
+SHA256 (libetpan-1.6.tar.gz) = eWKx+URb4k0ety2t2rrrtCcHTBSlDp2tDOvewETHHhc=
+SIZE (libetpan-1.6.tar.gz) = 6144117
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 17 Sep 2015 17:41:08 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Fix wrong logic that turns off curl and expat support.
+
+--- configure.ac.orig Fri Oct 31 22:41:02 2014
configure.ac Thu Sep 17 19:08:19 2015
+@@ -581,7 +581,7 @@ dnl libcurl
+ libcurl=no
+ AC_ARG_WITH(curl, [ --with-curl[=DIR]curl install directory
(default=auto)],
+ [], [with_curl=auto])
+-if test "x$with_curl" != "xno"; then
++if test "x$with_curl" = "xno"; then
+ :
+ elif test "x$with_curl" != "xauto"; then
+ OCPPFLAGS="$CPPFLAGS"
+@@ -639,7 +639,7 @@ dnl expat
+ libexpat=no
+ AC_ARG_WITH(expat, [ --with-expat[=DIR]expat install directory
(default=auto)],
+ [], [with_expat=auto])
+-if test "x$with_expat" != "xno"; then
++if test "x$with_expat" = "xno"; then
+ :
+ elif test "x$with_expat" != "xauto"; then
+ OCPPFLAGS="$CPPFLAGS"
Index: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
===
RCS file: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
diff -N patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
17 Sep 2015 17:41:08 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/driver/implementation/mh/mhdriver_cached_message.c.origThu Sep
17 19:00:34 2015
src/driver/implementation/mh/mhdriver_cached_message.c Thu Sep 17
19:01:39 2015
+@@ -187,8 +187,8 @@ static int mh_initialize(mailmessage * msg_info)
+
+ mh_msg_info = data.data;
+
+- snprintf(static_uid, PATH_MAX, "%u-%lu-%lu", msg_info->msg_index,
+- mh_msg_info->msg_mtime, (unsigned long) mh_msg_info->msg_
Re: [patch] devel/ocaml-parmap on non-native archs
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> I've just packaged this on sparc64. Parmap.get_default_ncores returns
> the expected result. If you used devel/coccinelle on, say, armv7 or
> sparc64, you might be interested.
>
> Comments / ok?
Patches simplified and committed upstream. Tested on amd64 and sparc64.
Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-parmap/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile13 Sep 2015 15:20:19 - 1.1.1.1
+++ Makefile17 Sep 2015 11:23:41 -
@@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2015/09/13 15:20:19 sthen Exp $
-SHARED_ONLY = Yes
-ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS}
-
COMMENT = OCaml parallel map primitive for multicores
CATEGORIES = devel
V =1.0-rc6
+REVISION = 0
NAME = ocaml-parmap
DISTNAME = ocaml-parmap-$V
DISTFILES =${DISTNAME}{$V}.tar.gz
@@ -24,6 +22,13 @@ BUILD_DEPENDS = sysutils/findlib
USE_GMAKE =Yes
CONFIGURE_STYLE = gnu
+
+.include
+.if !${PROPERTIES:Mocaml_native_dynlink}
+MAKE_FLAGS+= CMXSLIBS=
+.endif
+
+FAKE_FLAGS = DESTDIR=${WRKINST}${TRUEPREFIX}
TEST_TARGET = tests
TEST_DEPENDS = ${BASE_PKGPATH}
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 17 Sep 2015 11:23:41 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Fixed in
https://github.com/rdicosmo/parmap/commit/58f56f50c3af179c33bb3e55b0b22190e85208a3
+
+--- Makefile.in.orig Mon Feb 9 11:42:28 2015
Makefile.inWed Sep 16 21:19:13 2015
+@@ -46,12 +46,11 @@ CMXSLIBS=
+ ALIBS=
+
+ ifeq ("@OCAMLBEST@","opt")
++ ALIBS = $(BYTELIBS:%.cma=%.a)
+ OPTLIBS += $(BYTELIBS:%.cma=%.cmxa)
+ CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
+ endif
+
+-ALIBS = $(BYTELIBS:%.cma=%.a)
+-
+ all:
+ $(OCAMLBUILD) $(OBFLAGS) $(BYTELIBS) $(OPTLIBS) $(CMXSLIBS) $(ALIBS)
+
+@@ -86,7 +85,7 @@ install: $(LIBS) META
+ $(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
+ (cd _build; ocamldoc -man -man-mini parmap.ml parmap.mli)
+ test -d $(MANDIR) || mkdir -p $(MANDIR)
+- cp -a _build/Parmap.3o $(MANDIR)
++ cp -p _build/Parmap.3o $(MANDIR)
+
+ uninstall:
+ $(UNINSTALL) $(NAME)
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 17 Sep 2015 11:23:41 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fixed in
https://github.com/rdicosmo/parmap/commit/a276c4ac61d5f06f1f966a88a551892f290bbb40
+
+--- configure.orig Mon Sep 14 20:17:21 2015
configure Mon Sep 14 20:18:32 2015
+@@ -4379,8 +4379,8 @@ _ACEOF
+ ac_config_headers="$ac_config_headers config.h"
+
+
+-t=`$OCAMLBUILD -use-ocamlfind &> /dev/null; echo $?`
+-if test $t == 0 ; then
++t=`$OCAMLBUILD -use-ocamlfind >/dev/null 2>&1; echo $?`
++if test "$t" = 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ocaml version
$OCAMLVERSION. Use standard Makefile" >&5
+ $as_echo "ocaml version $OCAMLVERSION. Use standard Makefile" >&6; }
+ ac_config_files="$ac_config_files Makefile"
Index: pkg/PFRAG.dynlink-native
===
RCS file: pkg/PFRAG.dynlink-native
diff -N pkg/PFRAG.dynlink-native
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.dynlink-native17 Sep 2015 11:23:41 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@bin lib/ocaml/parmap/parmap.cmxs
Index: pkg/PFRAG.native
===
RCS file: pkg/PFRAG.native
diff -N pkg/PFRAG.native
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.native17 Sep 2015 11:23:41 -
@@ -0,0 +1,4 @@
+@comment $OpenBSD$
+%%dynlink%%
+lib/ocaml/parmap/parmap.a
+lib/ocaml/parmap/parmap.cmxa
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.shared17 Sep 2015 11:23:41 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+lib/ocaml/stublibs/dllparmap_stubs.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ocaml-parmap/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 13 Sep 2015 15:20:19 - 1.1.1.1
+++ pkg/PLIST 17 Sep 2015 11:23:41 -
@@ -1,20 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/13 15:20:19 sthen Exp $
+@comment $OpenBSD$
+%%SHARED%%
+%%native%%
lib/ocaml/parmap/
lib/ocaml/parmap/M
[patch] devel/ocaml-parmap on non-native archs
I've just packaged this on sparc64. Parmap.get_default_ncores returns
the expected result. If you used devel/coccinelle on, say, armv7 or
sparc64, you might be interested.
Comments / ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-parmap/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile13 Sep 2015 15:20:19 - 1.1.1.1
+++ Makefile14 Sep 2015 19:20:26 -
@@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2015/09/13 15:20:19 sthen Exp $
-SHARED_ONLY = Yes
-ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS}
-
COMMENT = OCaml parallel map primitive for multicores
CATEGORIES = devel
V =1.0-rc6
+REVISION = 0
NAME = ocaml-parmap
DISTNAME = ocaml-parmap-$V
DISTFILES =${DISTNAME}{$V}.tar.gz
@@ -24,6 +22,18 @@ BUILD_DEPENDS = sysutils/findlib
USE_GMAKE =Yes
CONFIGURE_STYLE = gnu
+
+.include
+
+.if !${PROPERTIES:Mocaml_native}
+CONFIGURE_ENV+=OCAMLOPT=no
+.endif
+
+.if !${PROPERTIES:Mocaml_native_dynlink}
+MAKE_FLAGS+= DYNLINK=no
+.endif
+
+FAKE_FLAGS = DESTDIR=${WRKINST}${TRUEPREFIX}
TEST_TARGET = tests
TEST_DEPENDS = ${BASE_PKGPATH}
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 14 Sep 2015 19:20:26 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- Makefile.in.orig Mon Feb 9 11:42:28 2015
Makefile.inMon Sep 14 21:10:13 2015
+@@ -42,15 +42,18 @@ OBFLAGS = -j 10 -use-ocamlfind #-classic-display
+
+ BYTELIBS = parmap.cma
+ OPTLIBS=
+-CMXSLIBS=
+ ALIBS=
++DYNLINK= yes
++CMXSLIBS=
+
+ ifeq ("@OCAMLBEST@","opt")
+ OPTLIBS += $(BYTELIBS:%.cma=%.cmxa)
++ ALIBS = $(BYTELIBS:%.cma=%.a)
++ifeq (${DYNLINK}, yes)
+ CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
+ endif
++endif
+
+-ALIBS = $(BYTELIBS:%.cma=%.a)
+
+ all:
+ $(OCAMLBUILD) $(OBFLAGS) $(BYTELIBS) $(OPTLIBS) $(CMXSLIBS) $(ALIBS)
+@@ -86,7 +89,7 @@ install: $(LIBS) META
+ $(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
+ (cd _build; ocamldoc -man -man-mini parmap.ml parmap.mli)
+ test -d $(MANDIR) || mkdir -p $(MANDIR)
+- cp -a _build/Parmap.3o $(MANDIR)
++ cp -p _build/Parmap.3o $(MANDIR)
+
+ uninstall:
+ $(UNINSTALL) $(NAME)
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 14 Sep 2015 19:20:26 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- configure.orig Mon Sep 14 20:17:21 2015
configure Mon Sep 14 20:18:32 2015
+@@ -4379,8 +4379,8 @@ _ACEOF
+ ac_config_headers="$ac_config_headers config.h"
+
+
+-t=`$OCAMLBUILD -use-ocamlfind &> /dev/null; echo $?`
+-if test $t == 0 ; then
++t=`$OCAMLBUILD -use-ocamlfind >/dev/null 2>&1; echo $?`
++if test "$t" = 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ocaml version
$OCAMLVERSION. Use standard Makefile" >&5
+ $as_echo "ocaml version $OCAMLVERSION. Use standard Makefile" >&6; }
+ ac_config_files="$ac_config_files Makefile"
Index: pkg/PFRAG.dynlink-native
===
RCS file: pkg/PFRAG.dynlink-native
diff -N pkg/PFRAG.dynlink-native
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.dynlink-native14 Sep 2015 19:20:26 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@bin lib/ocaml/parmap/parmap.cmxs
Index: pkg/PFRAG.native
===
RCS file: pkg/PFRAG.native
diff -N pkg/PFRAG.native
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.native14 Sep 2015 19:20:26 -
@@ -0,0 +1,4 @@
+@comment $OpenBSD$
+%%dynlink%%
+lib/ocaml/parmap/parmap.a
+lib/ocaml/parmap/parmap.cmxa
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.shared14 Sep 2015 19:20:26 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+lib/ocaml/stublibs/dllparmap_stubs.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ocaml-parmap/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 13 Sep 2015 15:20:19 - 1.1.1.1
+++ pkg/PLIST 14 Sep 2015 19:20:26 -
@@ -1,20 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/13 15:20:19 sthen Exp $
+@comment $OpenBSD$
+%%SHARED%%
+%%native%%
lib/ocaml/parmap/
lib/ocaml/parmap/META
lib/ocaml/parmap/bytearray.cmi
lib/ocaml/parmap/bytearray.mli
-lib/ocaml/parmap/bytearray_stubs.o
-lib/ocaml/parmap/libparmap.a
-lib/ocaml/parmap/parmap.a
+lib/ocaml/parmap/libparmap_stubs.a
lib/ocaml/parmap/parmap.cma
Re: NEW: ocaml-parmap
Stuart Henderson writes:
> Needed to update coccinelle (attempts to patch the bundled copy of
> parmap in coccinelle haven't worked out too well).
>
> OK to import?
>
> -- --
> Parmap is a minimalistic library allowing to exploit multicore
> architecture for OCaml programs with minimal modifications: if you want
> to use your many cores to accelerate an operation which happens to be a
> map, fold or map/fold (map-reduce), just use Parmap's parmap, parfold
> and parmapfold primitives in place of the standard List.map and friends,
> and specify the number of subprocesses to use by the optional parameter
> ~ncores.
> -- --
>
I would like to avoid ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS}. Here's an
updated tarball. Bonus: a weird-looking manpage!
I can't test it on a non-native arch right now. ok jca@ if it packages
there.
ocaml-parmap.tgz
Description: Binary data
diff -pruN ocaml-parmap.orig/Makefile ocaml-parmap/Makefile
--- ocaml-parmap.orig/Makefile Thu Sep 10 17:39:15 2015
+++ ocaml-parmap/Makefile Fri Sep 11 21:36:36 2015
@@ -1,8 +1,5 @@
# $OpenBSD: Makefile,v 1.8 2014/10/30 23:39:23 sthen Exp $
-SHARED_ONLY = Yes
-ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS}
-
COMMENT = OCaml parallel map primitive for multicores
CATEGORIES = devel
@@ -27,5 +24,7 @@ CONFIGURE_STYLE = gnu
TEST_TARGET = tests
TEST_DEPENDS = ${BASE_PKGPATH}
+
+FAKE_FLAGS = DESTDIR=${WRKINST}${TRUEPREFIX}
.include
diff -pruN ocaml-parmap.orig/patches/patch-Makefile_in
ocaml-parmap/patches/patch-Makefile_in
--- ocaml-parmap.orig/patches/patch-Makefile_in Thu Jan 1 01:00:00 1970
+++ ocaml-parmap/patches/patch-Makefile_in Fri Sep 11 21:09:48 2015
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Fri Sep 11 21:09:21 2015
Makefile.inFri Sep 11 21:09:44 2015
+@@ -86,7 +86,7 @@ install: $(LIBS) META
+ $(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
+ (cd _build; ocamldoc -man -man-mini parmap.ml parmap.mli)
+ test -d $(MANDIR) || mkdir -p $(MANDIR)
+- cp -a _build/Parmap.3o $(MANDIR)
++ cp -p _build/Parmap.3o $(MANDIR)
+
+ uninstall:
+ $(UNINSTALL) $(NAME)
diff -pruN ocaml-parmap.orig/patches/patch-configure
ocaml-parmap/patches/patch-configure
--- ocaml-parmap.orig/patches/patch-configure Thu Jan 1 01:00:00 1970
+++ ocaml-parmap/patches/patch-configureFri Sep 11 21:06:59 2015
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- configure.orig Fri Sep 11 21:06:20 2015
configure Fri Sep 11 21:06:49 2015
+@@ -4379,8 +4379,8 @@ _ACEOF
+ ac_config_headers="$ac_config_headers config.h"
+
+
+-t=`$OCAMLBUILD -use-ocamlfind &> /dev/null; echo $?`
+-if test $t == 0 ; then
++t=`$OCAMLBUILD -use-ocamlfind >/dev/null 2>&1; echo $?`
++if test "$t" = 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ocaml version
$OCAMLVERSION. Use standard Makefile" >&5
+ $as_echo "ocaml version $OCAMLVERSION. Use standard Makefile" >&6; }
+ ac_config_files="$ac_config_files Makefile"
diff -pruN ocaml-parmap.orig/patches/patch-configure_ac
ocaml-parmap/patches/patch-configure_ac
--- ocaml-parmap.orig/patches/patch-configure_acThu Jan 1 01:00:00 1970
+++ ocaml-parmap/patches/patch-configure_ac Fri Sep 11 21:07:13 2015
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- configure.ac.orig Fri Sep 11 21:00:06 2015
configure.ac Fri Sep 11 21:00:31 2015
+@@ -26,8 +26,8 @@ AC_CHECK_DECLS([thread_policy_set], [], [], [[
+
+ AC_CONFIG_HEADERS([config.h])
+
+-t=`$OCAMLBUILD -use-ocamlfind &> /dev/null; echo $?`
+-if test $t == 0 ; then
++t=`$OCAMLBUILD -use-ocamlfind >/dev/null 2>&1; echo $?`
++if test "$t" = 0 ; then
+ AC_MSG_RESULT(ocaml version $OCAMLVERSION. Use standard Makefile)
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff -pruN ocaml-parmap.orig/pkg/PFRAG.native ocaml-parmap/pkg/PFRAG.native
--- ocaml-parmap.orig/pkg/PFRAG.native Thu Jan 1 01:00:00 1970
+++ ocaml-parmap/pkg/PFRAG.native Fri Sep 11 21:16:33 2015
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@bin lib/ocaml/parmap/parmap.cmxs
diff -pruN ocaml-parmap.orig/pkg/PFRAG.shared ocaml-parmap/pkg/PFRAG.shared
--- ocaml-parmap.orig/pkg/PFRAG.shared Thu Jan 1 01:00:00 1970
+++ ocaml-parmap/pkg/PFRAG.shared Fri Sep 11 21:14:11 2015
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+lib/ocaml/stublibs/dllparmap_stubs.so
diff -pruN ocaml-parmap.orig/pkg/PLIST ocaml-parmap/pkg/PLIST
--- ocaml-parmap.orig/pkg/PLIST Thu Jul 16 01:42:02 2015
+++ ocaml-parmap/pkg/PLIST Fri Sep 11 21:16:13 2015
@@ -1,20 +1,19 @@
@comment $OpenBSD$
+%%SHARED%%
+%%native%%
lib/ocaml/parmap/
lib/ocaml/parmap/META
lib/ocaml/parmap/bytearray.cmi
lib/ocaml/parmap/bytearray.mli
-lib/ocaml/parmap/bytearray_stubs.o
-lib/ocaml/parmap/libparmap.a
+lib/ocaml/parmap/libparmap_stubs.a
lib/ocaml/parmap/parmap.a
lib/ocaml/parmap/parmap.cma
lib/ocaml/parmap/parmap.cmi
lib/ocaml/parmap/parmap.cmxa
-@bin lib/ocaml/parmap/parmap.cmxs
lib/ocaml/parmap/parmap.mli
lib/ocaml/parmap/parmap_utils.cmi
lib/ocaml/parmap/parmap
Re: [UPDATE] net/mosh to 1.2.5
Stuart Henderson writes: > On 2015/09/01 18:42, Jérémie Courrèges-Anglas wrote: >> An IPv6-related problem was reported by Stuart Henderson when >> I published the 1.2.5 update. It was also reported upstream by >> a FreeBSD user. >> >> https://github.com/mobile-shell/mosh/issues/657 >> >> I'm not yet sure how to address that problem. > > I think we could just commit it with a short note in pkg/MESSAGE. Done, thanks. > I prodded juicessh on twitter but didn't hear back from them. Well the bug is in mosh. :) > Index: MESSAGE > === > RCS file: MESSAGE > diff -N MESSAGE > --- /dev/null 1 Jan 1970 00:00:00 - > +++ MESSAGE 10 Sep 2015 16:52:07 - > @@ -0,0 +1,2 @@ > +N.B. At the time of writing, JuiceSSH's default server command is incorrect > for > +use with mosh-1.2.5. To work-around, add -s in settings/mosh/Server Command. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: autoconf version to use?
patrick keshishian writes: > Hi, > > Is there any preference/rule as to which version of autoconf > one should use in a new port? > > One with the largest version number or the lowest one > which works? I'd say use the same version as upstream if possible. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: mod_ssl of apache-httpd not working
Pedro de Oliveira writes:
> Hi,
>
> In the current OpenBSD snapshot of today, it isnt possible to load mod_ssl
> in Apache. This is maybe related to any change made on LibreSSL.
>
> The init script just gives (failed), but I tried to start it with apachectl2
rc.d(8) scripts support a -d flag to show output from the daemon.
> # apachectl2 start
> /usr/local/sbin/httpd2:/usr/local/lib/apache2/mod_ssl.so: undefined symbol
> 'SSLv3_server_method'
> /usr/local/sbin/httpd2:/usr/local/lib/apache2/mod_ssl.so: undefined symbol
> 'SSLv3_client_method'
> httpd2: Syntax error on line 141 of /etc/apache2/httpd2.conf: Cannot load
> /usr/local/lib/apache2/mod_ssl.so into server: Cannot load specified object
>
> I even tried to disable SSLv2 and SSLv3 with
>
> SSLProtocol ALL -SSLv2 -SSLv3
>
>
> But it simply fails on the load of mod_ssl.
>
> If any more info is required please ask me.
Here's a patch that avoids the use of SSLv3 in mod_ssl.so. If SSLv3 is
the only protocol requested in the config, startup will fail:
[Sun Sep 06 15:44:25.881391 2015] [ssl:emerg] [pid 20104] SSLv3 protocol not
available
[Sun Sep 06 15:44:25.882001 2015] [ssl:emerg] [pid 20104] AH02311: Fatal error
initialising mod_ssl, exiting. See /var/www/logs/error_log for more information
AH00016: Configuration Failed
This is not enough to warn users who specify "SSLProtocols ... +SSLv3"
in their config that SSLv3 support won't be available, but I don't think
it matters much. Dunno if this should use APLOGNO(02231) or a custom
one, this question should probably be discussed upstream anyway.
Comments / oks?
Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile18 Jul 2015 20:01:13 - 1.63
+++ Makefile6 Sep 2015 14:00:45 -
@@ -11,7 +11,7 @@ PKGNAME-main= ${PKGNAME}
FULLPKGNAME-common=apache-httpd-common-${V}
FULLPKGPATH-common=www/apache-httpd,-common
-REVISION-main= 1
+REVISION-main= 2
CATEGORIES=www net
Index: patches/patch-modules_ssl_ssl_engine_init_c
===
RCS file: patches/patch-modules_ssl_ssl_engine_init_c
diff -N patches/patch-modules_ssl_ssl_engine_init_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_ssl_ssl_engine_init_c 6 Sep 2015 14:00:45 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Don't attempt to use SSLv3_(client|server)_method, bail out if SSLv3 is
+the only protocol requested.
+
+--- modules/ssl/ssl_engine_init.c.orig Sun Sep 6 15:23:52 2015
modules/ssl/ssl_engine_init.c Sun Sep 6 15:57:35 2015
+@@ -484,9 +484,15 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *
+ "Creating new SSL context (protocols: %s)", cp);
+
+ if (protocol == SSL_PROTOCOL_SSLV3) {
++#ifndef OPENSSL_NO_SSL3
+ method = mctx->pkp ?
+ SSLv3_client_method() : /* proxy */
+ SSLv3_server_method(); /* server */
++#else
++ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
++"SSLv3 protocol not available");
++return ssl_die(s);
++#endif
+ }
+ else if (protocol == SSL_PROTOCOL_TLSV1) {
+ method = mctx->pkp ?
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] samba-4.1.20
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> Here's a bugfix update to samba-4.1.20, freshly released.
>
> Tarball diff (that contains the release notes) available at
> http://wxcvbn.org/~jca/tmp/samba-4.1.20-tarball.diff.txt
>
> Lightly tested on amd64. ok?
Here's a diff that also removes all the "ld(1) is fragile on OpenBSD"
hacks. This is related to the (rather) recent activation
of -Wl,--as-needed which had previously been disabled by upstream.
I don't plan to commit the ld(1) parts right now, but I could use test
reports on !(amd64). :)
Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.208
diff -u -p -r1.208 Makefile
--- Makefile26 Aug 2015 18:05:31 - 1.208
+++ Makefile1 Sep 2015 11:10:46 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.208 2015/08/26 18:05:31 jca Exp $
SHARED_ONLY = Yes
-VERSION = 4.1.19
+VERSION = 4.1.20
DISTNAME = samba-${VERSION}
DOCSVERSION = v3-5-test-4c5a1b6b
DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
@@ -19,11 +19,8 @@ PKGNAME-tevent = tevent-${TEVENT_V}
PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
-REVISION-main =7
-REVISION-ldb = 4
-REVISION-tevent = 2
-REVISION-util =2
-REVISION-docs =2
+REVISION-ldb = 5
+REVISION-tevent = 3
PKG_ARCH-docs =*
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo25 Aug 2015 11:04:39 - 1.42
+++ distinfo1 Sep 2015 10:49:21 -
@@ -1,4 +1,4 @@
-SHA256 (samba-4.1.19.tar.gz) = YvI9/6zU+visVX+c8BoVleOdsLvdlZxMGJD0YVXJ+TY=
+SHA256 (samba-4.1.20.tar.gz) = rc8CHC7n69upntkLsG5FvMjj/ZQZZnYicEJ2YHuDIDg=
SHA256 (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) =
bsF0WP1KT1M3jMx3Z88MbsEQ1QEq9catijXpnPm7hZA=
-SIZE (samba-4.1.19.tar.gz) = 19558250
+SIZE (samba-4.1.20.tar.gz) = 19561057
SIZE (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) = 8070761
Index: patches/patch-buildtools_wafsamba_samba_autoconf_py
===
RCS file:
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-buildtools_wafsamba_samba_autoconf_py
--- patches/patch-buildtools_wafsamba_samba_autoconf_py 25 Aug 2015 11:04:39
- 1.1
+++ patches/patch-buildtools_wafsamba_samba_autoconf_py 3 Sep 2015 11:27:20
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-buildtools_wafsamba_samba_autoconf_py,v 1.1 2015/08/25
11:04:39 jca Exp $
Sort -L flags to unbreak linking when any other version of Samba is installed.
buildtools/wafsamba/samba_autoconf.py.orig Sat May 11 12:20:52 2013
-+++ buildtools/wafsamba/samba_autoconf.py Sat May 11 13:04:26 2013
+--- buildtools/wafsamba/samba_autoconf.py.orig Wed Sep 2 09:11:05 2015
buildtools/wafsamba/samba_autoconf.py Thu Sep 3 13:27:16 2015
@@ -716,6 +716,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
if not 'EXTRA_LDFLAGS' in conf.env:
conf.env['EXTRA_LDFLAGS'] = []
@@ -30,3 +30,15 @@ Sort -L flags to unbreak linking when an
return flags
+@@ -776,9 +797,8 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
+ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
+ # we don't want any libraries or modules to rely on runtime
+ # resolution of symbols
+-if not sys.platform.startswith("openbsd"):
+-conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined',
testflags=True)
++conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined',
testflags=True)
+
+-if not sys.platform.startswith("openbsd") and
conf.env.undefined_ignore_ldflags == []:
++if conf.env.undefined_ignore_ldflags == []:
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ conf.env.undefined_ignore_ldflags = ['-undefined',
'dynamic_lookup']
Index: patches/patch-lib_ldb_wscript
===
RCS file: /cvs/ports/net/samba/patches/patch-lib_ldb_wscript,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_ldb_wscript
--- patches/patch-lib_ldb_wscript 25 Aug 2015 11:04:39 - 1.1
+++ patches/patch-lib_ldb_wscript 1 Sep 2015 18:43:18 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_ldb_wscript,v 1.1 2015/08/25 11:04:39 jca Exp $
Force building standalone library (e.g., put headers in apporiate place).
lib/ldb/wscript.orig Mon May 27 16:42:26 2013
-+++ lib/ldb/wscriptMon May 27 20:45:07 2013
+--- lib/ldb/wscript.orig Tue Sep 1 20:40:31 2015
lib/ldb
Re: [UPDATE] net/mosh to 1.2.5
Fred writes:
> Hi Hi ports@
Hi Fred,
> Attached, and inline is a simple update to mosh 1.2.5
I think you missed my previous mail about mosh-1.2.5:
http://marc.info/?l=openbsd-ports&m=143767943718038&w=2
Please find the original diff at the end of this mail.
> upstream have
> incorporated some fixes so the patches are no longer required.
Well, there are some things that can go, and some that should be kept.
> Tested on amd64, i386, and macppc.
>
> Thanks
Thanks for your work.
An IPv6-related problem was reported by Stuart Henderson when
I published the 1.2.5 update. It was also reported upstream by
a FreeBSD user.
https://github.com/mobile-shell/mosh/issues/657
I'm not yet sure how to address that problem.
> Fred
> --
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/mosh/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 Makefile
> --- Makefile 17 Oct 2013 20:58:28 - 1.5
> +++ Makefile 1 Sep 2015 12:30:00 -
> @@ -1,12 +1,10 @@
> -# $OpenBSD: Makefile,v 1.5 2013/10/17 20:58:28 jca Exp $
> +# $OpenBSD$
>
> BROKEN-arm = erratic runtime behaviour
This was probably due to a buggy stack protector / PIE problem. I'll
remove this line.
> COMMENT =mobile shell
>
> -DISTNAME = mosh-1.2.4
> -
> -REVISION = 1
> +DISTNAME = mosh-1.2.5
>
> CATEGORIES = net
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/mosh/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 distinfo
> --- distinfo 21 Apr 2013 19:46:37 - 1.1.1.1
> +++ distinfo 1 Sep 2015 12:30:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (mosh-1.2.4.tar.gz) = 500NMjImBG5ALdRpoXYHX8IBO2mw5nzqSXYslXF130Y=
> -SIZE (mosh-1.2.4.tar.gz) = 283047
> +SHA256 (mosh-1.2.5.tar.gz) = GvgJ5ddHwzOoUvv3rNv001TcS7woOeOv5c95gZAHS+M=
> +SIZE (mosh-1.2.5.tar.gz) = 308857
> Index: patches/patch-src_crypto_ocb_cc
> ===
> RCS file: patches/patch-src_crypto_ocb_cc
> diff -N patches/patch-src_crypto_ocb_cc
> --- patches/patch-src_crypto_ocb_cc 9 Oct 2013 07:33:41 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-src_crypto_ocb_cc,v 1.1 2013/10/09 07:33:41 jca Exp $
> -Use generic code on ARM instead of asm because of some unsupported
> -instructions.
> -Introduced by https://github.com/keithw/mosh/issues/86
If we want to try to support arm, this patch should be updated.
> src/crypto/ocb.cc.orig Tue Oct 8 11:57:42 2013
> -+++ src/crypto/ocb.ccTue Oct 8 11:58:01 2013
> -@@ -298,7 +298,7 @@
> - return swap_if_le(rval);
> - }
> -
> --#if __GNUC__ && __arm__
> -+#if 0
> - static inline block double_block(block b) {
> - __asm__ ("adds %1,%1,%1\n\t"
> - "adcs %H1,%H1,%H1\n\t"
> Index: patches/patch-src_network_transportfragment_cc
> ===
> RCS file: patches/patch-src_network_transportfragment_cc
> diff -N patches/patch-src_network_transportfragment_cc
> --- patches/patch-src_network_transportfragment_cc21 Apr 2013
> 19:46:37 -1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-src_network_transportfragment_cc,v 1.1.1.1 2013/04/21
> 19:46:37 sthen Exp $
> src/network/transportfragment.cc.origFri Feb 15 04:18:44 2013
> -+++ src/network/transportfragment.cc Fri Feb 15 04:18:59 2013
> -@@ -30,6 +30,7 @@
> - also delete it here.
> - */
> -
> -+#include
> - #include
> -
> - #include "byteorder.h"
>
Index: Makefile
===
RCS file: /cvs/ports/net/mosh/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile17 Oct 2013 20:58:28 - 1.5
+++ Makefile23 Jul 2015 19:16:15 -
@@ -1,12 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2013/10/17 20:58:28 jca Exp $
-BROKEN-arm = erratic runtime behaviour
-
COMMENT = mobile shell
-DISTNAME = mosh-1.2.4
-
-REVISION = 1
+DISTNAME = mosh-1.2.5
CATEGORIES = net
@@ -24,13 +20,11 @@ MASTER_SITES = ${HOMEPAGE}
LIB_DEPENDS = devel/protobuf
-MAKE_FLAGS = CPPFLAGS='-Dbe16toh=betoh16 -Dbe64toh=betoh64'
-
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
# --enable-hardening forces PIE on, which doesn't work on all arches
# pick only ld(1) -z now to match upstream
CONFIGURE_ARGS = --disable-hardening
-CONFIGURE_ENV =ac_cv_have_decl_htobe64=yes LDFLAGS="-Wl,-z,now"
+CONFIGURE_ENV =LDFLAGS="-Wl,-z,now"
.include
Index: distinfo
===
RCS file: /cvs/ports/net/mosh/distinfo,v
retrieving revision 1.1.1.1
[update] samba-4.1.20
Here's a bugfix update to samba-4.1.20, freshly released.
Tarball diff (that contains the release notes) available at
http://wxcvbn.org/~jca/tmp/samba-4.1.20-tarball.diff.txt
Lightly tested on amd64. ok?
Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.208
diff -u -p -r1.208 Makefile
--- Makefile26 Aug 2015 18:05:31 - 1.208
+++ Makefile1 Sep 2015 11:10:46 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.208 2015/08/26 18:05:31 jca Exp $
SHARED_ONLY = Yes
-VERSION = 4.1.19
+VERSION = 4.1.20
DISTNAME = samba-${VERSION}
DOCSVERSION = v3-5-test-4c5a1b6b
DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
@@ -19,11 +19,8 @@ PKGNAME-tevent = tevent-${TEVENT_V}
PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
-REVISION-main =7
-REVISION-ldb = 4
-REVISION-tevent = 2
-REVISION-util =2
-REVISION-docs =2
+REVISION-ldb = 5
+REVISION-tevent = 3
PKG_ARCH-docs =*
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo25 Aug 2015 11:04:39 - 1.42
+++ distinfo1 Sep 2015 10:49:21 -
@@ -1,4 +1,4 @@
-SHA256 (samba-4.1.19.tar.gz) = YvI9/6zU+visVX+c8BoVleOdsLvdlZxMGJD0YVXJ+TY=
+SHA256 (samba-4.1.20.tar.gz) = rc8CHC7n69upntkLsG5FvMjj/ZQZZnYicEJ2YHuDIDg=
SHA256 (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) =
bsF0WP1KT1M3jMx3Z88MbsEQ1QEq9catijXpnPm7hZA=
-SIZE (samba-4.1.19.tar.gz) = 19558250
+SIZE (samba-4.1.20.tar.gz) = 19561057
SIZE (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) = 8070761
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: 5.8 release alpha build failures
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes: > Christian Weisgerber writes: > > [...] > >> editors/emacs errors our in configure because tputs() can't be >> found. That doesn't make any sense. tputs() is in libncurses and >> its links libcurses/libtermcap/libtermlib. The configure script >> should have found it several times over. Something else must be >> going on there. > > alpha is affected by the same binutils-2.17 ld -Z regression as > powerpc (leads to broken executables). Well, I mean that the visible symptoms are the same. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: 5.8 release alpha build failures
Christian Weisgerber writes: > http://build-failures.rhaalovely.net//alpha/2015-08-08/databases/tdb.log > http://build-failures.rhaalovely.net//alpha/2015-08-08/devel/libtalloc.log Nice! -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: 5.8 release alpha build failures
Christian Weisgerber writes: [...] > editors/emacs errors our in configure because tputs() can't be > found. That doesn't make any sense. tputs() is in libncurses and > its links libcurses/libtermcap/libtermlib. The configure script > should have found it several times over. Something else must be > going on there. alpha is affected by the same binutils-2.17 ld -Z regression as powerpc (leads to broken executables). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: security/p5-Crypt-SSLeay SSLv3 fallout
Alexander Bluhm writes: > Hi, Hi Alexander, > security/p5-Crypt-SSLeay regression tests fail with > /usr/bin/perl:/usr/ports/pobj/p5-Crypt-SSLeay-0.72/Crypt-SSLeay-0.72/blib/arch/auto/Crypt/SSLeay/SSLeay.so: > undefined symbol 'SSLv3_client_method' > > Is it the right approach to remove all calls to SSLv2 and SSLv3 and > keep only SSLv23? I think so, and I see no reason for upstream to object. SSLv23 is the most portable approach, using SSLv3 unconditionally is insane and doesn't work any more since other OSes have started to disable SSLv3 by default. > The patch-Makefile_PL chunk is no real change but happend with make > update-patches. > > ok? ok jca@ (That code is gross...) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [NEW] audio/libdiscid
Donovan Watteau writes:
> On Sat, 29 Aug 2015, Stuart Henderson wrote:
>> On 2015/08/29 11:16, Donovan Watteau wrote:
>> > Hi,
>> >
>> > Here's a new port for libdiscid, which my next audio/cmus update
>> > will use.
>> >
>> > I tried cleaning some strcpy(), strcat() and sprintf(). "make test"
>> > is still fine. If patch-src_disc_c looks good to you, I'll submit it
>> > to upstream.
>> >
>> > Tested on macppc.
>>
>> Upstream will need some glue to make that work on OS with deficient
>> versions of libc. In most cases we don't add this type of patch in ports
>> as it often gets in the way of updates, but feeding upstream (if they'll
>> take it) is good.
>
> Yes, I was working on submitting it to upstream with all the necessary
> libc glue, but OK.
>
> So here's the port again, without the patch.
Looks fine to me, two nits:
1.
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_header_musicbrainz5_mb5_c_h=no
If there is no dep on other packages then there is no need to tweak
CPP/LDFLAGS. And if usr/local isn't in those flags,
ac_cv_header_musicbrainz5_mb5_c_h=no is not needed (but you may want to
keep it for documentation).
2. Any idea why two tests out of four are skipped?
===> Cleaning for libdiscid-0.6.1
===> Checking files for libdiscid-0.6.1
`/home/distfiles/libdiscid-0.6.1.tar.gz' is up to date.
>> (SHA256) libdiscid-0.6.1.tar.gz: OK
===> Extracting for libdiscid-0.6.1
===> Patching for libdiscid-0.6.1
===> Configuring for libdiscid-0.6.1
Using /usr/obj/pobj/libdiscid-0.6.1/config.site (generated)
configure: WARNING: unrecognized options: --disable-gtk-doc
configure: loading site script /usr/obj/pobj/libdiscid-0.6.1/config.site
checking for a BSD-compatible install...
/usr/obj/pobj/libdiscid-0.6.1/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether make sets $(MAKE)... (cached) yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking whether cc understands -c and -o together... yes
checking dependency style of cc... gcc3
checking for ar... (cached) ar
checking the archiver (ar) interface... ar
checking build system type... x86_64-unknown-openbsd5.8
checking host system type... x86_64-unknown-openbsd5.8
configure: Using disc read implementation for: netbsd
checking how to print strings... print -r
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... (cached) /usr/bin/egrep
checking for fgrep... (cached) /usr/bin/fgrep
checking for ld used by cc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... (cached) 131072
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... no
checking how to convert x86_64-unknown-openbsd5.8 file names to
x86_64-unknown-openbsd5.8 format... func_convert_file_noop
checking how to convert x86_64-unknown-openbsd5.8 file names to toolchain
format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... match_pattern
/lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$
checking for dlltool... no
checking how to associate runtime and link libraries... print -r --
checking for archiver @FILE support... @
checking for strip... (cached) strip
checking for ranlib... (cached) ranlib
checking command to parse /usr/bin/nm -B output from cc object... ok
checking for sysroot... no
checking for mt... mt
checking if mt is a manifest tool... no
checking how to run the C preprocessor... cc -E
checking for ANSI C header files... (cached) yes
checking for sys/types.h... (cached) yes
checking for sys/stat.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking for memory.h... (cached) yes
checking for strings.h... (cached) yes
checking for inttypes.h... (cached) yes
checking for stdint.h... (cached) yes
checking for unistd.h... (cached) yes
checking for dlfcn.h... (cached) yes
checking for objdir... .libs
checking if cc supports -fno-rtti -fno-exceptions... n
Re: opendnssec and softhsm revisited
Patrik Lundin writes:
> On Wed, Jun 24, 2015 at 07:10:33AM +0200, Patrik Lundin wrote:
>>
>> The summary for now looks like this:
>> Working: amd64, sparc64
>> Broken: i386, macppc
>>
>> Is there some relation between threading and 32/64 bit? It is the main
>> thing that sticks out currently, since sparc64 rules out an endian issue
>> as far as i can tell.
>>
Hi Patrik. Sorry if I kinda ignored this opendnssec problem, I couldn't
find a solution quickly enough.
>
> So there might be some light at the end of the opendnssec tunnel.
> I have noticed that the thread stack size is smaller on i386 than it is
> on amd64 using this code snippet:
> ---
> #include
> #include
>
> pthread_attr_t attr;
> size_t stacksize;
>
> int main (){
> pthread_attr_init(&attr);
> pthread_attr_getstacksize(&attr, &stacksize);
>
> printf("stacksize: %d\n", stacksize);
>
> return 0;
> }
> ---
>
> While amd64 and sparc64 reports 524288, i386 says 262144. It looks like I have
> been able to stop opendnssec from crashing by modifying a wrapper function to
> pass an attribute variable to pthread_create(), increasing the stack size:
> ---
> pthread_attr_t attr;
> size_t stacksize;
> pthread_attr_init(&attr);
> pthread_attr_getstacksize(&attr, &stacksize);
> pthread_attr_setstacksize(&attr, stacksize * 2);
> ---
>
> The above was inspired from this thread:
> http://openbsd-archive.7691.n7.nabble.com/Default-Posix-thread-stack-size-td47465.html
>
> Anyway, I have sent a message regarding this to one of the nlnet people. I
> will
> report back with how things goes. I am not sure if this is the correct fix, or
> if one should instead store less data on the stack or something.
Very nice! Yes, asking upstream is the right thing to do.
If they don't plan to do a release with that stack size problem
addressed, I think it would be ok to import opendnssec with a temporary
patch.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Too many ruby interpreters
Jeremy Evans writes: > Some other porters have complained that we have too many versions of > ruby in the tree. We currently have 7 ruby interpreters in the tree: > jruby, rubinius, and ruby 1.8, 1.9, 2.0, 2.1, and 2.2. So here is my > proposal for dealing with that. > > First, remove lang/rubinius, as it is slow because it doesn't work with > the in-tree LLVM, it is rarely used, and I couldn't get a recent version > to build with any of the in-tree compilers. rubinius is now broken, following the SSLv3 removal. ok jca@ to delete it whenever you want. > This could be brought back > in the future if someone cares to do the work, but there needs to be a > plan so that it will always have a working LLVM. > > Ruby 1.8 will be sticking around for the foreseeable future as other > software depends on it, including amarok, subversion, and vim. > > For other ruby versions, change the OpenBSD support policy. Ruby > versions that will still be supported by upstream when -current is > released (currently 2.1 and 2.2 as 2.0 goes out of support in February) > will be fully supported by OpenBSD, and will have C extensions built by > default. When a ruby version will no longer be supported by upstream, > OpenBSD will stop building C extensions for the version, but it will > remain in the ports tree until the following version is no longer > supported by upstream, at which time it will be removed. > > This change in OpenBSD support policy would have the following effects > currently: > > 1) Remove lang/ruby/1.9 > 2) Stop building C extensions for lang/ruby/2.0. > > Thoughts on this? OKs? Your plan makes sense to me, but I don't know the ruby ecosystem well enough to have a meaningful opinion on this subject. :) > Thanks, > Jeremy > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: mail/perdition
Giovanni Bechis writes: > Update to 2.1 and take maintainership. > Comments ? Ok ? Looks fine ports-wise, ok jca@ > Cheers >Giovanni > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: lang/pypy to 2.6.0
Edd Barrett writes: > Hi, > > I've been sat on this for a while. OK? I can use it for a few projects at $DAYJOB. ok jca@ > BTW, if anyone has any ideas as to why compiling the C code at the end > takes so long, please shout. It never used to take this long. I've tried > removing -pipe and tweaking make -j, to no avail. pypy-2.6.0: ok 163m19.56s real 122m52.38s user11m11.57s system Sounds "reasonable" to me. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [NEW] net/py-dnslib
"Bryan C. Everly" writes: > $COMMENT: library to en/decode DNS wire-format packets for Python > > pkg/DESCR: > > library to en/decode DNS wire-format packets for Python. *BZZT* ritchie /usr/ports/mystuff/net/py-dnslib$ cat pkg/DESCR A library to encode/decode DNS wire-format packets supporting both Python 2.7 and Python 3.2+. Where's the python3 flavor? (: > > > This is a standard Python library > (https://pypi.python.org/pypi/dnslib) that I would like to add to > OpenBSD because I need it to support several Python-based security > scanning tools. > > > > This is my first Python library so any comments or questions? The port looks fine, except that it should use MODPY_PI. I'm not sure about tests. Adding MODPY_SETUPTOOLS=Yes leads to a dummy test target. Maybe that'd be better that NO_TEST=Yes? Can this be used by existing or upcoming ports you plan to publish, or is it for personal use? I am personally a bit reluctant on adding libs if they aren't useful for other ports. > If not, > would anyone be willing to commit this on my behalf? > > (apologies for not including the attachment last time) > > Thanks, > Bryan > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[update] net/pen -> 0.30.0
An update for net/pen, the SSLv3 fix has been committed upstream. The only (maybe) relevant entry in ChangeLog is: 150803Added UDP mode for Direct Server Return. Tests/oks welcome. Index: Makefile === RCS file: /cvs/ports/net/pen/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile20 Jul 2015 00:10:36 - 1.17 +++ Makefile25 Aug 2015 17:35:31 - @@ -2,7 +2,7 @@ COMMENT= load balancer for simple TCP-based protocols -DISTNAME= pen-0.29.0 +DISTNAME= pen-0.30.0 CATEGORIES=net Index: distinfo === RCS file: /cvs/ports/net/pen/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo20 Jul 2015 00:10:36 - 1.11 +++ distinfo25 Aug 2015 17:35:31 - @@ -1,2 +1,2 @@ -SHA256 (pen-0.29.0.tar.gz) = 8ZD46bu0D9NpsIDJpYvtpdFBG12a18bED62qKgNjGgU= -SIZE (pen-0.29.0.tar.gz) = 182198 +SHA256 (pen-0.30.0.tar.gz) = T8kXGQXC0aFLP2lW9jGRfMszqGdiFL+nASsxVXjSwO4= +SIZE (pen-0.30.0.tar.gz) = 182170 Index: patches/patch-ssl_c === RCS file: patches/patch-ssl_c diff -N patches/patch-ssl_c --- patches/patch-ssl_c 20 Jul 2015 00:10:36 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-ssl_c,v 1.1 2015/07/20 00:10:36 jca Exp $ ssl.c.orig Wed May 13 07:38:28 2015 -+++ ssl.c Sat Jul 18 20:38:03 2015 -@@ -277,9 +277,11 @@ static SSL_CTX *ssl_create_context(char *keyfile, char - ssl_context = SSL_CTX_new(SSLv2_method()); - break; - #endif -+#if 0 - case SRV_SSL_V3: - ssl_context = SSL_CTX_new(SSLv3_method()); - break; -+#endif - default: - case SRV_SSL_V23: - ssl_context = SSL_CTX_new(SSLv23_method()); -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade
ok jca@ Slightly longer version: Hi Anil, - regarding bison, "it's complicated" - this is a pretty big diff, I didn't review everything, only the bits I care about. (I don't use opam, for example.) For next updates, can we expect OCaml to be updated alone, along with updates required because of incompatibilities with the new ocaml port? That being said, the parts I reviewed looked pretty good, and the extensive testing on other archs make me confident that this can go in. This includes an ok to import devel/ocaml-ppx-tools (which could use NO_TEST=Yes, btw). Thanks for the hard work! -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] textproc/pdfgrep
Reinhold Straub writes: > Hi, Hi, > there is a new version of pdfgrep. Works for me, committed. Minor nit: indentation should use tabs, not spaces. Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Remove security/cfs
cfs may have been a fine piece of software years ago, it's looking pretty bad right now. DES crypto over NFSv2 on localhost, really? Also not 64 bits safe and full of scary warnings at compile time. I think that softraid CRYPTO, vnconfig(8) and security/encfs shoud be enough. ok to remove it? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Remove net/wide-dhcp?
While looking at some BROKEN ports I stumbled upon this. It is marked as broken on 64 bits archs, pokes deep inside the network stack internals and kvm. I don't think the ports tree should propose such code from 1998 running as root, when dhclient from base provides a much, much saner alternative. ok to remove it? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [build reports please] Switch to samba4
Even though I had first worked on the other alternative, I think it's clearer to just use net/samba as proposed by Stuart. This is where the patch is heading now. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: devel/py-cloudpickle
Brian Callahan writes: [...] > Out of curiosity... you say the tests are failing. They all pass here > for me. Indeed, sorry for the confusion. 8) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: devel/py-configparser
Brian Callahan writes: > Hi ports -- > > Attached is a new port, devel/py-configparser. py-configparser is the > Python 3.5 configparser backported for Python 2.6 - 3.5. > > pkg/DESCR: > The ancient ConfigParser module available in the standard library 2.x > has seen a major update in Python 3.2. This is a backport of those > changes so that they can be used directly in Python 2.6 - 3.5. > -- > This is the second of two new ports required to update devel/py-doit, > which is required to update graphics/birdfont. > > I have a working latest version of birdfont locally, so I can confirm > this works. > > OK? Looks fine to me, ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] devel/p5-Data-Munge to 0.095
Cesare Gargano writes: > Hi, > > here's an update for devel/p5-Data-Munge to version 0.095. > > Comments, OK? Committed! Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: devel/py-cloudpickle
Brian Callahan writes: > Hi ports -- > > Attached is a new port, devel/py-cloudpickle. py-cloudpickle provides > extended pickling support for Python objects. > > pkg/DESCR: > cloudpickle makes it possible to serialize Python constructs not > supported by the default pickle module from the Python standard library. > > cloudpickle is especially useful for cluster computing where Python > expressions are shipped over the network to execute on remote hosts, > possibly close to the data. > > Among other things, cloudpickle supports pickling for lambda > expressions, functions and classes defined interactively in the __main__ > module. > -- > This port is the first of two new ports required to update > devel/py-doit, which is needed to update graphics/birdfont. > > I have a working latest release of birdfont here, so I can confirm this > works. > > OK? Two notes: - seems to work fine in python3. The git log mentions efforts to support both versions, so a python3 flavor could be added. Later? :) - please don't use NO_TEST=Yes, this port has regress tests, but they are failing. To enable tests you'd need devel/py-test (see README.md) and py-mock. Please fix NO_TEST, then ok to import. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[build reports please] Switch to samba4
Hi, tl;dr: net/samba4 needs build tests on !(amd64). So, rc scripts are coming soon, Vadim is doing the testing in KDE land (thanks!), I've tested all other ports, everything works as expected. I got one glitch in gnome-control-center, where I could see the printers exported by smb but the GUI hangs when looking for the drivers. I don't think that samba4 is to blame. So that means that the switch will happen soon. I'll ask for a bulk build with net/samba4 hooked, net/samba unhooked, and all ports bumped and converted to net/samba4 use. Two points remain to be addressed: - replace immediately the content of net/samba directory with what is in net/samba4, or keep net/samba4 until the dust settles? I have no strong opinion about this. (Obviously, cvs history would end up in the Attic.) - I would like people to attempt building net/samba4 on as many architectures as possible*. This is *very* important. Just make sure you don't have any samba3 package installed, and run ''make package'' in net/samba4. Use MAKE_JOBS=n if you can... Thanks, * vax doesn't count; arm, mips64, sparc64, powerpc and hppa would be great. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: devel/py-path.py
Edd Barrett writes: > On Sun, Aug 16, 2015 at 10:28:59PM +0100, Edd Barrett wrote: >> Hey, >> >> A dependency I was supposed to submit along with py-pickleshare. >> >> Attached is: >> * The port. >> * A diff to py-pickleshare to pull in this. > > Sorry, theres another missing dep (setuptools_scm) whose tests are > currently broken. For now, I've patched away the need for > setuptools_scm. > > Revised work attached. > > OK? ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: devel/boost fails to build on sparc64
Markus Lude writes: > On Tue, Jul 28, 2015 at 04:42:33PM +0200, Jrmie Courrges-Anglas wrote: >> Stuart Henderson writes: > > Hi Jeremie, > >> > It's just complaining about -mcpu=c3 (which we don't want anyway) so this >> > should be easy enough to fix.. >> >> Indeed. Markus, does boost successfuly package with the following >> patch? > > no, build fails not much later: I see, looks like the gcc_sparc backend is not ready for prime time. Here's a diff that should make it fall back on gcc __sync ops; I've just tested a similar diff on amd64 but the sparc64 box I use for ports hasn't been updated in a while. Could you please retry? Index: patches/patch-boost_atomic_detail_platform_hpp === RCS file: patches/patch-boost_atomic_detail_platform_hpp diff -N patches/patch-boost_atomic_detail_platform_hpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-boost_atomic_detail_platform_hpp 29 Jul 2015 19:53:52 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- boost/atomic/detail/platform.hpp.orig Wed Jul 29 20:47:08 2015 boost/atomic/detail/platform.hpp Wed Jul 29 21:51:19 2015 +@@ -59,7 +59,7 @@ + + #define BOOST_ATOMIC_DETAIL_PLATFORM gcc_arm + +-#elif defined(__GNUC__) && defined(__sparc_v9__) ++#elif defined(__GNUC__) && 0 + + #define BOOST_ATOMIC_DETAIL_PLATFORM gcc_sparc + Index: patches/patch-tools_build_src_tools_gcc_jam === RCS file: /cvs/ports/devel/boost/patches/patch-tools_build_src_tools_gcc_jam,v retrieving revision 1.2 diff -u -p -r1.2 patch-tools_build_src_tools_gcc_jam --- patches/patch-tools_build_src_tools_gcc_jam 10 Jul 2015 08:13:46 - 1.2 +++ patches/patch-tools_build_src_tools_gcc_jam 29 Jul 2015 19:53:52 - @@ -1,6 +1,6 @@ $OpenBSD: patch-tools_build_src_tools_gcc_jam,v 1.2 2015/07/10 08:13:46 jasper Exp $ --- tools/build/src/tools/gcc.jam.orig Sat Apr 4 19:25:07 2015 -+++ tools/build/src/tools/gcc.jam Fri Jul 10 10:13:10 2015 tools/build/src/tools/gcc.jam Tue Jul 28 16:36:55 2015 @@ -337,7 +337,7 @@ class gcc-pch-generator : pch-generator # Return result of base class and pch-file property as # usage-requirements. @@ -68,3 +68,127 @@ $OpenBSD: patch-tools_build_src_tools_gc } rule setup-threading ( targets * : sources * : properties * ) +@@ -1068,123 +1067,3 @@ local rule cpu-flags ( toolset variable : architecture + } + + +-# Set architecture/instruction-set options. +-# +-# x86 and compatible +-# The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. +-# Use i686 instead for 32-bit. +-toolset.flags gcc OPTIONS x86/32/ : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : native : -march=native ; +-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; +-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; +-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; +-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; +-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; +-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; +-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; +-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; +-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; +-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; +-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; +-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; +-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; +-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; +-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; +-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; +-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; +-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; +-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; +-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; +-cpu-flags gcc OPTIONS : x
Re: devel/boost fails to build on sparc64
Stuart Henderson writes: > It's just complaining about -mcpu=c3 (which we don't want anyway) so this > should be easy enough to fix.. Indeed. Markus, does boost successfuly package with the following patch? cc'ing Brad. Index: patches/patch-tools_build_src_tools_gcc_jam === RCS file: /cvs/ports/devel/boost/patches/patch-tools_build_src_tools_gcc_jam,v retrieving revision 1.2 diff -u -p -r1.2 patch-tools_build_src_tools_gcc_jam --- patches/patch-tools_build_src_tools_gcc_jam 10 Jul 2015 08:13:46 - 1.2 +++ patches/patch-tools_build_src_tools_gcc_jam 28 Jul 2015 14:37:02 - @@ -1,6 +1,6 @@ $OpenBSD: patch-tools_build_src_tools_gcc_jam,v 1.2 2015/07/10 08:13:46 jasper Exp $ --- tools/build/src/tools/gcc.jam.orig Sat Apr 4 19:25:07 2015 -+++ tools/build/src/tools/gcc.jam Fri Jul 10 10:13:10 2015 tools/build/src/tools/gcc.jam Tue Jul 28 16:36:55 2015 @@ -337,7 +337,7 @@ class gcc-pch-generator : pch-generator # Return result of base class and pch-file property as # usage-requirements. @@ -68,3 +68,127 @@ $OpenBSD: patch-tools_build_src_tools_gc } rule setup-threading ( targets * : sources * : properties * ) +@@ -1068,123 +1067,3 @@ local rule cpu-flags ( toolset variable : architecture + } + + +-# Set architecture/instruction-set options. +-# +-# x86 and compatible +-# The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. +-# Use i686 instead for 32-bit. +-toolset.flags gcc OPTIONS x86/32/ : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : native : -march=native ; +-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; +-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; +-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; +-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; +-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; +-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; +-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; +-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; +-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; +-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; +-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; +-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; +-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; +-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; +-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; +-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; +-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; +-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; +-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; +-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; +-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ; +-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ; +-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ; +-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ; +-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ; +-## +-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ; +-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ; +-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ; +-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ; +-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ; +-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ; +-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ; +-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ; +-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ; +-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ; +-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ; +-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ; +-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; +-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; +-cpu-flags gcc OPTIONS :
Re: audio/puddletag crashes on startup
micah writes: > On a July 22 amd64 snapshot, with the most recent amd64 packages, > audio/puddletag crashes immediately upon startup: > >> $ puddletag >> puddletag Version: 1.0.5 >> Locale: en_US >> Traceback (most recent call last): >> File "/usr/local/bin/puddletag", line 350, in >> win = MainWin() >> File "/usr/local/lib/python2.7/site-packages/puddlestuff/puddletag.py", >> line 315, in __init__ >> winactions, self._docks = create_tool_windows(self) >> File "/usr/local/lib/python2.7/site-packages/puddlestuff/puddletag.py", >> line 92, in create_tool_windows >> p = PuddleDock(z[0], z[1], parent, status) >> File >> "/usr/local/lib/python2.7/site-packages/puddlestuff/puddleobjects.py", line >> 2193, in __init__ >> control = control(status=status) >> File >> "/usr/local/lib/python2.7/site-packages/puddlestuff/mainwin/artwork.py", >> line 61, in __init__ >> self.picwidget = PicWidget() >> File >> "/usr/local/lib/python2.7/site-packages/puddlestuff/puddleobjects.py", line >> 1530, in __init__ >> self.label = ArtworkLabel() >> File >> "/usr/local/lib/python2.7/site-packages/puddlestuff/puddleobjects.py", line >> 1421, in __init__ >> pal.setBrush(self.backgroundRole(), QBrush(QPalette.Window)) >> TypeError: QBrush(): argument 1 has unexpected type 'ColorRole > > puddletag's github has some brief details and a possible one-line fix at > https://github.com/keithgg/puddletag/issues/261. I've committed this fix. > Best, > > Micah Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: net/psi failed to build
Antoine Jacoutot writes: > Not sure what change triggered this (unless it's a fluke...). Hmm, I've recently committed a change to qca-ossl. cc'ing Vadim. Building on exopi-7 under net/psi >BDEPENDS = > [devel/gmake;archivers/bzip2;devel/gettext;x11/qt4;security/qca2;textproc/enchant;devel/gettext-tools;converters/libiconv] >DIST = [net/psi:psi-0.15.tar.bz2] >FULLPKGNAME = psi-0.15p3 >RDEPENDS = > [converters/libiconv;devel/desktop-file-utils;security/qca-gnupg;devel/gettext;x11/qt4;textproc/enchant;security/qca2;security/qca-ossl;x11/gtk+3,-guic] > (Junk lock obtained for exopi-7 at 1437932972) Running depends in net/psi at 1437932972 >last junk was in games/numptyphysics,-main > /usr/sbin/pkg_add -aI -Dunsigned -Drepair bzip2-1.0.6p1 enchant-1.6.0p2 > qca2-2.0.3p2 qt4-4.8.7 > was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair bzip2-1.0.6p1 enchant-1.6.0p2 > gettext-0.19.5.1 gettext-tools-0.19.5.1 gmake-4.1p0 libiconv-1.14p3 > qca2-2.0.3p2 qt4-4.8.7 > /usr/sbin/pkg_add -aI -Dunsigned -Drepair bzip2-1.0.6p1 enchant-1.6.0p2 > qca2-2.0.3p2 qt4-4.8.7 Running show-prepare-results in net/psi at 1437932980 > ===> net/psi > ===> psi-0.15p3 depends on: gettext->=0.10.38 -> gettext-0.19.5.1 > ===> psi-0.15p3 depends on: gettext-tools-* -> gettext-tools-0.19.5.1 > ===> psi-0.15p3 depends on: gmake-* -> gmake-4.1p0 > ===> psi-0.15p3 depends on: bzip2-* -> bzip2-1.0.6p1 > ===> psi-0.15p3 depends on: qca2-* -> qca2-2.0.3p2 > ===> psi-0.15p3 depends on: enchant-* -> enchant-1.6.0p2 > ===> psi-0.15p3 depends on: qt4-* -> qt4-4.8.7 > ===> psi-0.15p3 depends on: libiconv-* -> libiconv-1.14p3 > ===> Verifying specs: ICE QtDBus QtGui QtNetwork QtXml SM X11 Xext Xi > Xinerama Xrender Xss c enchant fontconfig freetype glib-2.0 gmodule-2.0 m > pthread qca2 stdc++ z lib/qt4/QtCore intl>=5 iconv>=6 > ===> found ICE.10.0 QtDBus.2.0 QtGui.10.1 QtNetwork.10.0 QtXml.8.0 SM.9.0 > X11.16.1 Xext.13.0 Xi.12.1 Xinerama.6.0 Xrender.6.0 Xss.6.0 c.80.1 > enchant.6.1 fontconfig.9.1 freetype.24.0 glib-2.0.4200.1 gmodule-2.0.4200.1 > m.9.0 pthread.19.0 qca2.0.0 stdc++.57.0 z.5.0 lib/qt4/QtCore.9.0 intl.6.0 > iconv.6.0 > bzip2-1.0.6p1 > enchant-1.6.0p2 > gettext-0.19.5.1 > gettext-tools-0.19.5.1 > gmake-4.1p0 > libiconv-1.14p3 > qca2-2.0.3p2 > qt4-4.8.7 > Don't run junk because nojunk in x11/qt5,,-main > (Junk lock released for exopi-7 at 1437932984) > distfiles size=1984777 Running patch in net/psi at 1437932985 > ===> net/psi > ===> Checking files for psi-0.15p3 > `/exopi-cvs/ports/distfiles/psi-0.15.tar.bz2' is up to date. > ===> Extracting for psi-0.15p3 > ===> Patching for psi-0.15p3 Running configure in net/psi at 1437932988 > ===> net/psi > ===> Configuring for psi-0.15p3 > Configuring Psi ... > Verifying Qt 4 build environment ... ok > Checking for Qt >= 4.7.0 ... yes > Checking for QCA >= 2.0 ... yes > Checking for zlib ... yes > Checking for QDBUS ... yes > Checking for the XScreenSaver extension ... yes > Checking for spellcheck engine ... enchant > Generating .prl files ... ok > > Good, your configure finished. Now run gmake. > Running build in net/psi at 1437933003 > ===> net/psi > ===> Building for psi-0.15p3 > cd iris/ && /usr/local/lib/qt4/bin/qmake > /exopi-obj/pobj/psi-0.15/psi-0.15/iris/iris.pro -o Makefile > cd iris/ && gmake -f Makefile all > gmake[1]: Entering directory '/exopi-obj/pobj/psi-0.15/psi-0.15/iris' > cd src/ && /usr/local/lib/qt4/bin/qmake > /exopi-obj/pobj/psi-0.15/psi-0.15/iris/src/src.pro -o Makefile > cd src/ && gmake -f Makefile all > gmake[2]: Entering directory '/exopi-obj/pobj/psi-0.15/psi-0.15/iris/src' > cd irisnet/ && /usr/local/lib/qt4/bin/qmake > /exopi-obj/pobj/psi-0.15/psi-0.15/iris/src/irisnet/irisnet.pro -o Makefile > cd irisnet/ && gmake -f Makefile all > gmake[3]: Entering directory > '/exopi-obj/pobj/psi-0.15/psi-0.15/iris/src/irisnet' > cd noncore/ && /usr/local/lib/qt4/bin/qmake > /exopi-obj/pobj/psi-0.15/psi-0.15/iris/src/irisnet/noncore/noncore.pro -o > Makefile > cd noncore/ && gmake -f Makefile all > gmake[4]: Entering directory > '/exopi-obj/pobj/psi-0.15/psi-0.15/iris/src/irisnet/noncore' > gcc -c -pipe -O2 -fno-wrapv -g -O2 -fno-wrapv -fPIC -Wall -W -pthread > -DIRISNET_STATIC -DHAVE_XSS -DHAVE_ENCHANT -DHAVE_CONFIG > -DIRIS_XMPP_JID_DEPRECATED -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB > -DQT_SHARED -I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. > -I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtNetwork > -I/usr/local/include/X11/qt4 -I/usr/local/include/QtCrypto > -I/usr/local/include/X11/qt4 -I/usr/include -I/usr/local/include/enchant > -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include > -I/usr/local/include -I../../jdns -I../corelib -Icutestuff -Ilegacy -I. > -I/usr/local/include -o jdns_util.o ../../jdns/jdns_util.c > gcc -c -pipe -O2 -fno-wrapv -g -O2 -fno-wrapv -fPIC -Wall -W -pthread > -DIRISNET_STATIC -DHAVE_XSS -DHAVE_ENCHANT -DHAVE_CO
Re: net/znc: get rid of SSLv3
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes: > Similar to most ports update today. Note the "fall-through"s in the > switch statement. > > ok? Please disregard this diff; it doesn't work as advertised. I'll leave the SSLv3 problem to Brad. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] mosh-1.2.5
Antoine Jacoutot writes: >> mosh-1.2.5 is out, here's a patch. Still works fine on amd64 (and >> sparc64). Unless I receive positive feedback very soon, I'll commit >> this after 5.8 unlock. > > And what about if you receive negative feedback? ;-) Then I will have plenty of time to fix the possible problems. :) (I have already received a regression report, actually). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: shell/nsh is broken
cc'ing Chris,
ni...@openbsd.org writes:
> On 07/23/15 20:15, Antoine Jacoutot wrote:
> Building on exopi-3 under shells/nsh
>> DIST = [shells/nsh:nsh-1.0.20140503.tar.gz]
>> FULLPKGNAME = nsh-1.0.20140503p1
>> distfiles size=122697
> Running build in shells/nsh at 1437678603
>> ===> shells/nsh
>> ===> Verifying specs: c edit termcap sqlite3
>> ===> found c.80.1 edit.5.2 termcap.14.0 sqlite3.30.1
>> ===> Checking files for nsh-1.0.20140503p1
>> `/exopi-cvs/ports/distfiles/nsh-1.0.20140503.tar.gz' is up to date.
>> ===> Extracting for nsh-1.0.20140503p1
>> ===> Patching for nsh-1.0.20140503p1
>> ===> Configuring for nsh-1.0.20140503p1
>> ===> Building for nsh-1.0.20140503p1
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c arp.c
>> sh
>> /exopi-obj/pobj/nsh-1.0.20140503/nsh-17aad6edd4ad4b0a7f4f281aa575490cbe68606a/compile.sh
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c compile.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c main.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c genget.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c commands.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c stats.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c kroute.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c ctl.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c show.c
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c if.c
>> if.c:638: warning: no previous prototype for 'addaf'
>> if.c: In function 'intxflags':
>> if.c:1527: warning: 'value' is used uninitialized in this function
>> cc -O2 -pipe -Wmissing-prototypes -Wformat -Wall -Wpointer-arith
>> -Wbad-function-cast-nostdinc -idirafter /usr/include -c version.c
>> version.c: In function 'version':
>> version.c:82: error: 'MPLSCTL_IFQUEUE' undeclared (first use in this
>> function)
>> version.c:82: error: (Each undeclared identifier is reported only once
>> version.c:82: error: for each function it appears in.)
>> *** Error 1 in
>> /exopi-obj/pobj/nsh-1.0.20140503/nsh-17aad6edd4ad4b0a7f4f281aa575490cbe68606a
>> (:87 'version.o')
>> *** Error 1 in shells/nsh
>> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2767
>> '/exopi-obj/pobj/nsh-1.0.20140503/.build_done')
>> *** Error 1 in shells/nsh
>> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2488 'build')
>> ===> Exiting shells/nsh with an error
>> *** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:147
>> 'build')
>> Error: job failed 256
>>
>>
>
> Saw that error on my build for amd64 ...
>
> From this change maybe
>
> Index: netmpls/mpls.h
> ===
> RCS file: /cvs/src/sys/netmpls/mpls.h,v
> retrieving revision 1.31
> diff -u -p -r1.31 mpls.h
> --- netmpls/mpls.h10 Apr 2015 13:58:20 - 1.31
> +++ netmpls/mpls.h20 Jul 2015 06:08:35 -
> @@ -107,7 +107,6 @@ struct rt_mpls {
> */
> #define MPLSCTL_ENABLE 1
> #define MPLSCTL_DEFTTL 2
> -#define MPLSCTL_IFQUEUE 3
> #define MPLSCTL_MAXINKLOOP 4
> #define MPLSCTL_MAPTTL_IP5
> #define MPLSCTL_MAPTTL_IP6 6
> @@ -160,7 +159,6 @@ void mpe_input6(struct mbuf *, struct if
> extern int mpls_raw_usrreq(struct socket *, int, struct mbuf *,
> struct mbuf *, struct mbuf *, struct proc *);
>
> -extern struct niqueuemplsintrq; /* MPLS input queue */
> extern int mpls_defttl;
> extern int mpls_mapttl_ip;
> extern int mpls_mapttl_ip6;
> @@ -168,15 +166,15 @@ extern int mpls_inkloop;
>
>
>
>
> $ cvs -R -q log -r1.30:1.33 sys/netmpls/mpls.h
>
>
> total revisions: 33;selected revisions: 4
> description:
>
> revision 1.33
> date: 2015/07/20 22:16:41; author: rzalamena; state: Exp; lines: +18
> -1; commitid: yaHvJbufOxtjWSFd;
> Implemented MPLS pseudowire (mpw(4)) to be used with VPLS and VPWS.
>
> ok mpi@, claudio@.
>
> revision 1.32
> date: 2015/07/20 21:16:39; author: rzalamena; state: Exp; lines: +3
> -5; commitid: t2fhFUpUuj89g4Sj;
> Kill NETIS
[update] mosh-1.2.5
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> Hi,
>
> the mosh project published a release candidate yesterday, here's a diff
> for those who want to give it a try.
>
> --8<--
> 2015-06-?? Keith Winstein
>
>* Version 1.2.5 released.
>
>* New features:
>* Bind to a specific IP address with --bind-server. (Philipp
>Haselwarter)
>* MOSH_ESCAPE_KEY configures escape character. (Timo
>J. Rinne)
>* Support non-roaming IPv6. (Anders Kaseorg)
>* Implement XTerm mouse mode. (Barosl LEE, Andrew Chin,
>Louis Kruger)
>* Report Git revision along with version if available.
>(John Hood)
> -->8--
>
>
> "BROKEN-arm" removed since it was probably not mosh's fault. Lightly
> tested on amd64, I'd appreciate reports on other archs.
mosh-1.2.5 is out, here's a patch. Still works fine on amd64 (and
sparc64). Unless I receive positive feedback very soon, I'll commit
this after 5.8 unlock.
Index: Makefile
===
RCS file: /cvs/ports/net/mosh/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile17 Oct 2013 20:58:28 - 1.5
+++ Makefile23 Jul 2015 19:16:15 -
@@ -1,12 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2013/10/17 20:58:28 jca Exp $
-BROKEN-arm = erratic runtime behaviour
-
COMMENT = mobile shell
-DISTNAME = mosh-1.2.4
-
-REVISION = 1
+DISTNAME = mosh-1.2.5
CATEGORIES = net
@@ -24,13 +20,11 @@ MASTER_SITES = ${HOMEPAGE}
LIB_DEPENDS = devel/protobuf
-MAKE_FLAGS = CPPFLAGS='-Dbe16toh=betoh16 -Dbe64toh=betoh64'
-
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
# --enable-hardening forces PIE on, which doesn't work on all arches
# pick only ld(1) -z now to match upstream
CONFIGURE_ARGS = --disable-hardening
-CONFIGURE_ENV =ac_cv_have_decl_htobe64=yes LDFLAGS="-Wl,-z,now"
+CONFIGURE_ENV =LDFLAGS="-Wl,-z,now"
.include
Index: distinfo
===
RCS file: /cvs/ports/net/mosh/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo21 Apr 2013 19:46:37 - 1.1.1.1
+++ distinfo23 Jul 2015 18:22:58 -
@@ -1,2 +1,2 @@
-SHA256 (mosh-1.2.4.tar.gz) = 500NMjImBG5ALdRpoXYHX8IBO2mw5nzqSXYslXF130Y=
-SIZE (mosh-1.2.4.tar.gz) = 283047
+SHA256 (mosh-1.2.5.tar.gz) = GvgJ5ddHwzOoUvv3rNv001TcS7woOeOv5c95gZAHS+M=
+SIZE (mosh-1.2.5.tar.gz) = 308857
Index: patches/patch-src_crypto_ocb_cc
===
RCS file: /cvs/ports/net/mosh/patches/patch-src_crypto_ocb_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_crypto_ocb_cc
--- patches/patch-src_crypto_ocb_cc 9 Oct 2013 07:33:41 - 1.1
+++ patches/patch-src_crypto_ocb_cc 23 Jul 2015 18:26:43 -
@@ -2,13 +2,13 @@ $OpenBSD: patch-src_crypto_ocb_cc,v 1.1
Use generic code on ARM instead of asm because of some unsupported
instructions.
Introduced by https://github.com/keithw/mosh/issues/86
src/crypto/ocb.cc.orig Tue Oct 8 11:57:42 2013
-+++ src/crypto/ocb.cc Tue Oct 8 11:58:01 2013
+--- src/crypto/ocb.cc.orig Thu Jul 23 12:26:21 2015
src/crypto/ocb.cc Thu Jul 23 12:26:37 2015
@@ -298,7 +298,7 @@
return swap_if_le(rval);
}
-- #if __GNUC__ && __arm__
+- #if __GNUC__ && !__clang__ && __arm__
+ #if 0
static inline block double_block(block b) {
__asm__ ("adds %1,%1,%1\n\t"
Index: patches/patch-src_network_transportfragment_cc
===
RCS file: /cvs/ports/net/mosh/patches/patch-src_network_transportfragment_cc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_network_transportfragment_cc
--- patches/patch-src_network_transportfragment_cc 21 Apr 2013 19:46:37
- 1.1.1.1
+++ patches/patch-src_network_transportfragment_cc 23 Jul 2015 18:26:55
-
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_network_transportfragment_cc,v 1.1.1.1 2013/04/21 19:46:37
sthen Exp $
src/network/transportfragment.cc.orig Fri Feb 15 04:18:44 2013
-+++ src/network/transportfragment.cc Fri Feb 15 04:18:59 2013
-@@ -30,6 +30,7 @@
- also delete it here.
- */
-
-+#include
- #include
-
- #include "byteorder.h"
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Add devel/ruby-tame, wrapper for tame(2)
li...@wrant.com writes: > Is this port going to keep up with the development of the underlying > structure it depends on? Please advise timescale. I doubt you are entitled to question Jeremy's work in OpenBSD land. Please refrain from such comments. sigh -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/py-serial 2.4 => 2.7 (+ python3 support)
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes: [...] > I doubt you successfully packages the python2 version with the updated > PLIST. :) OK I understand what's been going on; I'll fix that. /me runs -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/py-serial 2.4 => 2.7 (+ python3 support)
Daniel Winters writes: > Hi, Hi, >>> Thanks for the pointers. Yes that's better diff - it's working fine >>> with my arduino on amd64 - will test on i386 with a different serial >>> device. >>> >> Also tested on i386. > > Fred and Jérémie, thanks for working on this! > > Here is a slightly tweaked diff with the following changes: > > - fix $DOCSDIR and $EXAMPLESDIR to not get a directory named py--serial Good catch. > - do not install miniterm.py in $PREFIX/bin, I do not think it is that > useful Well, you're still installing it but without renaming it, this means you can't install the python2 and python3 packages at the same time. Since the work to cope with both versions has already been done, I propose not to throw it away. > - install a bit more documentation Ack. > - update my contact details > > Tested on amd64 with both py2 and py3 without issues. I doubt you successfully packages the python2 version with the updated PLIST. :) I'll commit my proposal with your s/py--serial/py-serial/ fix and the doc addition. Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] devel/libtalloc -> 2.1.2 (samba4)
Ian Mcwilliam writes: > Could libtalloc and tdb python parts be split into multiple packages so we > don't have to install python module libs unless there is something python > that depends on these? Just a thought. sqlite> select * from depends where dependspath like 'databases/tdb%'; audio/rhythmbox|databases/tdb|||databases/tdb|L databases/tdbc-sqlite3|databases/tdbc|||databases/tdbc|B databases/tdbc-sqlite3|databases/tdbc|||databases/tdbc|R mail/fdm|STEM->=1.2.7:databases/tdb|STEM->=1.2.7||databases/tdb|L net/samba,-main|STEM->=1.2.7:databases/tdb|STEM->=1.2.7||databases/tdb|L net/samba,ldap,-main|STEM->=1.2.7:databases/tdb|STEM->=1.2.7||databases/tdb|L sqlite> select * from depends where dependspath like 'devel/libtalloc%'; net/ocserv|devel/libtalloc|||devel/libtalloc|L net/samba,-main|devel/libtalloc|||devel/libtalloc|L net/samba,ldap,-main|devel/libtalloc|||devel/libtalloc|L fdm and ocserv users now have to install python if not already done. Nobody yelled at me yet, so it's listed at the bottom of my TODO list. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: py-werkzeug
frantisek holop writes: > Stuart Henderson, 18 Jul 2015 21:26: >> On 2015/07/18 21:39, frantisek holop wrote: >> > python3 flavor, examples, change to github, >> > disable tests. >> >> why disable tests? > > dependencies. they have changed considerably > since the previous port version and would need too many > new ports to import. i started doing it, but > then saturday ended... i ran the tests from virtualenv > and all non-skipped passed. if anybody wants to pick > up the TEST_DEPENDS, be my guest. I added a test dep. on py-test, that already helps running most of the test suite... -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: mail/courier-imap: get rid of SSLv3
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes: > This diff allows building courier-imap with no SSLv3 support in libssl. As noticed by naddy@ the config.h.in patch is superfluous since we regenerate the file with autoheader anyway. The rest of the diff stays as is. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] net/pen-0.29.0
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> Here's an update that brings in TLS and geoip support. Is anyone
> interested?
>
> ChangeLog:
>
> https://github.com/UlricE/pen/blob/master/ChangeLog
>
> ok?
Stuart noticed that I was typing randomly on my keyboard, asking for
oks. Here's a better diff:
Index: Makefile
===
RCS file: /cvs/ports/net/pen/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile7 Nov 2014 12:44:28 - 1.16
+++ Makefile19 Jul 2015 02:38:29 -
@@ -2,21 +2,24 @@
COMMENT= load balancer for simple TCP-based protocols
-DISTNAME= pen-0.18.0
+DISTNAME= pen-0.29.0
+
CATEGORIES=net
-HOMEPAGE= http://siag.nu/pen/
-MASTER_SITES= http://siag.nu/pub/pen/
+HOMEPAGE= http://siag.nu/pen/
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c
+WANTLIB += GeoIP c crypto ssl
+
+MASTER_SITES= http://siag.nu/pub/pen/
+
+LIB_DEPENDS= net/GeoIP
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=--with-docdir=${PREFIX}/share/doc/pen
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pen
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
.include
Index: distinfo
===
RCS file: /cvs/ports/net/pen/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo18 Jan 2015 03:14:50 - 1.10
+++ distinfo19 Jul 2015 02:38:29 -
@@ -1,2 +1,2 @@
-SHA256 (pen-0.18.0.tar.gz) = SKsqLKP1ZMthChDS1SUuz4cj7YOSusXR+6IIlGw2Zfo=
-SIZE (pen-0.18.0.tar.gz) = 130308
+SHA256 (pen-0.29.0.tar.gz) = 8ZD46bu0D9NpsIDJpYvtpdFBG12a18bED62qKgNjGgU=
+SIZE (pen-0.29.0.tar.gz) = 182198
Index: patches/patch-ssl_c
===
RCS file: patches/patch-ssl_c
diff -N patches/patch-ssl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-ssl_c 19 Jul 2015 02:38:29 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- ssl.c.orig Wed May 13 07:38:28 2015
ssl.c Sat Jul 18 20:38:03 2015
+@@ -277,9 +277,11 @@ static SSL_CTX *ssl_create_context(char *keyfile, char
+ ssl_context = SSL_CTX_new(SSLv2_method());
+ break;
+ #endif
++#if 0
+ case SRV_SSL_V3:
+ ssl_context = SSL_CTX_new(SSLv3_method());
+ break;
++#endif
+ default:
+ case SRV_SSL_V23:
+ ssl_context = SSL_CTX_new(SSLv23_method());
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[update] net/pen-0.29.0
Here's an update that brings in TLS and geoip support. Is anyone
interested?
ChangeLog:
https://github.com/UlricE/pen/blob/master/ChangeLog
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/pen/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile7 Nov 2014 12:44:28 - 1.16
+++ Makefile19 Jul 2015 02:09:24 -
@@ -2,21 +2,24 @@
COMMENT= load balancer for simple TCP-based protocols
-DISTNAME= pen-0.18.0
+DISTNAME= pen-0.29.0
+
CATEGORIES=net
-HOMEPAGE= http://siag.nu/pen/
-MASTER_SITES= http://siag.nu/pub/pen/
+HOMEPAGE= http://siag.nu/pen/
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c
+WANTLIB += GeoIP c crypto ssl
+
+MASTER_SITES= http://siag.nu/pub/pen/
+
+LIB_DEPENDS= net/GeoIP
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=--with-docdir=${PREFIX}/share/doc/pen
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pen
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
.include
Index: distinfo
===
RCS file: /cvs/ports/net/pen/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo18 Jan 2015 03:14:50 - 1.10
+++ distinfo19 Jul 2015 02:09:24 -
@@ -1,2 +1,2 @@
-SHA256 (pen-0.18.0.tar.gz) = SKsqLKP1ZMthChDS1SUuz4cj7YOSusXR+6IIlGw2Zfo=
-SIZE (pen-0.18.0.tar.gz) = 130308
+SHA256 (pen-0.29.0.tar.gz) = 8ZD46bu0D9NpsIDJpYvtpdFBG12a18bED62qKgNjGgU=
+SIZE (pen-0.29.0.tar.gz) = 182198
Index: patches/patch-ssl_c
===
RCS file: patches/patch-ssl_c
diff -N patches/patch-ssl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-ssl_c 19 Jul 2015 02:09:24 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- ssl.c.orig Wed May 13 07:38:28 2015
ssl.c Sat Jul 18 20:09:09 2015
+@@ -272,15 +272,17 @@ static SSL_CTX *ssl_create_context(char *keyfile, char
+ cacert_file = NULL;
+
+ switch (ssl_protocol) {
+-#if 0
++#ifndef OPENSSL_NO_SSL3
+ case SRV_SSL_V2:
+ ssl_context = SSL_CTX_new(SSLv2_method());
+ break;
+ #endif
++#ifndef OPENSSL_NO_SSL2
+ case SRV_SSL_V3:
+ ssl_context = SSL_CTX_new(SSLv3_method());
+ break;
+- default:
++#endif
++ default:
+ case SRV_SSL_V23:
+ ssl_context = SSL_CTX_new(SSLv23_method());
+ break;
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: net/socat: get rid of SSLv3
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
> This allows one to build sockat with no SSLv3 support in libssl. There
> already are #ifdef guards for those function but they aren't enough.
>
> ok?
Updated patch after feedback from sthen@, which fixes the following:
> ++#ifdef HAVE_SSLv3_client_method
> + const SSL_METHOD *sycSSLv3_server_method(void) {
> +
("client" vs. "server")
Index: patches/patch-sslcls_c
===
RCS file: /cvs/ports/net/socat/patches/patch-sslcls_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sslcls_c
--- patches/patch-sslcls_c 13 Apr 2015 14:43:28 - 1.3
+++ patches/patch-sslcls_c 19 Jul 2015 02:03:00 -
@@ -1,7 +1,33 @@
$OpenBSD: patch-sslcls_c,v 1.3 2015/04/13 14:43:28 jasper Exp $
sslcls.c.orig Sat Jan 24 11:15:22 2015
-+++ sslcls.c Mon Apr 13 14:58:09 2015
-@@ -331,14 +331,6 @@ void sycSSL_free(SSL *ssl) {
+--- sslcls.c.orig Sat Jan 24 03:15:22 2015
sslcls.c Sat Jul 18 20:01:59 2015
+@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
+ }
+ #endif
+
++#ifdef HAVE_SSLv3_client_method
+ const SSL_METHOD *sycSSLv3_client_method(void) {
+const SSL_METHOD *result;
+Debug("SSLv3_client_method()");
+@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
+Debug1("SSLv3_client_method() -> %p", result);
+return result;
+ }
++#endif
+
++#ifdef HAVE_SSLv3_server_method
+ const SSL_METHOD *sycSSLv3_server_method(void) {
+const SSL_METHOD *result;
+Debug("SSLv3_server_method()");
+@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
+Debug1("SSLv3_server_method() -> %p", result);
+return result;
+ }
++#endif
+
+ const SSL_METHOD *sycSSLv23_client_method(void) {
+const SSL_METHOD *result;
+@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) {
return;
}
@@ -16,7 +42,7 @@ $OpenBSD: patch-sslcls_c,v 1.3 2015/04/1
DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
DH *result;
Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
-@@ -375,7 +367,7 @@ int sycFIPS_mode_set(int onoff) {
+@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) {
}
#endif /* WITH_FIPS */
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
net/znc: get rid of SSLv3
Similar to most ports update today. Note the "fall-through"s in the
switch statement.
ok?
Index: patches/patch-src_Csocket_cpp
===
RCS file: /cvs/ports/net/znc/patches/patch-src_Csocket_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Csocket_cpp
--- patches/patch-src_Csocket_cpp 15 May 2015 06:47:27 - 1.2
+++ patches/patch-src_Csocket_cpp 19 Jul 2015 01:58:54 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Csocket_cpp,v 1.2 2015/05/15 06:47:27 ajacoutot Exp $
src/Csocket.cpp.orig Thu May 14 23:10:24 2015
-+++ src/Csocket.cppThu May 14 23:11:00 2015
+--- src/Csocket.cpp.orig Thu Feb 12 13:51:46 2015
src/Csocket.cppSat Jul 18 19:48:40 2015
@@ -47,6 +47,7 @@
#include
#include
@@ -9,3 +9,35 @@ $OpenBSD: patch-src_Csocket_cpp,v 1.2 20
#endif /* HAVE_LIBSSL */
#ifdef HAVE_ICU
+@@ -1464,6 +1465,7 @@ bool Csock::SSLClientSetup()
+ switch( m_iMethod )
+ {
+ case SSL3:
++#ifndef OPENSSL_NO_SSL3
+ m_ssl_ctx = SSL_CTX_new( SSLv3_client_method() );
+ if( !m_ssl_ctx )
+ {
+@@ -1471,6 +1473,7 @@ bool Csock::SSLClientSetup()
+ return( false );
+ }
+ break;
++#endif /* OPENSSL_NO_SSL3 */
+ case TLS12:
+ #if defined( TLS1_2_VERSION ) && defined( OPENSSL_VERSION_NUMBER ) &&
OPENSSL_VERSION_NUMBER >= 0x1000100f
+ m_ssl_ctx = SSL_CTX_new( TLSv1_2_client_method() );
+@@ -1586,6 +1589,7 @@ SSL_CTX * Csock::SetupServerCTX()
+ switch( m_iMethod )
+ {
+ case SSL3:
++#ifndef OPENSSL_NO_SSL3
+ pCTX = SSL_CTX_new( SSLv3_server_method() );
+ if( !pCTX )
+ {
+@@ -1593,6 +1597,7 @@ SSL_CTX * Csock::SetupServerCTX()
+ return( NULL );
+ }
+ break;
++#endif
+ case TLS12:
+ #if defined( TLS1_2_VERSION ) && defined( OPENSSL_VERSION_NUMBER ) &&
OPENSSL_VERSION_NUMBER >= 0x1000100f
+ pCTX = SSL_CTX_new( TLSv1_2_server_method() );
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
net/socat: get rid of SSLv3
This allows one to build sockat with no SSLv3 support in libssl. There
already are #ifdef guards for those function but they aren't enough.
ok?
Index: patches/patch-sslcls_c
===
RCS file: /cvs/ports/net/socat/patches/patch-sslcls_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sslcls_c
--- patches/patch-sslcls_c 13 Apr 2015 14:43:28 - 1.3
+++ patches/patch-sslcls_c 19 Jul 2015 01:43:21 -
@@ -1,7 +1,33 @@
$OpenBSD: patch-sslcls_c,v 1.3 2015/04/13 14:43:28 jasper Exp $
sslcls.c.orig Sat Jan 24 11:15:22 2015
-+++ sslcls.c Mon Apr 13 14:58:09 2015
-@@ -331,14 +331,6 @@ void sycSSL_free(SSL *ssl) {
+--- sslcls.c.orig Sat Jan 24 03:15:22 2015
sslcls.c Sat Jul 18 19:15:57 2015
+@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
+ }
+ #endif
+
++#ifdef HAVE_SSLv3_client_method
+ const SSL_METHOD *sycSSLv3_client_method(void) {
+const SSL_METHOD *result;
+Debug("SSLv3_client_method()");
+@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
+Debug1("SSLv3_client_method() -> %p", result);
+return result;
+ }
++#endif
+
++#ifdef HAVE_SSLv3_client_method
+ const SSL_METHOD *sycSSLv3_server_method(void) {
+const SSL_METHOD *result;
+Debug("SSLv3_server_method()");
+@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
+Debug1("SSLv3_server_method() -> %p", result);
+return result;
+ }
++#endif
+
+ const SSL_METHOD *sycSSLv23_client_method(void) {
+const SSL_METHOD *result;
+@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) {
return;
}
@@ -16,7 +42,7 @@ $OpenBSD: patch-sslcls_c,v 1.3 2015/04/1
DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
DH *result;
Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
-@@ -375,7 +367,7 @@ int sycFIPS_mode_set(int onoff) {
+@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) {
}
#endif /* WITH_FIPS */
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
mail/courier-imap: get rid of SSLv3
This diff allows building courier-imap with no SSLv3 support in libssl.
ok?
Index: Makefile
===
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile15 Jul 2015 21:14:06 - 1.97
+++ Makefile19 Jul 2015 01:31:14 -
@@ -29,7 +29,8 @@ WANTLIB-pop3+=idn pcre ${MODGETTEXT_WA
USE_GMAKE= Yes
USE_GROFF= Yes
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf autoheader
+AUTOCONF_VERSION= 2.69
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CXXFLAGS="-I${LOCALBASE}/include" \
Index: patches/patch-libs_tcpd_config_h_in
===
RCS file: patches/patch-libs_tcpd_config_h_in
diff -N patches/patch-libs_tcpd_config_h_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libs_tcpd_config_h_in 19 Jul 2015 01:31:14 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- libs/tcpd/config.h.in.orig Sat Dec 13 07:23:32 2014
libs/tcpd/config.h.in Sat Jul 18 19:10:41 2015
+@@ -46,6 +46,9 @@
+ /* Whether pipe() is SvR4-style that's a bidirectional pipe */
+ #undef HAVE_SPIPE_SVR4
+
++/* Define to 1 if you have the `SSLv3_method' function. */
++#undef HAVE_SSLV3_METHOD
++
+ /* Define to 1 if you have the header file. */
+ #undef HAVE_STDINT_H
+
Index: patches/patch-libs_tcpd_configure_ac
===
RCS file: patches/patch-libs_tcpd_configure_ac
diff -N patches/patch-libs_tcpd_configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libs_tcpd_configure_ac19 Jul 2015 01:31:14 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/tcpd/configure.ac.origSat Jul 18 19:01:58 2015
libs/tcpd/configure.ac Sat Jul 18 19:03:20 2015
+@@ -507,7 +507,7 @@ RAND_pseudo_bytes(dummy, 1);
+ ]
+ )
+ LIBS="-lssl $LIBS"
+- AC_CHECK_FUNCS(TLSv1_1_method TLSv1_2_method)
++ AC_CHECK_FUNCS(SSLv3_method TLSv1_1_method TLSv1_2_method)
+ LIBS="$save_LIBS"
+
+ TLSLIBRARY="$LIBCOURIERTLSOPENSSL"
Index: patches/patch-libs_tcpd_libcouriertls_c
===
RCS file: patches/patch-libs_tcpd_libcouriertls_c
diff -N patches/patch-libs_tcpd_libcouriertls_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libs_tcpd_libcouriertls_c 19 Jul 2015 01:31:14 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- libs/tcpd/libcouriertls.c.orig Wed Oct 22 02:00:12 2014
libs/tcpd/libcouriertls.c Sat Jul 18 19:12:58 2015
+@@ -74,7 +74,9 @@ struct proto_ops op_list[] =
+ { "TLSv1", &TLSv1_method, SSL_OP_ALL },
+ { "TLS1", &TLSv1_method, SSL_OP_ALL },
+ { "SSL3+", &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2 },
++#ifdef HAVE_SSLV3_METHOD
+ { "SSL3", &SSLv3_method, SSL_OP_ALL },
++#endif
+ { "SSL23", &SSLv23_method, SSL_OP_ALL },
+ { "", &SSLv23_method,
SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
+ { NULL,&SSLv23_method,
SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
p5-Net-TCLink and SSLv3
This diff switches p5-Net-TCLink to using SSLv23_client_method().
I have no idea whether TrustedCommerce supports TLSv1+ since the default
host (used by the "test suite") is unreachable.
Does anyone still use this? (Chris?) If so, please say whether the
port is in a usable state.
Else I propose to just delete it.
Index: Makefile
===
RCS file: /cvs/ports/net/p5-Net-TCLink/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile16 Jul 2015 23:57:26 - 1.5
+++ Makefile18 Jul 2015 22:13:25 -
@@ -7,7 +7,7 @@ COMMENT=interface to TrustCommerce gat
MODULES= cpan
DISTNAME= Net_TCLink.pm-3.4
PKGNAME= p5-Net-TCLink-3.4
-REVISION= 2
+REVISION= 3
CATEGORIES=net
CPAN_AUTHOR= WITTEN
Index: patches/patch-tclink_c
===
RCS file: patches/patch-tclink_c
diff -N patches/patch-tclink_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tclink_c 18 Jul 2015 22:13:25 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- tclink.c.orig Sat Jul 18 12:50:03 2015
tclink.c Sat Jul 18 12:50:28 2015
+@@ -539,7 +539,7 @@ static int Connect(TCLinkCon *c, int host_hash)
+ {
+ do_SSL_randomize();/* handle systems without
/dev/urandom */
+ SSLeay_add_ssl_algorithms();
+- c->meth = SSLv3_client_method();
++ c->meth = SSLv23_client_method();
+ }
+
+ if (!c->ctx)
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: duplicity backup to hubic - bunch of new deps
viq writes: [...] >>> Maybe it would make sense then to have both 0.6 and 0.7 in the tree? >> >> >> 3 lines up from that.. >> >> The current stable release is 0.6.26, released May 6, 2015. > > Yes, and right below that it says: > The 0.6 series is in the process of being deprecated and the 0.6.26 > release is the last release of the series that will receive new > additions or enhancements. > > 0.6 is becoming deprecated. 0.6 doesn't support a backend I'd like to > use, 0.7 does. We have in ports postfix stable and snapshot. Maybe it > would make sense to have the same for duplicity then? If some people really need the devel version I don't see a reason not to do it. But the onus is upon the folks that want to use the devel version. In other words, you. ;) Would anyone object? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
delete security/py-sslwrapper
I have a local patch to fix it and update it to a newer upstream version. However it is clear that no one uses this since ages. OK to kill it? ritchie /usr/ports/security/py-sslwrapper$ python2.7 Python 2.7.10 (default, Jul 12 2015, 09:52:03) [GCC 4.2.1 20070719 ] on openbsd5 Type "help", "copyright", "credits" or "license" for more information. >>> import POW python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'EVP_rc5_32_12_16_ofb' python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'EVP_rc5_32_12_16_cfb' python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'EVP_rc5_32_12_16_cbc' python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'SSLv2_method' python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'SSLv2_client_method' python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'EVP_rc5_32_12_16_ecb' python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'SSLv2_server_method' python2.7:/usr/local/lib/python2.7/site-packages/POW.so: undefined symbol 'EVP_md2' Traceback (most recent call last): File "", line 1, in ImportError: Cannot load specified object >>> -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
telephony/kamailio and sslv3
Hi,
this patch will allow kamailio to build when SSLv3 support will be
removed from libressl. Same pattern as for SSLv2.
ok?
Index: Makefile
===
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile13 Sep 2014 18:09:22 - 1.30
+++ Makefile18 Jul 2015 18:45:38 -
@@ -16,6 +16,7 @@ PKGNAME-snmpstats = kamailio-snmpstats-$
PKGNAME-perl = kamailio-perl-${VERSION}
#PKGNAME-radius = kamailio-radius-${VERSION} TODO
+REVISION-main =0
REVISION-mysql = 2
CATEGORIES = telephony
Index: patches/patch-modules_tls_tls_init_c
===
RCS file: patches/patch-modules_tls_tls_init_c
diff -N patches/patch-modules_tls_tls_init_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_tls_tls_init_c18 Jul 2015 18:45:38 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- modules/tls/tls_init.c.origMon Mar 11 09:27:18 2013
modules/tls/tls_init.c Sat Jul 18 12:09:30 2015
+@@ -347,9 +347,11 @@ static void init_ssl_methods(void)
+ ssl_methods[TLS_USE_SSLv2 - 1] = SSLv2_method();
+ #endif
+
++#ifndef OPENSSL_NO_SSL3
+ ssl_methods[TLS_USE_SSLv3_cli - 1] = SSLv3_client_method();
+ ssl_methods[TLS_USE_SSLv3_srv - 1] = SSLv3_server_method();
+ ssl_methods[TLS_USE_SSLv3 - 1] = SSLv3_method();
++#endif
+
+ ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method();
+ ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update py-openssl to 0.14
Stuart Henderson writes: > This update to py-openssl requires py-cryptography which was imported > fairly recently. There are a couple of test failures, but they're the same > as with the in-tree version. Tested with yubiserve. > > - Support for TLSv1.1 and TLSv1.2 > - First-class support for PyPy > - New flags, such as MODE_RELEASE_BUFFERS and OP_NO_COMPRESSION > - Some APIs to access to the SSL session cache > - A variety of bug fixes for error handling cases > > (TLSv1.1/1.2 support is where you force a particular version; they > were already supported with the [misnamed] SSLv23 method). > > OK? Looks fine to me. [...] -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
devel/pudb: python3 flavor
Does this look correct?
Index: Makefile
===
RCS file: /cvs/ports/devel/pudb/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile18 Jul 2015 00:31:07 - 1.1.1.1
+++ Makefile18 Jul 2015 07:56:10 -
@@ -3,7 +3,9 @@
COMMENT = console-based visual debugger for Python
MODPY_EGG_VERSION =2015.3
+REVISION = 0
DISTNAME = pudb-${MODPY_EGG_VERSION}
+FULLPKGNAME = ${PKGNAME}${FLAVOR_EXT}
CATEGORIES = devel
@@ -16,9 +18,22 @@ MODULES =lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = devel/py-urwid>=1.1.1 \
- textproc/py-pygments
+RUN_DEPENDS = devel/py-urwid${MODPY_FLAVOR}>=1.1.1 \
+ textproc/py-pygments${MODPY_FLAVOR}
TEST_DEPENDS = ${RUN_DEPENDS}
+
+FLAVORS = python3
+FLAVOR ?=
+
+.if ${FLAVOR:Mpython3}
+CONFLICT_MARKER = pudb-*-python3
+.else
+CONFLICT_MARKER = pudb-*-!python3
+.endif
+
+PUDB_SCRIPT_NAME = pudb${MODPY_MAJOR_VERSION:S/2//}
+
+SUBST_VARS += CONFLICT_MARKER PUDB_SCRIPT_NAME
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pudb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Jul 2015 00:31:07 - 1.1.1.1
+++ pkg/PLIST 18 Jul 2015 07:56:10 -
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/07/18 00:31:07 jca Exp $
-bin/pudb
+@comment $OpenBSD$
+@option no-default-conflict
+@conflict ${CONFLICT_MARKER}
+bin/${PUDB_SCRIPT_NAME}
lib/python${MODPY_VERSION}/site-packages/pudb/
lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -9,30 +11,31 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pudb/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pudb/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/__main__.py
-lib/python${MODPY_VERSION}/site-packages/pudb/__main__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}b.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}debugger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ipython.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}lowlevel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}source_view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}theme.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ui_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}var_view.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pudb/b.py
-lib/python${MODPY_VERSION}/site-packages/pudb/b.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/debugger.py
-lib/python${MODPY_VERSION}/site-packages/pudb/debugger.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/ipython.py
-lib/python${MODPY_VERSION}/site-packages/pudb/ipython.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/lowlevel.py
-lib/python${MODPY_VERSION}/site-packages/pudb/lowlevel.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/py3compat.py
-lib/python${MODPY_VERSION}/site-packages/pudb/py3compat.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/run.py
-lib/python${MODPY_VERSION}/site-packages/pudb/run.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/settings.py
-lib/python${MODPY_VERSION}/site-packages/pudb/settings.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/shell.py
-lib/python${MODPY_VERSION}/site-packages/pudb/shell.pyc
lib/python${MODPY_VERSION}/site-packages/pudb/source_view.py
-lib/python${MODPY_VERSION}/site-packages/pudb/source_view.pyc
lib/python${MODPY
Re: [update] py-urwid -> 1.3.0 + python3
Antoine Jacoutot writes:
> On Fri, Jul 17, 2015 at 06:03:35PM -0600, Jérémie Courrèges-Anglas wrote:
>> j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
>>
>> > I'd need this for a new port, pudb (https://pypi.python.org/pypi/pudb).
>> > From 5 to 1 failure with ''make test''. License is actually LGPL (no
>> > version specified), and update HOMEPAGE while here. I'll probably add
>> > a python3 flavor in a separate diff.
>>
>> Update to 1.3.0 committed, here's the python3 diff if someone wants to
>> double check.
>
> main_loop.py uses GLib introspection; so you probably want to modify the
> TEST_DEPENDS line:
> removedevel/py-gobject
> add devel/py-gobject3${MODPY_FLAVOR}
Yup, I had planned to deal with test depends later. Thanks for looking
at it.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
