Re: change upstream for net/loudmouth

[Joerg Jung]

> On 04 Apr 2016, at 04:57, Michael McConville  wrote:
> 
> Michael McConville wrote:
>> We last updated net/loudmouth in 2008. Upstream is gone, and the
>> following depend on it:
>> 
>> o net/mcabber
>> o net/irssi-xmpp

irssi-xmpp is not yet ready for newer loudmouth:
https://github.com/cdidier/irssi-xmpp/issues/5

>> o net/freetalk
>> o lang/io (strangly)
>> 
>> I know that at least two of those are pretty common chat clients.
>> Because loudmouth is a network-exposed XMPP library, this is probably a
>> dangerous situation. The best solution is likely to switch to a
>> (somewhat) maintained fork from the mcabber people:
>> 
>> https://github.com/mcabber/loudmouth
>> 
>> Below is an initial patch for that. I haven't tested whether it works
>> with its dependencies yet - I thought I'd get a sanity check first.
>> 
>> A few things to note:
>> 
>> o I have to remove "include $(top_srcdir)/gtk-doc.make" from one of the
>>   Makefile.am's or the build fails
>> 
>> o Their means of checking for strndup(3) support didn't work, so I just
>>   removed their redefinition
>> 
>> o I don't entirely know what I'm doing with the autononsense, so there
>>   may be an easier way of dealing with it
> 
> If someone who actually uses loudmouth or something it depends on wants
> to adopt this patch, it'd be greatly appreciated.
> 
> If so, be sure to consider sthen and landry's comments.
> 
> Thanks,
> Mike
> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/net/loudmouth/Makefile,v
>> retrieving revision 1.25
>> diff -u -p -r1.25 Makefile
>> --- Makefile 21 Apr 2015 18:24:23 -  1.25
>> +++ Makefile 3 Mar 2016 00:09:35 -
>> @@ -2,13 +2,16 @@
>> 
>> COMMENT= lightweight Jabber client library
>> 
>> -V=  1.4.3
>> -DISTNAME=   loudmouth-$V
>> -REVISION=   6
>> +VERSION =   1.5.0
>> +DISTNAME =  loudmouth-${VERSION}
>> +
>> SHARED_LIBS +=   loudmouth-1  3.0  # .1.0
>> CATEGORIES=  net devel
>> 
>> -HOMEPAGE=   http://groups.google.com/group/loudmouth-dev/
>> +GH_ACCOUNT =mcabber
>> +GH_PROJECT =loudmouth
>> +
>> +DISTFILES = ${VERSION}${EXTRACT_SUFX}
>> 
>> # LGPLv2.1
>> PERMIT_PACKAGE_CDROM=Yes
>> @@ -17,18 +20,33 @@ WANTLIB += crypto glib-2.0 idn>=16 pcre 
>> 
>> MODULES= devel/gettext
>> 
>> -MASTER_SITES=   
>> ${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
>> -EXTRACT_SUFX=   .tar.bz2
>> -
>> LIB_DEPENDS= devel/glib2 \
>>  devel/libidn
>> -BUILD_DEPENDS=  ${TEST_DEPENDS}
>> -TEST_DEPENDS=   devel/check
>> 
>> -CONFIGURE_STYLE=gnu
>> +BUILD_DEPENDS = ${TEST_DEPENDS} \
>> +${MODGNU_AUTOCONF_DEPENDS} \
>> +${MODGNU_AUTOMAKE_DEPENDS} \
>> +devel/libtool
>> +
>> +TEST_DEPENDS =  devel/check
>> +
>> +CONFIGURE_STYLE =   autoconf automake gnu
>> +AUTOCONF_VERSION =  2.69
>> +AUTOMAKE_VERSION =  1.15
>> +# with-compile-warnings=yes prevents it from using -Werror
>> CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
>>  --disable-mono \
>>  --with-check=${LOCALBASE} \
>> +--with-compile-warnings=yes \
>>  --with-ssl=openssl
>> +
>> +AUTO_ENV =  AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
>> +AUTOCONF_VERSION=${AUTOCONF_VERSION}
>> +
>> +post-patch:
>> +cd ${WRKSRC}; ${AUTO_ENV} aclocal
>> +
>> +pre-configure:
>> +cd ${WRKSRC}; libtoolize && ${AUTO_ENV} automake --add-missing --foreign
>> 
>> .include 
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/net/loudmouth/distinfo,v
>> retrieving revision 1.6
>> diff -u -p -r1.6 distinfo
>> --- distinfo 18 Jan 2015 03:14:42 -  1.6
>> +++ distinfo 3 Mar 2016 00:09:35 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (loudmouth-1.4.3.tar.bz2) = 
>> lak/XQCbceqBk9mUqhHzEbwzCj7+G3zXTcSPEcf5KeM=
>> -SIZE (loudmouth-1.4.3.tar.bz2) = 366818
>> +SHA256 (1.5.0.tar.gz) = UUAxemOEUMl3pynexUW1lTjqSy5Rndcj07/aEsonhmU=
>> +SIZE (1.5.0.tar.gz) = 124001
>> Index: patches/patch-configure
>> ===
>> RCS file: patches/patch-configure
>> diff -N patches/patch-configure
>> --- patches/patch-configure  18 Nov 2008 11:41:23 -  1.3
>> +++ /dev/null1 Jan 1970 00:00:00 -
>> @@ -1,19 +0,0 @@
>> -$OpenBSD: patch-configure,v 1.3 2008/11/18 11:41:23 jasper Exp $
>>  configure.orig  Wed Oct 29 21:25:57 2008
>> -+++ configure   Tue Nov 18 12:33:20 2008
>> -@@ -21423,6 +21423,7 @@ cat >>conftest.$ac_ext <<_ACEOF
>> - 
>> - #include 
>> - #include 
>> -+#include 
>> - 
>> - #include 
>> - 
>> -@@ -21532,6 +21533,7 @@ cat >>conftest.$ac_ext <<_ACEOF
>> - 
>> - #include 

Re: change upstream for net/loudmouth

[Michael McConville]

Michael McConville wrote:
> We last updated net/loudmouth in 2008. Upstream is gone, and the
> following depend on it:
> 
>  o net/mcabber
>  o net/irssi-xmpp
>  o net/freetalk
>  o lang/io (strangly)
> 
> I know that at least two of those are pretty common chat clients.
> Because loudmouth is a network-exposed XMPP library, this is probably a
> dangerous situation. The best solution is likely to switch to a
> (somewhat) maintained fork from the mcabber people:
> 
> https://github.com/mcabber/loudmouth
> 
> Below is an initial patch for that. I haven't tested whether it works
> with its dependencies yet - I thought I'd get a sanity check first.
> 
> A few things to note:
> 
>  o I have to remove "include $(top_srcdir)/gtk-doc.make" from one of the
>Makefile.am's or the build fails
> 
>  o Their means of checking for strndup(3) support didn't work, so I just
>removed their redefinition
> 
>  o I don't entirely know what I'm doing with the autononsense, so there
>may be an easier way of dealing with it

If someone who actually uses loudmouth or something it depends on wants
to adopt this patch, it'd be greatly appreciated.

If so, be sure to consider sthen and landry's comments.

Thanks,
Mike

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/loudmouth/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile  21 Apr 2015 18:24:23 -  1.25
> +++ Makefile  3 Mar 2016 00:09:35 -
> @@ -2,13 +2,16 @@
>  
>  COMMENT= lightweight Jabber client library
>  
> -V=   1.4.3
> -DISTNAME=loudmouth-$V
> -REVISION=6
> +VERSION =1.5.0
> +DISTNAME =   loudmouth-${VERSION}
> +
>  SHARED_LIBS +=   loudmouth-1  3.0  # .1.0
>  CATEGORIES=  net devel
>  
> -HOMEPAGE=http://groups.google.com/group/loudmouth-dev/
> +GH_ACCOUNT = mcabber
> +GH_PROJECT = loudmouth
> +
> +DISTFILES =  ${VERSION}${EXTRACT_SUFX}
>  
>  # LGPLv2.1
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -17,18 +20,33 @@ WANTLIB += crypto glib-2.0 idn>=16 pcre 
>  
>  MODULES= devel/gettext
>  
> -MASTER_SITES=
> ${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
> -EXTRACT_SUFX=.tar.bz2
> -
>  LIB_DEPENDS= devel/glib2 \
>   devel/libidn
> -BUILD_DEPENDS=   ${TEST_DEPENDS}
> -TEST_DEPENDS=devel/check
>  
> -CONFIGURE_STYLE= gnu
> +BUILD_DEPENDS =  ${TEST_DEPENDS} \
> + ${MODGNU_AUTOCONF_DEPENDS} \
> + ${MODGNU_AUTOMAKE_DEPENDS} \
> + devel/libtool
> +
> +TEST_DEPENDS =   devel/check
> +
> +CONFIGURE_STYLE =autoconf automake gnu
> +AUTOCONF_VERSION =   2.69
> +AUTOMAKE_VERSION =   1.15
> +# with-compile-warnings=yes prevents it from using -Werror
>  CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
>   --disable-mono \
>   --with-check=${LOCALBASE} \
> + --with-compile-warnings=yes \
>   --with-ssl=openssl
> +
> +AUTO_ENV =   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> + AUTOCONF_VERSION=${AUTOCONF_VERSION}
> +
> +post-patch:
> + cd ${WRKSRC}; ${AUTO_ENV} aclocal
> +
> +pre-configure:
> + cd ${WRKSRC}; libtoolize && ${AUTO_ENV} automake --add-missing --foreign
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/loudmouth/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  18 Jan 2015 03:14:42 -  1.6
> +++ distinfo  3 Mar 2016 00:09:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (loudmouth-1.4.3.tar.bz2) = 
> lak/XQCbceqBk9mUqhHzEbwzCj7+G3zXTcSPEcf5KeM=
> -SIZE (loudmouth-1.4.3.tar.bz2) = 366818
> +SHA256 (1.5.0.tar.gz) = UUAxemOEUMl3pynexUW1lTjqSy5Rndcj07/aEsonhmU=
> +SIZE (1.5.0.tar.gz) = 124001
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure   18 Nov 2008 11:41:23 -  1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-configure,v 1.3 2008/11/18 11:41:23 jasper Exp $
>  configure.orig   Wed Oct 29 21:25:57 2008
> -+++ configureTue Nov 18 12:33:20 2008
> -@@ -21423,6 +21423,7 @@ cat >>conftest.$ac_ext <<_ACEOF
> - 
> - #include 
> - #include 
> -+#include 
> - 
> - #include 
> - 
> -@@ -21532,6 +21533,7 @@ cat >>conftest.$ac_ext <<_ACEOF
> - 
> - #include 
> - #include 
> -+#include 
> - 
> - #include 
> - 
> Index: patches/patch-docs_reference_Makefile_am
> ===
> RCS file: patches/patch-docs_reference_Makefile_am
> diff -N patches/patch-docs_reference_Makefile_am
> --- 

Re: change upstream for net/loudmouth

[Landry Breuil]

On Wed, Mar 02, 2016 at 07:21:33PM -0500, Michael McConville wrote:
> We last updated net/loudmouth in 2008. Upstream is gone, and the
> following depend on it:
> 
>  o net/mcabber
>  o net/irssi-xmpp
>  o net/freetalk
>  o lang/io (strangly)
> 
> I know that at least two of those are pretty common chat clients.
> Because loudmouth is a network-exposed XMPP library, this is probably a
> dangerous situation. The best solution is likely to switch to a
> (somewhat) maintained fork from the mcabber people:
> 
> https://github.com/mcabber/loudmouth
> 
> Below is an initial patch for that. I haven't tested whether it works
> with its dependencies yet - I thought I'd get a sanity check first.
> 
> A few things to note:
> 
>  o I have to remove "include $(top_srcdir)/gtk-doc.make" from one of the
>Makefile.am's or the build fails

Is this file present in the tarball ? I suppose that'd be a link created
by autohell otherwise, what if you add textproc/gtk-doc (which provides
this file) to BUILD_DEPENDS ?

Landry

Re: change upstream for net/loudmouth

[Stuart Henderson]

On 2016/03/02 19:21, Michael McConville wrote:
> -V=   1.4.3
> -DISTNAME=loudmouth-$V
> -REVISION=6
> +VERSION =1.5.0
> +DISTNAME =   loudmouth-${VERSION}
> +
>  SHARED_LIBS +=   loudmouth-1  3.0  # .1.0
>  CATEGORIES=  net devel
>  
> -HOMEPAGE=http://groups.google.com/group/loudmouth-dev/
> +GH_ACCOUNT = mcabber
> +GH_PROJECT = loudmouth
> +
> +DISTFILES =  ${VERSION}${EXTRACT_SUFX}

If you're using the GH_* things, you need GH_ACCOUNT, GH_PROJECT and
one (but not both) of GH_COMMIT or GH_TAGNAME.

In this case you want a tagged release, and the defaults implied by GH_*
are ok for the other bits of this, so remove VERSION DISTNAME DISTFILES
and use these below COMMENT:

GH_ACCOUNT =mcabber
GH_PROJECT =loudmouth
GH_TAGNAME =1.5.0

(actually there is a 1.5.3 now)

This is briefly shown in current versions of Makefile.template.

> +BUILD_DEPENDS =  ${TEST_DEPENDS} \
> + ${MODGNU_AUTOCONF_DEPENDS} \
> + ${MODGNU_AUTOMAKE_DEPENDS} \
> + devel/libtool

yep.

> +CONFIGURE_STYLE =autoconf automake gnu
> +AUTOCONF_VERSION =   2.69
> +AUTOMAKE_VERSION =   1.15
..
> +AUTO_ENV =   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> + AUTOCONF_VERSION=${AUTOCONF_VERSION}
> +
> +post-patch:
> + cd ${WRKSRC}; ${AUTO_ENV} aclocal
> +
> +pre-configure:
> + cd ${WRKSRC}; libtoolize && ${AUTO_ENV} automake --add-missing --foreign

They have an autogen.sh script so it's probably better to use it.
I would do it like this: (note: untested)

CONFIGURE_STYLE = gnu
AUTOCONF_VERSION =   2.69
AUTOMAKE_VERSION =   1.15

post-patch:
cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} sh autogen.sh

Doesn't apply in this case but some of them run ./configure at the
end, patch it away if they do.

> --- distinfo  18 Jan 2015 03:14:42 -  1.6
> +++ distinfo  3 Mar 2016 00:09:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (loudmouth-1.4.3.tar.bz2) = 
> lak/XQCbceqBk9mUqhHzEbwzCj7+G3zXTcSPEcf5KeM=
> -SIZE (loudmouth-1.4.3.tar.bz2) = 366818
> +SHA256 (1.5.0.tar.gz) = UUAxemOEUMl3pynexUW1lTjqSy5Rndcj07/aEsonhmU=
> +SIZE (1.5.0.tar.gz) = 124001

Covered by the above GH_foo changes, but note that this has to go
in a directory with ~8000 other files, 1.5.0.tar.gz isn't a usable
name.

I haven't looked at the patches.

change upstream for net/loudmouth

[Michael McConville]

We last updated net/loudmouth in 2008. Upstream is gone, and the
following depend on it:

 o net/mcabber
 o net/irssi-xmpp
 o net/freetalk
 o lang/io (strangly)

I know that at least two of those are pretty common chat clients.
Because loudmouth is a network-exposed XMPP library, this is probably a
dangerous situation. The best solution is likely to switch to a
(somewhat) maintained fork from the mcabber people:

https://github.com/mcabber/loudmouth

Below is an initial patch for that. I haven't tested whether it works
with its dependencies yet - I thought I'd get a sanity check first.

A few things to note:

 o I have to remove "include $(top_srcdir)/gtk-doc.make" from one of the
   Makefile.am's or the build fails

 o Their means of checking for strndup(3) support didn't work, so I just
   removed their redefinition

 o I don't entirely know what I'm doing with the autononsense, so there
   may be an easier way of dealing with it


Index: Makefile
===
RCS file: /cvs/ports/net/loudmouth/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile21 Apr 2015 18:24:23 -  1.25
+++ Makefile3 Mar 2016 00:09:35 -
@@ -2,13 +2,16 @@
 
 COMMENT=   lightweight Jabber client library
 
-V= 1.4.3
-DISTNAME=  loudmouth-$V
-REVISION=  6
+VERSION =  1.5.0
+DISTNAME = loudmouth-${VERSION}
+
 SHARED_LIBS += loudmouth-1  3.0  # .1.0
 CATEGORIES=net devel
 
-HOMEPAGE=  http://groups.google.com/group/loudmouth-dev/
+GH_ACCOUNT =   mcabber
+GH_PROJECT =   loudmouth
+
+DISTFILES =${VERSION}${EXTRACT_SUFX}
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
@@ -17,18 +20,33 @@ WANTLIB += crypto glib-2.0 idn>=16 pcre 
 
 MODULES=   devel/gettext
 
-MASTER_SITES=  
${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
-EXTRACT_SUFX=  .tar.bz2
-
 LIB_DEPENDS=   devel/glib2 \
devel/libidn
-BUILD_DEPENDS= ${TEST_DEPENDS}
-TEST_DEPENDS=  devel/check
 
-CONFIGURE_STYLE=   gnu
+BUILD_DEPENDS =${TEST_DEPENDS} \
+   ${MODGNU_AUTOCONF_DEPENDS} \
+   ${MODGNU_AUTOMAKE_DEPENDS} \
+   devel/libtool
+
+TEST_DEPENDS = devel/check
+
+CONFIGURE_STYLE =  autoconf automake gnu
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
+# with-compile-warnings=yes prevents it from using -Werror
 CONFIGURE_ARGS+=   ${CONFIGURE_SHARED} \
--disable-mono \
--with-check=${LOCALBASE} \
+   --with-compile-warnings=yes \
--with-ssl=openssl
+
+AUTO_ENV = AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+   AUTOCONF_VERSION=${AUTOCONF_VERSION}
+
+post-patch:
+   cd ${WRKSRC}; ${AUTO_ENV} aclocal
+
+pre-configure:
+   cd ${WRKSRC}; libtoolize && ${AUTO_ENV} automake --add-missing --foreign
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/loudmouth/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:14:42 -  1.6
+++ distinfo3 Mar 2016 00:09:35 -
@@ -1,2 +1,2 @@
-SHA256 (loudmouth-1.4.3.tar.bz2) = lak/XQCbceqBk9mUqhHzEbwzCj7+G3zXTcSPEcf5KeM=
-SIZE (loudmouth-1.4.3.tar.bz2) = 366818
+SHA256 (1.5.0.tar.gz) = UUAxemOEUMl3pynexUW1lTjqSy5Rndcj07/aEsonhmU=
+SIZE (1.5.0.tar.gz) = 124001
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 18 Nov 2008 11:41:23 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2008/11/18 11:41:23 jasper Exp $
 configure.orig Wed Oct 29 21:25:57 2008
-+++ configure  Tue Nov 18 12:33:20 2008
-@@ -21423,6 +21423,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- 
- #include 
- #include 
-+#include 
- 
- #include 
- 
-@@ -21532,6 +21533,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- 
- #include 
- #include 
-+#include 
- 
- #include 
- 
Index: patches/patch-docs_reference_Makefile_am
===
RCS file: patches/patch-docs_reference_Makefile_am
diff -N patches/patch-docs_reference_Makefile_am
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-docs_reference_Makefile_am3 Mar 2016 00:09:35 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- docs/reference/Makefile.am.origWed Mar  2 14:22:02 2016
 docs/reference/Makefile.am Wed Mar  2 14:22:25 2016
+@@ -80,9 +80,6 @@ GTKDOC_LIBS= \
+   $(top_builddir)/loudmouth/libloudmouth.la
+ 
+ 
+-# This includes the standard gtk-doc make rules, copied by