On Fri, Sep 30, 2016 at 12:30:40AM +0100, Stuart Henderson wrote: > On 2016/09/29 21:58, Rafael Sadowski wrote: > > Hi @ports, > > > > the diff below updates libstrophe to the latest stable version 0.9.1. > > Tested with new profanity (separate diff) on amd64 over days without > > problems. All ports regression tests are positive. > > > > Ports-wise this is better:
Yes, this looks cleaner. Tests pass and works fine with the WIP profanity. As soon as that is ready, this is ok tb@ > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/libstrophe/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 25 Apr 2016 17:43:39 -0000 1.1.1.1 > +++ Makefile 29 Sep 2016 23:29:35 -0000 > @@ -1,20 +1,21 @@ > # $OpenBSD: Makefile,v 1.1.1.1 2016/04/25 17:43:39 tb Exp $ > > COMMENT = simple, lightweight XMPP C library > -DISTNAME = libstrophe-0.8.8 > + > +GH_ACCOUNT = strophe > +GH_PROJECT = libstrophe > +GH_TAGNAME = 0.9.1 > + > +SHARED_LIBS = strophe 1.0 # 1.0 > + > CATEGORIES = net devel > > HOMEPAGE = http://strophe.im/libstrophe/ > + > MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org> > > # Dual licensed: MIT and GPLv3 > PERMIT_PACKAGE_CDROM = Yes > - > -GH_ACCOUNT = strophe > -GH_PROJECT = libstrophe > -GH_COMMIT = cd92f69c76cdb93e73e8d15c3634d1b5a9eeea57 > - > -SHARED_LIBS = strophe 0.0 # 0.0 > > WANTLIB += crypto expat ssl > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/libstrophe/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 25 Apr 2016 17:43:39 -0000 1.1.1.1 > +++ distinfo 29 Sep 2016 23:29:35 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (libstrophe-0.8.8.tar.gz) = > ngwGRZfKUP8wiame97efH6bJom+EB1O66zw90PYEuic= > -SIZE (libstrophe-0.8.8.tar.gz) = 128539 > +SHA256 (libstrophe-0.9.1.tar.gz) = > yQST+YblvUBxMsWj4XQ3jALLgPpOruKYdeBrS7pq/MM= > +SIZE (libstrophe-0.9.1.tar.gz) = 153142 > Index: patches/patch-Makefile_am > =================================================================== > RCS file: patches/patch-Makefile_am > diff -N patches/patch-Makefile_am > --- patches/patch-Makefile_am 25 Apr 2016 17:43:39 -0000 1.1.1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,38 +0,0 @@ > -$OpenBSD: patch-Makefile_am,v 1.1.1.1 2016/04/25 17:43:39 tb Exp $ > - > -remove thread.{c,h} discussed on > -https://github.com/strophe/libstrophe/pull/72 > - > - > ---- Makefile.am.orig Tue Aug 18 23:07:06 2015 > -+++ Makefile.am Sun Dec 20 14:39:41 2015 > -@@ -22,10 +22,10 @@ libstrophe_la_LDFLAGS += -export-symbols-regex '^xmpp_ > - libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \ > - src/event.c src/handler.c src/hash.c \ > - src/jid.c src/md5.c src/sasl.c src/scram.c src/sha1.c \ > -- src/snprintf.c src/sock.c src/stanza.c src/thread.c \ > -+ src/snprintf.c src/sock.c src/stanza.c \ > - src/tls_openssl.c src/util.c \ > - src/common.h src/hash.h src/md5.h src/ostypes.h src/parser.h \ > -- src/sasl.h src/scram.h src/sha1.h src/sock.h src/thread.h src/tls.h \ > -+ src/sasl.h src/scram.h src/sha1.h src/sock.h src/tls.h \ > - src/util.h > - > - if PARSER_EXPAT > -@@ -45,13 +45,13 @@ EXTRA_DIST = docs > - noinst_PROGRAMS = examples/active examples/roster examples/basic > examples/bot examples/component > - examples_active_SOURCES = examples/active.c > - examples_active_CFLAGS = $(STROPHE_FLAGS) > --examples_active_LDADD = $(STROPHE_LIBS) > -+examples_active_LDADD = $(STROPHE_LIBS) > - examples_roster_SOURCES = examples/roster.c > - examples_roster_CFLAGS = $(STROPHE_FLAGS) > --examples_roster_LDADD = $(STROPHE_LIBS) > -+examples_roster_LDADD = $(STROPHE_LIBS) > - examples_basic_SOURCES = examples/basic.c > - examples_basic_CFLAGS = $(STROPHE_FLAGS) > --examples_basic_LDADD = $(STROPHE_LIBS) > -+examples_basic_LDADD = $(STROPHE_LIBS) > - examples_bot_SOURCES = examples/bot.c > - examples_bot_CFLAGS = $(STROPHE_FLAGS) > - examples_bot_LDADD = $(STROPHE_LIBS) > Index: patches/patch-configure_ac > =================================================================== > RCS file: patches/patch-configure_ac > diff -N patches/patch-configure_ac > --- patches/patch-configure_ac 25 Apr 2016 17:43:39 -0000 1.1.1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,91 +0,0 @@ > -$OpenBSD: patch-configure_ac,v 1.1.1.1 2016/04/25 17:43:39 tb Exp $ > ---- configure.ac.orig Tue Aug 18 23:07:06 2015 > -+++ configure.ac Sun Dec 20 15:25:11 2015 > -@@ -10,13 +10,14 @@ PKG_PROG_PKG_CONFIG > - AC_CANONICAL_HOST > - AS_CASE([$host_os], > - [freebsd*], [PLATFORM="freebsd"], > -+ [openbsd*], [PLATFORM="openbsd"], > - [PLATFORM="nix"]) > - > --PKG_CHECK_MODULES([openssl], [openssl], [PC_REQUIRES+=(openssl)], > -+PKG_CHECK_MODULES([openssl], [openssl], [PC_REQUIRES="openssl > ${PC_REQUIRES}"], > - [AC_CHECK_HEADER([openssl/ssl.h], > - [ > - openssl_LIBS="-lssl -lcrypto" > -- PC_LIBS+=($openssl_LIBS) > -+ PC_LIBS="${openssl_LIBS} ${PC_LIBS}" > - ], > - [AC_MSG_ERROR([openssl not found; openssl > required])] > - )]) > -@@ -32,7 +33,7 @@ if test "x$with_libxml2" != xno; then > - PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7], > - [ > - with_libxml2=yes > -- PC_REQUIRES+=(libxml-2.0) > -+ PC_REQUIRES="libxml-2.0 ${PC_REQUIRES}" > - ], > - [ > - old_CFLAGS=$CFLAGS > -@@ -42,19 +43,19 @@ if test "x$with_libxml2" != xno; then > - with_libxml2=yes > - > libxml2_CFLAGS="-I${includedir}/libxml2" > - libxml2_LIBS="-lxml2" > -- PC_LIBS+=($libxml2_LIBS) > -- PC_CFLAGS+=($libxml2_CFLAGS) > -+ PC_LIBS="${libxml2_LIBS} ${PC_LIBS}" > -+ PC_CFLAGS="${libxml2_CFLAGS} > ${PC_CFLAGS}" > - ], > - [AC_MSG_ERROR([libxml2 not found.])]) > - CFLAGS=$old_CFLAGS > - ]) > - else > - PKG_CHECK_MODULES([expat], [expat >= 2.0.0], > -- [PC_REQUIRES+=(expat)], > -+ [PC_REQUIRES="expat ${PC_REQUIRES} "], > - [AC_CHECK_HEADER([expat.h], > - [ > - expat_LIBS="-lexpat" > -- PC_LIBS+=($expat_LIBS) > -+ PC_LIBS="${expat_LIBS} ${PC_LIBS}" > - ], > - [AC_MSG_ERROR([expat not found; expat > required.])] > - ) > -@@ -76,15 +77,18 @@ fi > - AC_MSG_NOTICE([libstrophe will use the $with_parser XML parser]) > - AC_SEARCH_LIBS([socket], [socket]) > - > --if test "x$PLATFORM" != xfreebsd; then > -- AC_CHECK_LIB([resolv], [res_query], [], > -+ > -+AS_IF([test "x$PLATFORM" = xfreebsd], > -+ AC_MSG_NOTICE([skipping libresolv checks for freebsd]), > -+ [test "x$PLATFORM" = xopenbsd], > -+ AC_MSG_NOTICE([skipping libresolv checks for openbsd]), > -+ [test "x$PLATFORM" = xnix], > -+ [AC_CHECK_LIB([resolv], [res_query], [], > - [AC_CHECK_LIB([resolv], [__res_query], [], > - [AC_MSG_ERROR([libresolv not found; libresolv > required.])])]) > -- PC_LIBS+=(-lresolv) > --else > -- AC_MSG_NOTICE([skipping libresolv checks for freebsd]) > --fi > -+ PC_LIBS="-lresolv ${PC_LIBS}"]) > - > -+ > - AC_CHECK_HEADERS([arpa/nameser_compat.h]) > - > - > -@@ -97,9 +101,9 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], > - > - AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2]) > - > --AC_SUBST([PC_REQUIRES], [${PC_REQUIRES[[@]]}]) > --AC_SUBST([PC_CFLAGS], [${PC_CFLAGS[[@]]}]) > --AC_SUBST([PC_LIBS], [${PC_LIBS[[@]]}]) > -+AC_SUBST([PC_REQUIRES], [${PC_REQUIRES}]) > -+AC_SUBST([PC_CFLAGS], [${PC_CFLAGS}]) > -+AC_SUBST([PC_LIBS], [${PC_LIBS}]) > - > - AC_SUBST(PARSER_NAME) > - AC_SUBST(PARSER_CFLAGS) >
