Re: poison gettext-tools
On 2016/10/17 17:54, Antoine Jacoutot wrote: > On Mon, Oct 17, 2016 at 04:03:16PM +0100, Stuart Henderson wrote: > > On 2016/10/17 16:41, Antoine Jacoutot wrote: > > > On Mon, Oct 17, 2016 at 03:20:37PM +0100, Stuart Henderson wrote: > > > > On 2016/10/17 13:49, Jeremie Courreges-Anglas wrote: > > > > > Stuart Henderson writes: > > > > > > > > > > > I'm going to do a bulk build with this to see if it shakes anything > > > > > > out. > > > > > > Any comments on whether it's worth committing? > > > > > > > > > > I like the idea, but it currently doesn't behave as one would expect. > > > > > See for example x11/xpad, which has > > > > > > > > > > MODULES=textproc/intltool > > > > > > > > > > The patch shouldn't change anything since intltool brings in > > > > > gettext-tools, but: > > > > > > > > Thanks - Antoine pointed out that this will apply to GNOME as well. > > > > > > > > We could check for multiple alternative ports in BUILD_DEPENDS, but > > > > this wouldn't fit nicely with Marc's suggestion to make the framework > > > > more general, so how about adding gettext-tools to intltool.port.mk? > > > > > > If there is no other way... > > > > The two options are > > > > +.if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:Mdevel/gettext-tools} && \ > > + !${BUILD_DEPENDS:Mtextproc/intltool} > > This has my vote. > Less magic imho. So, this has survived a dpb run (actually several runs as I had temporarily forgotten about it) - OK? Index: bsd.port.mk === RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v retrieving revision 1.1322 diff -u -p -r1.1322 bsd.port.mk --- bsd.port.mk 6 Sep 2016 10:31:12 - 1.1322 +++ bsd.port.mk 18 Oct 2016 13:56:03 - @@ -2469,6 +2469,17 @@ ${_WRKDIR_COOKIE}: .if !empty(WRKDIR_LINKNAME) @ln -sf ${WRKDIR} ${.CURDIR}/${WRKDIR_LINKNAME} .endif +# poison some common gettext-tools binaries +.if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:Mdevel/gettext-tools} && \ + !${BUILD_DEPENDS:M*textproc/intltool} + printf '#!/bin/sh\n\ + echo "*** $$0 was called without gettext-tools dependency ***" >&2\n\ + exit 1\n' > ${WRKDIR}/bin/msgfmt + chmod 555 ${WRKDIR}/bin/msgfmt +. for name in msgcat msginit + @ln -sf msgfmt ${WRKDIR}/bin/${name} +. endfor +.endif @${_MAKE_COOKIE} $@ ${_EXTRACT_COOKIE}: ${_WRKDIR_COOKIE}
building curl with gssapi disables ssl
Hi, after openldap got gssapi flavor I've decided to try gssapi for our curl as I would benefit from it everyday at work. But configuring curl with gssapi it does by some miracle disables ssl :/ Any idea? (Building curl without gssapi of course keeps ssl option enabled.) j. Index: Makefile === RCS file: /cvs/ports/net/curl/Makefile,v retrieving revision 1.120 diff -u -p -r1.120 Makefile --- Makefile17 Sep 2016 19:34:35 - 1.120 +++ Makefile27 Oct 2016 11:49:22 - @@ -37,6 +37,16 @@ CONFIGURE_ENV+= \ curl_cv_func_send_args="int,const void *,size_t,int,ssize_t" \ curl_cv_func_getnameinfo_args="const struct sockaddr *,socklen_t,size_t,int" +FLAVOR ?= +FLAVORS = gssapi + +.if ${FLAVOR:Mgssapi} +CONFIGURE_ARGS += --with-ssl --with-gssapi=${LOCALBASE}/heimdal +WANTLIB += ${MODHEIMDAL_WANTLIB} +LIB_DEPENDS += ${MODHEIMDAL_LIB_DEPENDS} +MODULES += security/heimdal +.endif + # Note: # use ulimit -p 256 for test ===> curl-7.50.3-gssapi depends on: xz-* -> xz-5.2.2p0 ===> curl-7.50.3-gssapi depends on: gettext-* -> gettext-0.19.8.1 ===> curl-7.50.3-gssapi depends on: libidn-* -> libidn-1.33 ===> curl-7.50.3-gssapi depends on: nghttp2-* -> nghttp2-1.16.0 ===> curl-7.50.3-gssapi depends on: heimdal-libs-* -> heimdal-libs-1.5.3p0 ===> Verifying specs: c crypto iconv idn intl nghttp2 ssl z heimdal/lib/asn1 heimdal/lib/heimbase heimdal/lib/hx509 heimdal/lib/krb5 heimdal/lib/roken heimdal/lib/wind heimdal/lib/asn1 heimdal/lib/heimbase heimdal/lib/hx509 heimdal/lib/krb5 heimdal/lib/roken heimdal/lib/wind ===> found c.89.2 crypto.38.1 iconv.6.0 idn.17.2 intl.6.0 nghttp2.0.9 ssl.39.1 z.5.0 heimdal/lib/asn1.21.1 heimdal/lib/heimbase.1.1 heimdal/lib/hx509.0.1 heimdal/lib/krb5.21.1 heimdal/lib/roken.2.1 heimdal/lib/wind.2.1 ===> Checking files for curl-7.50.3-gssapi `/home/jirib/cvs/openbsd-ports/distfiles/curl-7.50.3.tar.lzma' is up to date. >> (SHA256) curl-7.50.3.tar.lzma: OK ===> Extracting for curl-7.50.3-gssapi ===> Patching for curl-7.50.3-gssapi ===> Configuring for curl-7.50.3-gssapi Using /home/jirib/openbsd/pobj/curl-7.50.3-gssapi/config.site (generated) configure: loading site script /home/jirib/openbsd/pobj/curl-7.50.3-gssapi/config.site checking whether to enable maintainer-specific portions of Makefiles... no checking whether make supports nested variables... yes checking whether to enable debug build options... no checking whether to enable compiler optimizer... (assumed) yes checking whether to enable strict compiler warnings... no checking whether to enable compiler warnings as errors... no checking whether to enable curl debug memory tracking... no checking whether to enable hiding of library internal symbols... yes checking whether to enable c-ares for DNS lookups... no checking whether to disable dependency on -lrt... (assumed no) checking for path separator... : checking for grep... (cached) /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for ar... /usr/bin/ar checking for a BSD-compatible install... /home/jirib/openbsd/pobj/curl-7.50.3-gssapi/bin/install -c 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 how to run the C preprocessor... cc -E 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 for style of include used by make... GNU checking dependency style of cc... gcc3 checking curl version... 7.50.3 checking build system type... x86_64-unknown-openbsd6.0 checking host system type... x86_64-unknown-openbsd6.0 checking for sys/types.h... (cached) yes checking for stdint.h... (cached) yes checking for inttypes.h... (cached) yes checking for grep that handles long lines and -e... (cached) /usr/bin/grep checking for egrep... (cached) /usr/bin/egrep 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 if cpp -P is needed... no checking size of long... 8 checking size of void*... 8 checking for 64-bit curl_off_t data type... long checking size of curl_off_t... 8 checking formatting string directive for curl_off_t... "ld" checking form
[Bugfix] PostgreSQL 9.5.5 (current/stable)
Hi, A new minor release of PostgreSQL is out. Changelog here: https://www.postgresql.org/docs/9.5/static/release-9-5-5.html Mostly bugfixes but upgrade is required to avoid the Wal-logging problem. Tested on @amd64. Comments, ok ? Regards, Index: Makefile === RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.218 diff -u -p -u -p -r1.218 Makefile --- Makefile 10 Sep 2016 13:03:41 - 1.218 +++ Makefile 27 Oct 2016 14:52:16 - @@ -9,18 +9,13 @@ COMMENT-plpython=Python procedural langu # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server # in case a dump before / restore after pkg_add -u is required! -VERSION= 9.5.4 +VERSION= 9.5.5 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} PKGNAME-server= postgresql-server-${VERSION} PKGNAME-docs= postgresql-docs-${VERSION} PKGNAME-contrib=postgresql-contrib-${VERSION} PKGNAME-plpython=postgresql-plpython-${VERSION} -REVISION-contrib= 0 -REVISION-docs= 0 -REVISION-main= 0 -REVISION-plpython= 0 -REVISION-server=0 CATEGORIES= databases SHARED_LIBS= ecpg 7.7 \ Index: distinfo === RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.63 diff -u -p -u -p -r1.63 distinfo --- distinfo 17 Aug 2016 09:43:46 - 1.63 +++ distinfo 27 Oct 2016 14:52:16 - @@ -1,2 +1,2 @@ -SHA256 (postgresql-9.5.4.tar.gz) = McKqi23g52egR6WFo97HYrEFHQBBUlSX3RV5ulqGHmg= -SIZE (postgresql-9.5.4.tar.gz) = 24139834 +SHA256 (postgresql-9.5.5.tar.gz) = mZ+pKe95/Rns/PFdFohYQW6psZ88G7lCggSC3obhCSQ= +SIZE (postgresql-9.5.5.tar.gz) = 24194032 Index: pkg/PLIST-docs === RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v retrieving revision 1.75 diff -u -p -u -p -r1.75 PLIST-docs --- pkg/PLIST-docs 17 Aug 2016 09:43:46 - 1.75 +++ pkg/PLIST-docs 27 Oct 2016 14:52:16 - @@ -866,6 +866,7 @@ share/doc/postgresql/html/release-9-1-20 share/doc/postgresql/html/release-9-1-21.html share/doc/postgresql/html/release-9-1-22.html share/doc/postgresql/html/release-9-1-23.html +share/doc/postgresql/html/release-9-1-24.html share/doc/postgresql/html/release-9-1-3.html share/doc/postgresql/html/release-9-1-4.html share/doc/postgresql/html/release-9-1-5.html @@ -884,6 +885,7 @@ share/doc/postgresql/html/release-9-2-15 share/doc/postgresql/html/release-9-2-16.html share/doc/postgresql/html/release-9-2-17.html share/doc/postgresql/html/release-9-2-18.html +share/doc/postgresql/html/release-9-2-19.html share/doc/postgresql/html/release-9-2-2.html share/doc/postgresql/html/release-9-2-3.html share/doc/postgresql/html/release-9-2-4.html @@ -899,6 +901,7 @@ share/doc/postgresql/html/release-9-3-11 share/doc/postgresql/html/release-9-3-12.html share/doc/postgresql/html/release-9-3-13.html share/doc/postgresql/html/release-9-3-14.html +share/doc/postgresql/html/release-9-3-15.html share/doc/postgresql/html/release-9-3-2.html share/doc/postgresql/html/release-9-3-3.html share/doc/postgresql/html/release-9-3-4.html @@ -909,6 +912,7 @@ share/doc/postgresql/html/release-9-3-8. share/doc/postgresql/html/release-9-3-9.html share/doc/postgresql/html/release-9-3.html share/doc/postgresql/html/release-9-4-1.html +share/doc/postgresql/html/release-9-4-10.html share/doc/postgresql/html/release-9-4-2.html share/doc/postgresql/html/release-9-4-3.html share/doc/postgresql/html/release-9-4-4.html @@ -922,6 +926,7 @@ share/doc/postgresql/html/release-9-5-1. share/doc/postgresql/html/release-9-5-2.html share/doc/postgresql/html/release-9-5-3.html share/doc/postgresql/html/release-9-5-4.html +share/doc/postgresql/html/release-9-5-5.html share/doc/postgresql/html/release-9-5.html share/doc/postgresql/html/release.html share/doc/postgresql/html/replication-origins.html Index: Makefile === RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.215.2.1 diff -u -p -u -p -r1.215.2.1 Makefile --- Makefile 19 Aug 2016 11:41:39 - 1.215.2.1 +++ Makefile 27 Oct 2016 15:14:01 - @@ -11,7 +11,7 @@ BROKEN-sparc= Requires v9|v9a|v9b; reque # DO NOT FORGET to also change the @ask-update entry in pkg/PLIST-server # in case a dump before / restore after pkg_add -u is required! -VERSION= 9.5.4 +VERSION= 9.5.5 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} PKGNAME-server= postgresql-server-${VERSION} Index: distinfo === RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.62.2.1 diff -u -p -u -p -r1.62.2.1 distinfo --- distinfo 19 Aug 2016 11:41:39 - 1.62.2.1 +++ distinfo 27 Oct 2016 15:14:01 - @@ -1,2 +1,2 @@ -SHA256 (postgresql-9.5.4.tar.gz) = McKqi23g52egR6WFo97HYrEFHQBBUlSX3RV5ulqGHmg= -SIZE (postgresql-
Re: building curl with gssapi disables ssl
> SSL support: no > (--with-{ssl,gnutls,nss,polarssl,mbedtls,cyassl,axtls,winssl,darwinssl} ) Have you tried adding "--with-ssl" to CONFIGURE_ARGS? - William