Re: [UPDATE] net/bitlbee-facebook 1.2.1p0 -> 1.2.2

[Stuart Henderson]

Thanks, committed.

On 2021/03/20 19:30, Eivind Eide wrote:
> Bumping this as I would like to see bitlbee-facebook updated to the
> latest release before 6.9.
> Tested much longer now. Works fine.
> 
> tor. 18. feb. 2021 kl. 18:26 skrev Eivind Eide :
> >
> > bitlbee-facebook-1.2.2
> >
> > facebook-api: Fix id assertion in fb_api_cb_publish_mst() (#204)
> > Increase sync_interval from 5 to 1440 ("The action attempted has
> > been deemed abusive or is otherwise disallowed") (#194)
> > Bump the FB_ORCA_AGENT version once again (#208)
> >
> > Simple diff attached. Lightly tested on amd64.
> >
> > --
> >
> >
> >
> > Eivind Eide
> >
> > "ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
> > - Oceania Association of Autonomous Astronauts
> 
> 
> 
> -- 
> 
> 
> 
> Eivind Eide
> 
> "ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
> - Oceania Association of Autonomous Astronauts
> 

Re: [UPDATE] net/bitlbee-facebook 1.2.1p0 -> 1.2.2

[Eivind Eide]

Bumping this as I would like to see bitlbee-facebook updated to the
latest release before 6.9.
Tested much longer now. Works fine.

tor. 18. feb. 2021 kl. 18:26 skrev Eivind Eide :
>
> bitlbee-facebook-1.2.2
>
> facebook-api: Fix id assertion in fb_api_cb_publish_mst() (#204)
> Increase sync_interval from 5 to 1440 ("The action attempted has
> been deemed abusive or is otherwise disallowed") (#194)
> Bump the FB_ORCA_AGENT version once again (#208)
>
> Simple diff attached. Lightly tested on amd64.
>
> --
>
>
>
> Eivind Eide
>
> "ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
> - Oceania Association of Autonomous Astronauts



-- 



Eivind Eide

"ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
- Oceania Association of Autonomous Astronauts

[UPDATE] net/bitlbee-facebook 1.2.1p0 -> 1.2.2

[Eivind Eide]

bitlbee-facebook-1.2.2

facebook-api: Fix id assertion in fb_api_cb_publish_mst() (#204)
Increase sync_interval from 5 to 1440 ("The action attempted has
been deemed abusive or is otherwise disallowed") (#194)
Bump the FB_ORCA_AGENT version once again (#208)

Simple diff attached. Lightly tested on amd64.

-- 



Eivind Eide

"ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
- Oceania Association of Autonomous Astronauts
diff -rupN bitlbee-facebook.bak/Makefile bitlbee-facebook/Makefile
--- bitlbee-facebook.bak/Makefile   Thu Feb 18 18:27:52 2021
+++ bitlbee-facebook/Makefile   Thu Feb 18 18:30:12 2021
@@ -2,9 +2,8 @@
 
 COMMENT=   Facebook Messenger protocol plugin for bitlbee
 
-V= 1.2.1
+V= 1.2.2
 DISTNAME=  bitlbee-facebook-$V
-REVISION=  0
 
 CATEGORIES=net
 
diff -rupN bitlbee-facebook.bak/distinfo bitlbee-facebook/distinfo
--- bitlbee-facebook.bak/distinfo   Thu Feb 18 18:27:52 2021
+++ bitlbee-facebook/distinfo   Thu Feb 18 18:41:18 2021
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-facebook-1.2.1.tar.gz) = 
G/yy9A/cZBZqntfhJSyYTr+BZ1q+cgJd81lAXKvG3jo=
-SIZE (bitlbee-facebook-1.2.1.tar.gz) = 409828
+SHA256 (bitlbee-facebook-1.2.2.tar.gz) = 
7PsNHJ5rOWjC5i0cvw6KUTsgzv4rLQkaJ/lDtjxTAE4=
+SIZE (bitlbee-facebook-1.2.2.tar.gz) = 416290
diff -rupN bitlbee-facebook.bak/patches/patch-facebook_facebook-api_h 
bitlbee-facebook/patches/patch-facebook_facebook-api_h
--- bitlbee-facebook.bak/patches/patch-facebook_facebook-api_h  Wed Feb  3 
16:29:14 2021
+++ bitlbee-facebook/patches/patch-facebook_facebook-api_h  Thu Jan  1 
01:00:00 1970
@@ -1,19 +0,0 @@
-$OpenBSD: patch-facebook_facebook-api_h,v 1.1 2021/02/03 15:29:14 sthen Exp $
-
-From 49ea312d98b0578b9b2c1ff759e2cfa820a41f4d Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal 
-Date: Wed, 20 Jan 2021 13:19:45 +0100
-Subject: [PATCH] Bump the FB_ORCA_AGENT version once again (#208)
-
-Index: facebook/facebook-api.h
 facebook/facebook-api.h.orig
-+++ facebook/facebook-api.h
-@@ -117,7 +117,7 @@
-  *
-  */
- 
--#define FB_ORCA_AGENT "[FBAN/Orca-Android;FBAV/192.0.0.31.101;FBBV/14477681]"
-+#define FB_ORCA_AGENT "[FBAN/Orca-Android;FBAV/537.0.0.31.101;FBBV/14477681]"
- 
- /**
-  * FB_API_AGENT:

Re: UPDATE: net/bitlbee-facebook 1.2.0 -> 1.2.1

[Eivind Eide]

Ping?
Tested longer on amd64 now. No problems.

tor. 22. okt. 2020 kl. 03:36 skrev Eivind Eide :
>
> bitlbee-facebook-1.2.1 (2020-10-20):
>   - Fix "Parse error: unexpected identifier 'taNewMessage'"
>   - Fix "Failed to read thrift: facebook-api.c:1929 fb_api_cb_publish_pt:
> assertion 'fb_thrift_read_stop(thft)' failed"
>
> Tested lightly on amd64.
>
> Simple diff. Attaching as textfile, as gmail mangles all input.
>
> --
>
>
>
> Eivind Eide
>
> "ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
> - Oceania Association of Autonomous Astronauts



-- 



Eivind Eide

"ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
- Oceania Association of Autonomous Astronauts

UPDATE: net/bitlbee-facebook 1.2.0 -> 1.2.1

[Eivind Eide]

bitlbee-facebook-1.2.1 (2020-10-20):
  - Fix "Parse error: unexpected identifier 'taNewMessage'"
  - Fix "Failed to read thrift: facebook-api.c:1929 fb_api_cb_publish_pt:
assertion 'fb_thrift_read_stop(thft)' failed"

Tested lightly on amd64.

Simple diff. Attaching as textfile, as gmail mangles all input.

-- 



Eivind Eide

"ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
- Oceania Association of Autonomous Astronauts
diff -rupN bitlbee-facebook.bak/Makefile bitlbee-facebook/Makefile
--- bitlbee-facebook.bak/Makefile   Tue Jul  9 12:56:07 2019
+++ bitlbee-facebook/Makefile   Thu Oct 22 04:50:03 2020
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.5 2019/07/09 10:56:07 kn Exp $
 
 COMMENT=   Facebook Messenger protocol plugin for bitlbee
-V= 1.2.0
+V= 1.2.1
 DISTNAME=  bitlbee-facebook-$V
 CATEGORIES=net
 
diff -rupN bitlbee-facebook.bak/distinfo bitlbee-facebook/distinfo
--- bitlbee-facebook.bak/distinfo   Tue Jul  9 12:56:07 2019
+++ bitlbee-facebook/distinfo   Thu Oct 22 04:54:47 2020
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-facebook-1.2.0.tar.gz) = 
vkbimvTCfM5NqyJJ0jzjmMJ93s+Rcs4tSt9vgCp8Vmo=
-SIZE (bitlbee-facebook-1.2.0.tar.gz) = 409444
+SHA256 (bitlbee-facebook-1.2.1.tar.gz) = 
G/yy9A/cZBZqntfhJSyYTr+BZ1q+cgJd81lAXKvG3jo=
+SIZE (bitlbee-facebook-1.2.1.tar.gz) = 409828

Re: Update: net/bitlbee-facebook 1.1.2 -> 1.2.0

[Klemens Nanni]

Committed, thanks.

Update: net/bitlbee-facebook 1.1.2 -> 1.2.0

[Eivind Eide]

There's been an update of net/bitlebee-facebook around for a while
with some fixes:
https://github.com/bitlbee/bitlbee-facebook/releases
I've been running it on OpenBSD/amd64 for some time with no problem.
The diff is quite simple, but as gmail webmail mangles all text I'll
try to attach the diff as a text attachment, see if that works out.

-- 

Eivind Eide

"ONLY THOSE WHO ATTEMPT THE IMPOSSIBLE WILL ACHIEVE THE ABSURD"
- Oceania Association of Autonomous Astronauts
diff -rupN bitlbee-facebook.bak/Makefile bitlbee-facebook/Makefile
--- bitlbee-facebook.bak/Makefile   Tue Jul  9 00:51:58 2019
+++ bitlbee-facebook/Makefile   Tue Jul  9 01:33:46 2019
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.4 2019/05/19 19:58:51 danj Exp $
 
 COMMENT=   Facebook Messenger protocol plugin for bitlbee
-V= 1.1.2
+V= 1.2.0
 DISTNAME=  bitlbee-facebook-$V
 CATEGORIES=net
-REVISION=  0
 
 HOMEPAGE=  https://github.com/bitlbee/bitlbee-facebook
 
diff -rupN bitlbee-facebook.bak/distinfo bitlbee-facebook/distinfo
--- bitlbee-facebook.bak/distinfo   Sun Oct 15 12:52:09 2017
+++ bitlbee-facebook/distinfo   Tue Jul  9 01:35:52 2019
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-facebook-1.1.2.tar.gz) = 
O5RfgFdzoO8nyXIHzbqmUESr5QvmqpV08sMZ+OU4CWg=
-SIZE (bitlbee-facebook-1.1.2.tar.gz) = 397445
+SHA256 (bitlbee-facebook-1.2.0.tar.gz) = 
vkbimvTCfM5NqyJJ0jzjmMJ93s+Rcs4tSt9vgCp8Vmo=
+SIZE (bitlbee-facebook-1.2.0.tar.gz) = 409444

Re: update net/bitlbee

[Klemens Nanni]

On Fri, Apr 19, 2019 at 06:41:40PM +0200, Solene Rapenne wrote:
> update bitlbee to 3.6 and uses https
Keeps working for me, OK kn.

>  HOMEPAGE=http://bitlbee.org/
Has TLS as well.

Re: update net/bitlbee

[Nam Nguyen]

Tom Doherty writes:

> maintainer ok
>
>> On 19 Apr 2019, at 17:41, Solene Rapenne wrote:
>> 
>> update bitlbee to 3.6 and uses https
>> 
>> commit list at the bottom of the mail after the diff.
>> 
>> I don't use bitlbee, but the service starts and bitlbee-facebook
>> compiles fine too.
>> 
>> I plan to look at bitblee-mastodon and though it would be nice to update
>> bitlbee while there.

I have successfully tested this with `purple-hangouts' and
`bitlbee-steam'.

Re: update net/bitlbee

[Tom Doherty]

maintainer ok

> On 19 Apr 2019, at 17:41, Solene Rapenne  wrote:
> 
> update bitlbee to 3.6 and uses https
> 
> commit list at the bottom of the mail after the diff.
> 
> I don't use bitlbee, but the service starts and bitlbee-facebook
> compiles fine too.
> 
> I plan to look at bitblee-mastodon and though it would be nice to update
> bitlbee while there.
> 
> 
> Index: Makefile
> ===
> RCS file: /data/cvs/ports/net/bitlbee/Makefile,v
> retrieving revision 1.69
> diff -u -p -r1.69 Makefile
> --- Makefile4 Sep 2018 12:46:16 -1.69
> +++ Makefile19 Apr 2019 07:31:59 -
> @@ -2,10 +2,9 @@
> 
> COMMENT=IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
> 
> -V=3.5.1
> +V=3.6
> DISTNAME=bitlbee-$V
> PKGSPEC=bitlbee-=$V
> -REVISION=6
> CATEGORIES=net
> 
> HOMEPAGE=http://bitlbee.org/
> @@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM=Yes
> 
> WANTLIB += c m pthread glib-2.0 gmodule-2.0 ssl crypto intl
> 
> -MASTER_SITES=http://get.bitlbee.org/src/
> +MASTER_SITES=https://get.bitlbee.org/src/
> 
> MODULES=devel/gettext
> 
> Index: distinfo
> ===
> RCS file: /data/cvs/ports/net/bitlbee/distinfo,v
> retrieving revision 1.28
> diff -u -p -r1.28 distinfo
> --- distinfo27 May 2017 08:01:33 -1.28
> +++ distinfo19 Apr 2019 07:32:13 -
> @@ -1,2 +1,2 @@
> -SHA256 (bitlbee-3.5.1.tar.gz) = ljbX/Ynrs3VsE6mjOHc2ym1WzPZuwFgNUS8Hsh2w+mk=
> -SIZE (bitlbee-3.5.1.tar.gz) = 680351
> +SHA256 (bitlbee-3.6.tar.gz) = nxXeRvKbRr8eOfxQvfRRXnGxf1UfOVUJTF2nktliEH4=
> +SIZE (bitlbee-3.6.tar.gz) = 534961
> Index: pkg/PLIST
> ===
> RCS file: /data/cvs/ports/net/bitlbee/pkg/PLIST,v
> retrieving revision 1.19
> diff -u -p -r1.19 PLIST
> --- pkg/PLIST4 Sep 2018 12:46:16 -1.19
> +++ pkg/PLIST19 Apr 2019 07:33:36 -
> @@ -3,6 +3,7 @@
> @newgroup _bitlbee:509
> @newuser _bitlbee:509:_bitlbee:daemon:Bitlbee 
> Account:/nonexistent:/sbin/nologin
> @extraunexec rm -rf ${DB_DIR}/*
> +@rcscript ${RCDIR}/bitlbee
> include/bitlbee/
> include/bitlbee/account.h
> include/bitlbee/arc.h
> @@ -10,6 +11,7 @@ include/bitlbee/auth.h
> include/bitlbee/base64.h
> include/bitlbee/bee.h
> include/bitlbee/bitlbee.h
> +include/bitlbee/canohost.h
> include/bitlbee/commands.h
> include/bitlbee/conf.h
> include/bitlbee/config.h
> @@ -59,6 +61,3 @@ share/examples/bitlbee/motd.txt
> @owner _bitlbee
> @group _bitlbee
> @sample ${DB_DIR}/
> -@owner
> -@group
> -@rcscript ${RCDIR}/bitlbee
> 
> 
> 
> commit list from the following command:
> git log --oneline --summary
> 262a82b875f2a05cdcf2258260c5e8a9e538f405..ff9f3e3be7f3af056e99f2b9b7bd1627b9826c50
> 
> 
> ff9f3e3b BitlBee 3.6
> e17d0a44 Prepare 3.6 release notes
> e5d2c560 Remove OSCAR since both ICQ and AIM are dead
> 9de451d7 debian: remove nonsense build-dep of old debhelper
> 8bae78d5 Fix some issues reported by lintian (#122)
> c3599e03 Trim trailing whitespace.
> 88132824 Add debian upstream metadata file.
> 67f4cfe7 Fix the capitalisation of freenode's name.
> 5eab9260 SSL: correctly handle hostnames starting with a digit when SNI is 
> needed.
> 37437f2a otr: Don't block attempts to connect/smp/smpq to "offline" users
> 61fc056b irc_im: fix away_reply_timeout getting reset too often
> 0b1448f0 twitter: set default value of stream setting to false
> 3b0c1c33 Merge branch 'master' into develop
> 921ea8bf twitter: show quote tweets when the url isn't in the entities
> fa1bc1d7 Hide timestamps from the message body if server-time is enabled
> 9767d038 Modify server-time implementation to not change API
> f7cc7345 irc: implement server-time capability
> c82e4ca0 Use GString for irc->sendbuffer (simpler and faster)
> 5c90890f Stop using the irc->users linked list, use the hash table instead
> b9d1fdc7 irc_vawrite: cut amount of strlen(irc->sendbuffer) calls in half
> ac8b4d92 rename -del help clarification
> 19ba56e3 show correct nick when `rename -del` is used
> c17d0af8 purple: Add "bitlbee-set-account-password" signal
> 9e83b155 Add a hash table to speed up bee_user_by_handle()
> 49ab3cbb Remove deprecated placeholder for 'nick' command (added 2010)
> 17cc2fe5 Merge branch 'develop'
> 5c163e50 Openssl 1.1 support
> 896bea28 Fix bitlbee.org URLs.
> f8d2cffc debian: turn -common and -dev into arch:any to safely use --link-doc
> 8d7b0a4e debian: add ${DEB_HOST_MULTIARCH} to pkgconfig install path
> 8c4af56e debian: Fix postinst error with no /var/lib/bitlbee
> 246b98bb jabber: try to join anyway after "Already present in chat"
> a39ede75 oscar: remove old_icq_auth (XOR login, default off since 2010)
> 9459ca25 debian: pass --systemdsystemunitdir to ./configure explicitly
> 46b5ed19 debian: limit dh_systemd actions to the bitlbee-common package
> 230f6f17 debian: bump compat level from 6 

update net/bitlbee

[Solene Rapenne]

update bitlbee to 3.6 and uses https

commit list at the bottom of the mail after the diff.

I don't use bitlbee, but the service starts and bitlbee-facebook
compiles fine too.

I plan to look at bitblee-mastodon and though it would be nice to update
bitlbee while there.


Index: Makefile
===
RCS file: /data/cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile4 Sep 2018 12:46:16 -   1.69
+++ Makefile19 Apr 2019 07:31:59 -
@@ -2,10 +2,9 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
-V= 3.5.1
+V= 3.6
 DISTNAME=  bitlbee-$V
 PKGSPEC=   bitlbee-=$V
-REVISION=  6
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB += c m pthread glib-2.0 gmodule-2.0 ssl crypto intl
 
-MASTER_SITES=  http://get.bitlbee.org/src/
+MASTER_SITES=  https://get.bitlbee.org/src/
 
 MODULES=   devel/gettext
 
Index: distinfo
===
RCS file: /data/cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo27 May 2017 08:01:33 -  1.28
+++ distinfo19 Apr 2019 07:32:13 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.5.1.tar.gz) = ljbX/Ynrs3VsE6mjOHc2ym1WzPZuwFgNUS8Hsh2w+mk=
-SIZE (bitlbee-3.5.1.tar.gz) = 680351
+SHA256 (bitlbee-3.6.tar.gz) = nxXeRvKbRr8eOfxQvfRRXnGxf1UfOVUJTF2nktliEH4=
+SIZE (bitlbee-3.6.tar.gz) = 534961
Index: pkg/PLIST
===
RCS file: /data/cvs/ports/net/bitlbee/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST   4 Sep 2018 12:46:16 -   1.19
+++ pkg/PLIST   19 Apr 2019 07:33:36 -
@@ -3,6 +3,7 @@
 @newgroup _bitlbee:509
 @newuser _bitlbee:509:_bitlbee:daemon:Bitlbee 
Account:/nonexistent:/sbin/nologin
 @extraunexec rm -rf ${DB_DIR}/*
+@rcscript ${RCDIR}/bitlbee
 include/bitlbee/
 include/bitlbee/account.h
 include/bitlbee/arc.h
@@ -10,6 +11,7 @@ include/bitlbee/auth.h
 include/bitlbee/base64.h
 include/bitlbee/bee.h
 include/bitlbee/bitlbee.h
+include/bitlbee/canohost.h
 include/bitlbee/commands.h
 include/bitlbee/conf.h
 include/bitlbee/config.h
@@ -59,6 +61,3 @@ share/examples/bitlbee/motd.txt
 @owner _bitlbee
 @group _bitlbee
 @sample ${DB_DIR}/
-@owner
-@group
-@rcscript ${RCDIR}/bitlbee



commit list from the following command:
 git log --oneline --summary
 
262a82b875f2a05cdcf2258260c5e8a9e538f405..ff9f3e3be7f3af056e99f2b9b7bd1627b9826c50


ff9f3e3b BitlBee 3.6
e17d0a44 Prepare 3.6 release notes
e5d2c560 Remove OSCAR since both ICQ and AIM are dead
9de451d7 debian: remove nonsense build-dep of old debhelper
8bae78d5 Fix some issues reported by lintian (#122)
c3599e03 Trim trailing whitespace.
88132824 Add debian upstream metadata file.
67f4cfe7 Fix the capitalisation of freenode's name.
5eab9260 SSL: correctly handle hostnames starting with a digit when SNI is 
needed.
37437f2a otr: Don't block attempts to connect/smp/smpq to "offline" users
61fc056b irc_im: fix away_reply_timeout getting reset too often
0b1448f0 twitter: set default value of stream setting to false
3b0c1c33 Merge branch 'master' into develop
921ea8bf twitter: show quote tweets when the url isn't in the entities
fa1bc1d7 Hide timestamps from the message body if server-time is enabled
9767d038 Modify server-time implementation to not change API
f7cc7345 irc: implement server-time capability
c82e4ca0 Use GString for irc->sendbuffer (simpler and faster)
5c90890f Stop using the irc->users linked list, use the hash table instead
b9d1fdc7 irc_vawrite: cut amount of strlen(irc->sendbuffer) calls in half
ac8b4d92 rename -del help clarification
19ba56e3 show correct nick when `rename -del` is used
c17d0af8 purple: Add "bitlbee-set-account-password" signal
9e83b155 Add a hash table to speed up bee_user_by_handle()
49ab3cbb Remove deprecated placeholder for 'nick' command (added 2010)
17cc2fe5 Merge branch 'develop'
5c163e50 Openssl 1.1 support
896bea28 Fix bitlbee.org URLs.
f8d2cffc debian: turn -common and -dev into arch:any to safely use --link-doc
8d7b0a4e debian: add ${DEB_HOST_MULTIARCH} to pkgconfig install path
8c4af56e debian: Fix postinst error with no /var/lib/bitlbee
246b98bb jabber: try to join anyway after "Already present in chat"
a39ede75 oscar: remove old_icq_auth (XOR login, default off since 2010)
9459ca25 debian: pass --systemdsystemunitdir to ./configure explicitly
46b5ed19 debian: limit dh_systemd actions to the bitlbee-common package
230f6f17 debian: bump compat level from 6 to 9
0d2cd10f Write backtrace to /var/lib/bitlbee/crash.log on SIGSEGV
e1e5bd67 sighandler_crash: flush irc send buffer before crash
5bb44771 Improve the wording of the message when starting with inetd 
accidentally

Re: UPDATE: net/bitlbee-facebook

[Michal Mazurek]

On 00:06:01, 11.10.17, Rafael Sadowski wrote:
> You forgot to remove REVISION.

Thanks, fixed.

Index: net/bitlbee-facebook//Makefile
===
RCS file: /cvs/ports/net/bitlbee-facebook/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- net/bitlbee-facebook//Makefile  28 May 2017 14:16:12 -  1.2
+++ net/bitlbee-facebook//Makefile  12 Oct 2017 06:16:12 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.2 2017/05/28 14:16:12 ajacoutot Exp $
 
 COMMENT=   Facebook Messenger protocol plugin for bitlbee
-V= 1.1.1
+V= 1.1.2
 DISTNAME=  bitlbee-facebook-$V
-REVISION=  0
 CATEGORIES=net
 
 HOMEPAGE=  https://github.com/bitlbee/bitlbee-facebook
Index: net/bitlbee-facebook//distinfo
===
RCS file: /cvs/ports/net/bitlbee-facebook/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- net/bitlbee-facebook//distinfo  28 May 2017 11:59:36 -  1.1.1.1
+++ net/bitlbee-facebook//distinfo  12 Oct 2017 06:16:12 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-facebook-1.1.1.tar.gz) = 
NAhNEkMpx0xeThJ+tnLZmaWd7rK9wYPVndbFATfFU8U=
-SIZE (bitlbee-facebook-1.1.1.tar.gz) = 396646
+SHA256 (bitlbee-facebook-1.1.2.tar.gz) = 
O5RfgFdzoO8nyXIHzbqmUESr5QvmqpV08sMZ+OU4CWg=
+SIZE (bitlbee-facebook-1.1.2.tar.gz) = 397445

-- 
Michal Mazurek

Re: UPDATE: net/bitlbee-facebook

[Rafael Sadowski]

On Tue Oct 10, 2017 at 10:10:45AM +, Michal Mazurek wrote:
> The previous version stopped working.
> 
> OK?
> 
> Index: net/bitlbee-facebook/Makefile
> ===
> RCS file: /cvs/ports/net/bitlbee-facebook/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- net/bitlbee-facebook/Makefile 28 May 2017 14:16:12 -  1.2
> +++ net/bitlbee-facebook/Makefile 10 Oct 2017 10:03:25 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.2 2017/05/28 14:16:12 ajacoutot Exp $
>  
>  COMMENT= Facebook Messenger protocol plugin for bitlbee
> -V=   1.1.1
> +V=   1.1.2
>  DISTNAME=bitlbee-facebook-$V
>  REVISION=0

You forgot to remove REVISION.

>  CATEGORIES=  net
> Index: net/bitlbee-facebook/distinfo
> ===
> RCS file: /cvs/ports/net/bitlbee-facebook/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- net/bitlbee-facebook/distinfo 28 May 2017 11:59:36 -  1.1.1.1
> +++ net/bitlbee-facebook/distinfo 10 Oct 2017 10:03:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (bitlbee-facebook-1.1.1.tar.gz) = 
> NAhNEkMpx0xeThJ+tnLZmaWd7rK9wYPVndbFATfFU8U=
> -SIZE (bitlbee-facebook-1.1.1.tar.gz) = 396646
> +SHA256 (bitlbee-facebook-1.1.2.tar.gz) = 
> O5RfgFdzoO8nyXIHzbqmUESr5QvmqpV08sMZ+OU4CWg=
> +SIZE (bitlbee-facebook-1.1.2.tar.gz) = 397445
> 
> -- 
> Michal Mazurek
> 

UPDATE: net/bitlbee-facebook

[Michal Mazurek]

The previous version stopped working.

OK?

Index: net/bitlbee-facebook/Makefile
===
RCS file: /cvs/ports/net/bitlbee-facebook/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- net/bitlbee-facebook/Makefile   28 May 2017 14:16:12 -  1.2
+++ net/bitlbee-facebook/Makefile   10 Oct 2017 10:03:25 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.2 2017/05/28 14:16:12 ajacoutot Exp $
 
 COMMENT=   Facebook Messenger protocol plugin for bitlbee
-V= 1.1.1
+V= 1.1.2
 DISTNAME=  bitlbee-facebook-$V
 REVISION=  0
 CATEGORIES=net
Index: net/bitlbee-facebook/distinfo
===
RCS file: /cvs/ports/net/bitlbee-facebook/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- net/bitlbee-facebook/distinfo   28 May 2017 11:59:36 -  1.1.1.1
+++ net/bitlbee-facebook/distinfo   10 Oct 2017 10:03:25 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-facebook-1.1.1.tar.gz) = 
NAhNEkMpx0xeThJ+tnLZmaWd7rK9wYPVndbFATfFU8U=
-SIZE (bitlbee-facebook-1.1.1.tar.gz) = 396646
+SHA256 (bitlbee-facebook-1.1.2.tar.gz) = 
O5RfgFdzoO8nyXIHzbqmUESr5QvmqpV08sMZ+OU4CWg=
+SIZE (bitlbee-facebook-1.1.2.tar.gz) = 397445

-- 
Michal Mazurek

Re: update: net/bitlbee

[Tom Doherty]

Maintainer ok

> On 28 May 2017, at 21:59, Stuart Henderson  wrote:
> 
> This adds an rc script to bitlbee (using the -F flag, "Run in ForkDaemon
> mode. This is similar to ordinary daemon mode, but every client gets its
> own process" which seemed the sanest option). Then there doesn't seem
> much need to document inetd setup, so remove it from README. Tweak the
> other bit of README because it makes it sound like previous version
> had libpurple support and it was then removed -- alternatively we
> could probably just remove README completely).
> 
> any comments, OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/bitlbee/Makefile,v
> retrieving revision 1.61
> diff -u -p -r1.61 Makefile
> --- Makefile28 May 2017 11:53:51 -1.61
> +++ Makefile28 May 2017 20:57:20 -
> @@ -5,7 +5,7 @@ COMMENT=IRC proxy to connect to AIM, I
> V=3.5.1
> DISTNAME=bitlbee-$V
> PKGSPEC=bitlbee-=$V
> -REVISION=0
> +REVISION=1
> CATEGORIES=net
> 
> HOMEPAGE=http://bitlbee.org/
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/bitlbee/pkg/PLIST,v
> retrieving revision 1.17
> diff -u -p -r1.17 PLIST
> --- pkg/PLIST28 May 2017 11:53:52 -1.17
> +++ pkg/PLIST28 May 2017 20:57:20 -
> @@ -59,3 +59,6 @@ share/examples/bitlbee/motd.txt
> @owner _bitlbee
> @group _bitlbee
> @sample ${DB_DIR}/
> +@owner
> +@group
> +@rcscript ${RCDIR}/bitlbee
> Index: pkg/README
> ===
> RCS file: /cvs/ports/net/bitlbee/pkg/README,v
> retrieving revision 1.6
> diff -u -p -r1.6 README
> --- pkg/README10 Jul 2014 13:09:06 -1.6
> +++ pkg/README28 May 2017 20:57:20 -
> @@ -4,15 +4,8 @@ $OpenBSD: README,v 1.6 2014/07/10 13:09:
> | Running ${FULLPKGNAME} on OpenBSD
> +---
> 
> -To enable bitlbee, add a line such as the following to /etc/inetd.conf:
> -
> -127.0.0.1:6667stream  tcp nowait _bitlbee ${TRUEPREFIX}/sbin/bitlbee 
> bitlbee
> -
> -inetd(8) must be reloaded (or started). To enable it at boot, the
> -following line needs to be added to rc.conf.local(8):
> -inetd_flags=
> -
> -If a libpurple flavored bitlbee port was previously used, be aware that
> -"classic" bitlbee cannot support all protocols supported with purple
> -library.  Remove lines for all protocol accounts unsupported by
> -"classic" bitlbee in users' xml configuration files in ${DB_DIR}.
> +If moving from a libpurple flavored bitlbee package to an unflavored
> +one, be aware that "classic" bitlbee cannot support all protocols
> +supported with purple library. Remove lines for all protocol accounts
> +unsupported by "classic" bitlbee in users' xml configuration files
> +in ${DB_DIR}.
> Index: pkg/bitlbee.rc
> ===
> RCS file: pkg/bitlbee.rc
> diff -N pkg/bitlbee.rc
> --- /dev/null1 Jan 1970 00:00:00 -
> +++ pkg/bitlbee.rc28 May 2017 20:57:20 -
> @@ -0,0 +1,12 @@
> +#!/bin/sh
> +#
> +# $OpenBSD$
> +
> +daemon="${TRUEPREFIX}/sbin/bitlbee -F"
> +daemon_user="_bitlbee"
> +
> +. /etc/rc.d/rc.subr
> +
> +rc_reload=NO
> +
> +rc_cmd $1
> 

Re: update: net/bitlbee

[Stuart Henderson]

This adds an rc script to bitlbee (using the -F flag, "Run in ForkDaemon
mode. This is similar to ordinary daemon mode, but every client gets its
own process" which seemed the sanest option). Then there doesn't seem
much need to document inetd setup, so remove it from README. Tweak the
other bit of README because it makes it sound like previous version
had libpurple support and it was then removed -- alternatively we
could probably just remove README completely).

any comments, OK?

Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- Makefile28 May 2017 11:53:51 -  1.61
+++ Makefile28 May 2017 20:57:20 -
@@ -5,7 +5,7 @@ COMMENT=IRC proxy to connect to AIM, I
 V= 3.5.1
 DISTNAME=  bitlbee-$V
 PKGSPEC=   bitlbee-=$V
-REVISION=  0
+REVISION=  1
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/bitlbee/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST   28 May 2017 11:53:52 -  1.17
+++ pkg/PLIST   28 May 2017 20:57:20 -
@@ -59,3 +59,6 @@ share/examples/bitlbee/motd.txt
 @owner _bitlbee
 @group _bitlbee
 @sample ${DB_DIR}/
+@owner
+@group
+@rcscript ${RCDIR}/bitlbee
Index: pkg/README
===
RCS file: /cvs/ports/net/bitlbee/pkg/README,v
retrieving revision 1.6
diff -u -p -r1.6 README
--- pkg/README  10 Jul 2014 13:09:06 -  1.6
+++ pkg/README  28 May 2017 20:57:20 -
@@ -4,15 +4,8 @@ $OpenBSD: README,v 1.6 2014/07/10 13:09:
 | Running ${FULLPKGNAME} on OpenBSD
 +---
 
-To enable bitlbee, add a line such as the following to /etc/inetd.conf:
-
-127.0.0.1:6667stream  tcp nowait _bitlbee ${TRUEPREFIX}/sbin/bitlbee 
bitlbee
-
-inetd(8) must be reloaded (or started). To enable it at boot, the
-following line needs to be added to rc.conf.local(8):
-inetd_flags=
-
-If a libpurple flavored bitlbee port was previously used, be aware that
-"classic" bitlbee cannot support all protocols supported with purple
-library.  Remove lines for all protocol accounts unsupported by
-"classic" bitlbee in users' xml configuration files in ${DB_DIR}.
+If moving from a libpurple flavored bitlbee package to an unflavored
+one, be aware that "classic" bitlbee cannot support all protocols
+supported with purple library. Remove lines for all protocol accounts
+unsupported by "classic" bitlbee in users' xml configuration files
+in ${DB_DIR}.
Index: pkg/bitlbee.rc
===
RCS file: pkg/bitlbee.rc
diff -N pkg/bitlbee.rc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/bitlbee.rc  28 May 2017 20:57:20 -
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/bitlbee -F"
+daemon_user="_bitlbee"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1

Re: update: net/bitlbee

[Michal Mazurek]

As Stuart pointed out, add the MODPY_RUNDEP = No setting.

Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile19 Jul 2015 08:22:14 -  1.58
+++ Makefile26 May 2017 19:21:38 -
@@ -2,8 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
-DISTNAME=  bitlbee-3.4
-REVISION=  0
+DISTNAME=  bitlbee-3.5.1
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
@@ -13,7 +12,7 @@ MAINTAINER=   Tom Doherty 

Re: update: net/bitlbee

[Klemens Nanni]

On Fri, May 26, 2017 at 05:32:08PM +0200, Michal Mazurek wrote:
For what it's worth, my patch[0] in early april has some additional
changes that could be merged.

0:  http://marc.info/?l=openbsd-ports=149174357820533=2


Thanks, fixed version:

Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile19 Jul 2015 08:22:14 -  1.58
+++ Makefile26 May 2017 15:30:26 -
@@ -2,8 +2,7 @@

COMMENT=IRC proxy to connect to AIM, ICQ, Jabber and Yahoo

-DISTNAME=  bitlbee-3.4
-REVISION=  0
+DISTNAME=  bitlbee-3.5.1
CATEGORIES= net

HOMEPAGE=   http://bitlbee.org/
@@ -13,7 +12,7 @@ MAINTAINER=   Tom Doherty 

Re: update: net/bitlbee

[Michal Mazurek]

Thanks, fixed version:

Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile19 Jul 2015 08:22:14 -  1.58
+++ Makefile26 May 2017 15:30:26 -
@@ -2,8 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
-DISTNAME=  bitlbee-3.4
-REVISION=  0
+DISTNAME=  bitlbee-3.5.1
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
@@ -13,7 +12,7 @@ MAINTAINER=   Tom Doherty 

Re: update: net/bitlbee

[Stuart Henderson]

On 2017/05/26 15:27, Michal Mazurek wrote:
> Update to 3.5.1. Changelog for 3.4.1 states:
>   Building documentation is now done with a python script (both 2.x/3.x
>   work) Asciidoc/xsltproc/xmlto are no longer build dependencies (dx)
> 
> Many thanks to fcambus@ for helping me to get this complete.
> 
> Index: net/bitlbee/Makefile

this diff is incomplete, it's missing at least the distinfo part.

> ===
> RCS file: /cvs/ports/net/bitlbee/Makefile,v
> retrieving revision 1.58
> diff -u -p -r1.58 Makefile
> --- net/bitlbee/Makefile  19 Jul 2015 08:22:14 -  1.58
> +++ net/bitlbee/Makefile  26 May 2017 13:16:33 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
>  
> -DISTNAME=bitlbee-3.4
> +DISTNAME=bitlbee-3.5.1
>  REVISION=0

please zap REVISION.

>  CATEGORIES=  net
>  
> @@ -13,7 +13,7 @@ MAINTAINER= Tom Doherty   # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -WANTLIB +=   c m pthread glib-2.0 gmodule-2.0 ssl crypto
> +WANTLIB +=   c m pthread glib-2.0 gmodule-2.0 ssl crypto intl
>  
>  MASTER_SITES=http://get.bitlbee.org/src/
>  
> @@ -25,7 +25,8 @@ EXAMPLEDIR= ${PREFIX}/share/examples/bi
>  DOCS=${WRKSRC}/doc/user-guide/user-guide.html
>  DOCDIR=  ${PREFIX}/share/doc/bitlbee/
>  
> -BUILD_DEPENDS=   textproc/xmlto
> +BUILD_DEPENDS=   textproc/libxslt
> +MODULES= lang/python
>  LIB_DEPENDS= devel/glib2
>  
>  CONFIGURE_STYLE= simple
> @@ -62,6 +63,9 @@ NO_TEST=Yes
>  pre-configure:
>   find ${WRKSRC} -name Makefile | \
>   xargs perl -pi -e 's,@\$$\(CC\),\$$(CC),g'
> +
> +post-build:
> + ${MAKE_PROGRAM} -C ${WRKSRC}/doc/user-guide user-guide.html
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${DOCDIR}
> 
> 
> Comments? OKs?
> 
> -- 
> Michal Mazurek
> 

update: net/bitlbee

[Michal Mazurek]

Update to 3.5.1. Changelog for 3.4.1 states:
  Building documentation is now done with a python script (both 2.x/3.x
  work) Asciidoc/xsltproc/xmlto are no longer build dependencies (dx)

Many thanks to fcambus@ for helping me to get this complete.

Index: net/bitlbee/Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- net/bitlbee/Makefile19 Jul 2015 08:22:14 -  1.58
+++ net/bitlbee/Makefile26 May 2017 13:16:33 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
-DISTNAME=  bitlbee-3.4
+DISTNAME=  bitlbee-3.5.1
 REVISION=  0
 CATEGORIES=net
 
@@ -13,7 +13,7 @@ MAINTAINER=   Tom Doherty 

update: net/bitlbee 3.4.0 -> 3.5.1

[Klemens Nanni]

See the official changelog[0] for more information. Especially TLS>1.0
support[1] should make it into 6.1 imho.

Documentation does not depend on textproc/xmlto anymore, a single
help.txt is now produced through a python script in BitlBee's build
process.

Even though I'm running the latest snapshot and keep the ports tree in
sync, the following erros still occur (output redecated):

$ make package
Error Libraries in packing-lists...
--W glib-2.0.4200.3
--W gmodule-2.0.4200.3
+-W glib-2.0.4200.4
+-W gmodule-2.0.4200.4
$ make PKG_CREATE_NO_CHECKS=yes package
file:/usr/ports/packages/amd64/tmp/bitlbee-3.5.1p0.tgz: \
  unsigned package (signify(1) doesn't see old-style signatures)
Fatal error: Bad package \
  /usr/ports/packages/amd64/tmp/bitlbee-3.5.1p0.tgz

I couldn't more information besides "sync your tree" on the first one;
the package should probably not be signed on my machine either. Can
anyone provide more information on this? Reading the official
documentation, guides and manual pages I wasn't able to fix this myself.


0: https://www.bitlbee.org/main.php/changelog.html
1: 
https://github.com/bitlbee/bitlbee/commit/82e55d202f8152c25b8daa48d1960eede3eee312
Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile19 Jul 2015 08:22:14 -  1.58
+++ Makefile9 Apr 2017 11:22:09 -
@@ -1,46 +1,45 @@
 # $OpenBSD: Makefile,v 1.58 2015/07/19 08:22:14 jca Exp $
 
-COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
+COMMENT =  IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
-DISTNAME=  bitlbee-3.4
-REVISION=  0
-CATEGORIES=net
+DISTNAME = bitlbee-3.5.1
+REVISION = 0
+CATEGORIES =   net
 
-HOMEPAGE=  http://bitlbee.org/
+HOMEPAGE = https://bitlbee.org/
 
-MAINTAINER=Tom Doherty 
+MAINTAINER =   Tom Doherty 
 
 # GPLv2
-PERMIT_PACKAGE_CDROM=  Yes
+PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += c m pthread glib-2.0 gmodule-2.0 ssl crypto
 
-MASTER_SITES=  http://get.bitlbee.org/src/
+MASTER_SITES = https://get.bitlbee.org/src/
 
-MODULES=   devel/gettext
+MODULES =  devel/gettext
 
-DB_DIR?=   /var/bitlbee
-ETCDIR=${SYSCONFDIR}/bitlbee
-EXAMPLEDIR=${PREFIX}/share/examples/bitlbee
-DOCS=  ${WRKSRC}/doc/user-guide/user-guide.html
-DOCDIR=${PREFIX}/share/doc/bitlbee/
+DB_DIR ?=  /var/bitlbee
+ETCDIR =   ${SYSCONFDIR}/bitlbee
+EXAMPLEDIR =   ${PREFIX}/share/examples/bitlbee
+DOCS = ${WRKSRC}/doc/user-guide/help.txt
+DOCDIR =   ${PREFIX}/share/doc/bitlbee/
 
-BUILD_DEPENDS= textproc/xmlto
-LIB_DEPENDS=   devel/glib2
+LIB_DEPENDS =  devel/glib2
 
-CONFIGURE_STYLE=   simple
-CONFIGURE_ARGS+=   --bindir=${PREFIX}/libexec \
+CONFIGURE_STYLE =  simple
+CONFIGURE_ARGS +=  --bindir=${PREFIX}/libexec \
--mandir=${PREFIX}/man \
--config=${DB_DIR} \
--etcdir=${ETCDIR} \
--ssl=openssl \
--pie=0
 
-USE_GMAKE= Yes
-MAKE_ENV=  "CC=${CC}" "CFLAGS=${CFLAGS}"
-FAKE_FLAGS=ETCDIR=${EXAMPLEDIR}
-FAKE_TARGET=   install install-etc
-SUBST_VARS=DB_DIR
+USE_GMAKE =Yes
+MAKE_ENV = "CC=${CC}" "CFLAGS=${CFLAGS}"
+FAKE_FLAGS =   ETCDIR=${EXAMPLEDIR}
+FAKE_TARGET =  install install-etc
+SUBST_VARS =   DB_DIR
 
 FLAVORS =  libpurple otr
 FLAVOR ?=
@@ -56,12 +55,12 @@ LIB_DEPENDS +=  security/libotr>=4.0.0 s
 WANTLIB += gcrypt otr
 .endif
 
-NO_TEST=   Yes
+NO_TEST =  Yes
 
 # don't hide compile command lines
 pre-configure:
-   find ${WRKSRC} -name Makefile | \
-   xargs perl -pi -e 's,@\$$\(CC\),\$$(CC),g'
+   find ${WRKSRC} -type f -name Makefile -exec \
+   sed -ie '/$$(CC)/s,@,,' {} +
 
 post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo13 May 2015 19:01:10 -  1.27
+++ distinfo9 Apr 2017 11:22:09 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.4.tar.gz) = zrrWRrv9F8gJI3QyRAOf2XDjyifowbfPhyYi53MjnV4=
-SIZE (bitlbee-3.4.tar.gz) = 761027
+SHA256 (bitlbee-3.5.1.tar.gz) = ljbX/Ynrs3VsE6mjOHc2ym1WzPZuwFgNUS8Hsh2w+mk=
+SIZE (bitlbee-3.5.1.tar.gz) = 680351
Index: pkg/DESCR

Re: UPDATE: net/bitlbee = 3.4

[Jérémie Courrèges-Anglas]

Committed.

Thanks,
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: net/bitlbee = 3.4

[Jérémie Courrèges-Anglas]

Hi,

Henrik Friedrichsen hen...@diff.cc writes:

 Oops. Looks like the first message did not get to the list.
 Here is the patch one more time..

I see that Tom Doherty (cc'ed) had already sent an update to 3.4,
including a tweak to remove MSN from COMMENT[1].

I can commit this if I get explicit test reports.  Can I have a rough
idea of which protocols were tested?

[1] http://marc.info/?l=openbsd-portsm=142982016226116w=2

 On Sun, May 10, 2015 at 01:03:52PM +0200, Henrik Friedrichsen wrote:
 ping?

 Index: Makefile
 ===
 RCS file: /cvs/ports/net/bitlbee/Makefile,v
 retrieving revision 1.55
 diff -u -p -r1.55 Makefile
 --- Makefile  21 Aug 2014 21:41:57 -  1.55
 +++ Makefile  30 Apr 2015 19:07:07 -
 @@ -2,7 +2,7 @@
  
  COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
  
 -DISTNAME=bitlbee-3.2.2
 +DISTNAME=bitlbee-3.4
  CATEGORIES=  net
  
  HOMEPAGE=http://bitlbee.org/
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/bitlbee/distinfo,v
 retrieving revision 1.26
 diff -u -p -r1.26 distinfo
 --- distinfo  21 Aug 2014 21:41:57 -  1.26
 +++ distinfo  30 Apr 2015 19:07:07 -
 @@ -1,2 +1,2 @@
 -SHA256 (bitlbee-3.2.2.tar.gz) = ujiTkoHyPooOcQIse+DLaPZUQkhAQ2LF4gJF+npnVY4=
 -SIZE (bitlbee-3.2.2.tar.gz) = 661757
 +SHA256 (bitlbee-3.4.tar.gz) = zrrWRrv9F8gJI3QyRAOf2XDjyifowbfPhyYi53MjnV4=
 +SIZE (bitlbee-3.4.tar.gz) = 761027

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: net/bitlbee = 3.4

[Henrik Friedrichsen]

Hey!

Oh, I'm afraid I missed the previous submission.

On Wed, May 13, 2015 at 07:23:22PM +0200, Jérémie Courrèges-Anglas wrote:
 I can commit this if I get explicit test reports.  Can I have a rough
 idea of which protocols were tested?

I have been using this since I sent it in with the XMPP and Twitter
protocol with no problems whatsoever.

Re: UPDATE: net/bitlbee = 3.4

[Tom Doherty]

Hi
I tested with my usual bitlbee-libpurple/pidgin-sipe
Cheers
Tom

Sent from my iPhone

 On 13 May 2015, at 18:43, Henrik Friedrichsen hen...@diff.cc wrote:
 
 Hey!
 
 Oh, I'm afraid I missed the previous submission.
 
 On Wed, May 13, 2015 at 07:23:22PM +0200, Jérémie Courrèges-Anglas wrote:
 I can commit this if I get explicit test reports.  Can I have a rough
 idea of which protocols were tested?
 
 I have been using this since I sent it in with the XMPP and Twitter
 protocol with no problems whatsoever.
 

Re: UPDATE: net/bitlbee = 3.4

[Henrik Friedrichsen]

Oops. Looks like the first message did not get to the list.
Here is the patch one more time..

On Sun, May 10, 2015 at 01:03:52PM +0200, Henrik Friedrichsen wrote:
 ping?
Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile21 Aug 2014 21:41:57 -  1.55
+++ Makefile30 Apr 2015 19:07:07 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.2.2
+DISTNAME=  bitlbee-3.4
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo21 Aug 2014 21:41:57 -  1.26
+++ distinfo30 Apr 2015 19:07:07 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.2.2.tar.gz) = ujiTkoHyPooOcQIse+DLaPZUQkhAQ2LF4gJF+npnVY4=
-SIZE (bitlbee-3.2.2.tar.gz) = 661757
+SHA256 (bitlbee-3.4.tar.gz) = zrrWRrv9F8gJI3QyRAOf2XDjyifowbfPhyYi53MjnV4=
+SIZE (bitlbee-3.4.tar.gz) = 761027

Re: UPDATE: net/bitlbee = 3.4

[Henrik Friedrichsen]

ping?

UPDATE: net/bitlbee = 3.4

[Henrik Friedrichsen]

Attached is a patch bumping bitlbee version to 3.4.

Running this on my server with OTR. Seems to work fine.

OK?
Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile21 Aug 2014 21:41:57 -  1.55
+++ Makefile30 Apr 2015 19:07:07 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.2.2
+DISTNAME=  bitlbee-3.4
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo21 Aug 2014 21:41:57 -  1.26
+++ distinfo30 Apr 2015 19:07:07 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.2.2.tar.gz) = ujiTkoHyPooOcQIse+DLaPZUQkhAQ2LF4gJF+npnVY4=
-SIZE (bitlbee-3.2.2.tar.gz) = 661757
+SHA256 (bitlbee-3.4.tar.gz) = zrrWRrv9F8gJI3QyRAOf2XDjyifowbfPhyYi53MjnV4=
+SIZE (bitlbee-3.4.tar.gz) = 761027

[UPDATE] net/bitlbee 3.4

[Tom Doherty]

Hi
Here's an update to bitlbee 3.4

Version 3.4:

Main repository migrated from bzr to git
Some API/ABI changes. Recompiling third party plugins is required!
Important bugfixes:
Fix memory leak when calling word_wrap() on groupchat messages (dx)
Fix segfault after a file transfer is complete (dx)
Fix bug where NSS would refuse to work in forkdaemon mode (dx)
Fix several bugs with UTF8 nicks (dx)
Fix some nasty deadlocks that appared mostly with libpurple (dx)
General changes:
Add a 'pattern' parameter to the blist command, to filter it (tribut)
Implemented /kick support, only supported by purple for now (jgeboski)
Add a special state to show_users (mapped to the % prefix) (jgeboski)
Improved support for cygwin, openbsd and darwin (jcopenha)
Create temporary users instead of showing Message from unknown participant
(jgeboski)
purple:
Local contact lists for gadugadu and whatsapp (dx)
Add topic and name_hint to groupchats (seirl)
Support for 'input' requests (such as telegram auth codes) (seirl) Note that
telegram-purple itself is rather unstable ATM, it may crash.
jabber:
Handle compressed DNS responses in SRV lookup (jcopenha)
Fix case sensitivity issues with JIDs (GRMrGecko, dx)
Implement XEP-0203 style message timestamps (dx)
Fix Server claims your JID is X instead of Y warnings (dx)
Account-wide display_name setting, mostly for hipchat (dx)
twitter:
Filter channels. Search by keyword/hashtag or a list of users (jgeboski)
Fix bug in reply command which removed the first quote character (dx)
Add rawreply command, like reply but bitlbee won't add @mention (WillP)
Add support for The United States of America (favorite/fav aliases) (dx)
Default show_old_mentions to 0 (dx)
Start stream from last tweet on connect/reconnect (roger)
msn:
Disabled module by default. The protocol we used (MSNP18) stopped working
last week. This is being worked on, but it's far from ready for release.
And lots of small bugfixes, too many to list here.

Cheers
Tom
Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.55
diff -u -p -u -r1.55 Makefile
--- Makefile21 Aug 2014 21:41:57 -  1.55
+++ Makefile23 Apr 2015 20:13:07 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.55 2014/08/21 21:41:57 sthen Exp $
 
-COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
+COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
-DISTNAME=  bitlbee-3.2.2
+DISTNAME=  bitlbee-3.4
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.26
diff -u -p -u -r1.26 distinfo
--- distinfo21 Aug 2014 21:41:57 -  1.26
+++ distinfo23 Apr 2015 20:13:07 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.2.2.tar.gz) = ujiTkoHyPooOcQIse+DLaPZUQkhAQ2LF4gJF+npnVY4=
-SIZE (bitlbee-3.2.2.tar.gz) = 661757
+SHA256 (bitlbee-3.4.tar.gz) = zrrWRrv9F8gJI3QyRAOf2XDjyifowbfPhyYi53MjnV4=
+SIZE (bitlbee-3.4.tar.gz) = 761027

[UPDATE] net/bitlbee 3.2.2

[Tom Doherty]

Hi
Probably too late to go in now but will bump after unlock

Version 3.2.2 (released 2014-07-05) hilights:

libotr 4.0 compatibility fixes.
Twitter Unicode fixes.
Small other bugfixes.


Cheers
Tom


Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.54
diff -u -p -u -r1.54 Makefile
--- Makefile10 Jul 2014 13:09:06 -  1.54
+++ Makefile28 Jul 2014 14:18:56 -
@@ -2,9 +2,8 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.2.1
+DISTNAME=  bitlbee-3.2.2
 CATEGORIES=net
-REVISION=  0
 
 HOMEPAGE=  http://bitlbee.org/
 
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.25
diff -u -p -u -r1.25 distinfo
--- distinfo2 Jan 2014 13:04:34 -   1.25
+++ distinfo28 Jul 2014 14:18:56 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.2.1.tar.gz) = APQR3X1tKPMPDnPkbJy+iLQAbn8Drf4HuQqXKAopD1k=
-SIZE (bitlbee-3.2.1.tar.gz) = 657595
+SHA256 (bitlbee-3.2.2.tar.gz) = ujiTkoHyPooOcQIse+DLaPZUQkhAQ2LF4gJF+npnVY4=
+SIZE (bitlbee-3.2.2.tar.gz) = 661757
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 2 Jan 2014 13:04:34 -   1.10
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-configure,v 1.10 2014/01/02 13:04:34 landry Exp $
 configure.orig Tue Dec 31 21:40:21 2013
-+++ configure  Tue Dec 31 21:42:26 2013
-@@ -344,6 +344,24 @@ detect_resolv_dynamic()
-   FreeBSD )
-   # In FreeBSD res_* routines are present in libc.so
-   LIBRESOLV=;;
-+  OpenBSD )
-+  # In OpenBSD res_* routines are present in libc.so,
-+  # and there are no ns_*() functions, thus the special
-+  # RESOLV_TESTCODE.
-+  LIBRESOLV=
-+  RESOLV_TESTCODE='
-+#include netinet/in.h
-+#include arpa/nameser.h
-+#include resolv.h 
-+
-+int main()
-+{
-+   res_query( NULL, 0, 0, NULL, 0 );
-+   dn_expand( NULL, NULL, NULL, NULL, 0 );
-+}
-+'
-+;;
-+
-   * )
-   LIBRESOLV=-lresolv;;
-   esac
Index: patches/patch-lib_misc_c
===
RCS file: patches/patch-lib_misc_c
diff -N patches/patch-lib_misc_c
--- patches/patch-lib_misc_c2 Jan 2014 13:04:34 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,117 +0,0 @@
-$OpenBSD: patch-lib_misc_c,v 1.2 2014/01/02 13:04:34 landry Exp $
-http://bugs.bitlbee.org/bitlbee/ticket/421
-needed until ns_parse family of functions are added to lib/libc/asr
 lib/misc.c.origWed Nov 27 22:54:54 2013
-+++ lib/misc.c Tue Dec 31 21:52:54 2013
-@@ -44,7 +44,10 @@
- #ifdef HAVE_RESOLV_A
- #include arpa/nameser.h
- #include resolv.h
-+#if defined (__OpenBSD__)
-+#include netinet/in.h
- #endif
-+#endif
- 
- #include md5.h
- #include ssl_client.h
-@@ -522,19 +525,90 @@ struct ns_srv_reply **srv_lookup( char *service, char 
-   char name[1024];
-   unsigned char querybuf[1024];
-   const unsigned char *buf;
-+  int i, n, len, size;
-+#if defined (__OpenBSD__)
-+  charuncomp[MAXDNAME];
-+  int complen = -1;
-+  unsigned intqdcount = 0, ancount = 0;
-+
-+  const unsigned char *comp = NULL;
-+  unsigned char   *end = NULL;
-+  HEADER  *head = NULL;
-+
-+  int ns_c_in = C_IN, ns_t_srv = T_SRV;
-+  int prio = -1, weight = -1, port = -1;
-+#else
-   ns_msg nsh;
-   ns_rr rr;
--  int i, n, len, size;
-+#endif
-   
-   g_snprintf( name, sizeof( name ), _%s._%s.%s, service, protocol, 
domain );
-   
-   if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( 
querybuf ) ) ) = 0 )
-   return NULL;
-+
-+   n = 0;
-+
-+#if defined (__OpenBSD__)
-+  head = (HEADER *)querybuf;
-+  comp = querybuf + HFIXEDSZ;
-+  end = querybuf + size;
-+
-+  ancount = ntohs(head-ancount);
-+
-+  /* Skip over the Query part */
-+  for (qdcount = ntohs(head-qdcount); qdcount--; comp += size + QFIXEDSZ)
-+  if ((size = dn_skipname(comp, end))  0)
-+  return NULL;
-+
-+
-+  /* Get the answers */
-+  while (ancount  0comp  end) {
-+  /* Skip the owner name, to which this resource record pertains. 
*/
-+  complen = dn_expand(querybuf, end, comp, uncomp, 
sizeof(uncomp));
-+  if (complen  0)
-+  return NULL;
-+
-+  comp += complen;
-+
-+
-+  /* Get the useful answers. */
-+  /* 

[UPDATE] net/bitlbee (to 3.2.1)

[Tom Doherty]

Hi
Please find attached an update to bitlbee 3.2.1. OTR patch has been merged
upstream and I have regenerated the others.

Changelog:

Version 3.2.1 (released 2013-11-27) hilights:

- http_client now uses HTTP/1.1, which is required by Twitter since last
week.
- A bunch of other things.

Cheers
Tom



Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.52
diff -u -p -u -r1.52 Makefile
--- Makefile15 Aug 2013 16:34:00 -  1.52
+++ Makefile31 Dec 2013 22:10:53 -
@@ -2,9 +2,9 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.2
+DISTNAME=  bitlbee-3.2.1
 CATEGORIES=net
-REVISION=  2
+REVISION=  0
 
 HOMEPAGE=  http://bitlbee.org/
 
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.24
diff -u -p -u -r1.24 distinfo
--- distinfo30 Jan 2013 21:45:42 -  1.24
+++ distinfo31 Dec 2013 22:10:53 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
-SIZE (bitlbee-3.2.tar.gz) = 666404
+SHA256 (bitlbee-3.2.1.tar.gz) = APQR3X1tKPMPDnPkbJy+iLQAbn8Drf4HuQqXKAopD1k=
+SIZE (bitlbee-3.2.1.tar.gz) = 657595
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/bitlbee/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-configure
--- patches/patch-configure 13 Mar 2013 21:42:58 -  1.9
+++ patches/patch-configure 31 Dec 2013 22:10:53 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.9 2013/03/13 21:42:58 landry Exp $
 configure.orig Mon Jan  7 00:41:11 2013
-+++ configure  Wed Mar  6 16:23:10 2013
-@@ -362,6 +362,23 @@ detect_resolv_dynamic()
+--- configure.orig Tue Dec 31 21:40:21 2013
 configure  Tue Dec 31 21:42:26 2013
+@@ -344,6 +344,24 @@ detect_resolv_dynamic()
FreeBSD )
# In FreeBSD res_* routines are present in libc.so
LIBRESOLV=;;
@@ -17,11 +17,12 @@ $OpenBSD: patch-configure,v 1.9 2013/03/
 +
 +int main()
 +{
-+  res_query( NULL, 0, 0, NULL, 0 );
-+  dn_expand( NULL, NULL, NULL, NULL, 0 );
++   res_query( NULL, 0, 0, NULL, 0 );
++   dn_expand( NULL, NULL, NULL, NULL, 0 );
 +}
 +'
 +;;
++
* )
LIBRESOLV=-lresolv;;
esac
Index: patches/patch-lib_misc_c
===
RCS file: /cvs/ports/net/bitlbee/patches/patch-lib_misc_c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-lib_misc_c
--- patches/patch-lib_misc_c13 Mar 2013 21:42:58 -  1.1
+++ patches/patch-lib_misc_c31 Dec 2013 22:10:53 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-lib_misc_c,v 1.1 2013/03/13 21:42:58 landry Exp $
 http://bugs.bitlbee.org/bitlbee/ticket/421
 needed until ns_parse family of functions are added to lib/libc/asr
 lib/misc.c.origMon Jan  7 00:41:11 2013
-+++ lib/misc.c Wed Mar  6 19:13:27 2013
+--- lib/misc.c.origWed Nov 27 22:54:54 2013
 lib/misc.c Tue Dec 31 21:52:54 2013
 @@ -44,7 +44,10 @@
  #ifdef HAVE_RESOLV_A
  #include arpa/nameser.h
@@ -20,29 +20,28 @@ needed until ns_parse family of function
const unsigned char *buf;
 +  int i, n, len, size;
 +#if defined (__OpenBSD__)
-+  charuncomp[MAXDNAME];
-+  int complen = -1;
-+  unsigned intqdcount = 0, ancount = 0;
-+
-+  const unsigned char *comp = NULL;
-+  unsigned char   *end = NULL;
-+  HEADER  *head = NULL;
++  charuncomp[MAXDNAME];
++  int complen = -1;
++  unsigned intqdcount = 0, ancount = 0;
++
++  const unsigned char *comp = NULL;
++  unsigned char   *end = NULL;
++  HEADER  *head = NULL;
 +
-+  int ns_c_in = C_IN, ns_t_srv = T_SRV;
-+  int prio = -1, weight = -1, port = -1;
++  int ns_c_in = C_IN, ns_t_srv = T_SRV;
++  int prio = -1, weight = -1, port = -1;
 +#else
ns_msg nsh;
ns_rr rr;
 -  int i, n, len, size;
 +#endif
-+

g_snprintf( name, sizeof( name ), _%s._%s.%s, service, protocol, 
domain );

if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( 
querybuf ) ) ) = 0 )
return NULL;
-   
-+  n = 0;
++
++   n = 0;
 +
 +#if defined (__OpenBSD__)
 +  head = (HEADER *)querybuf;
@@ -100,6 +99,7 @@ needed until ns_parse family of function
 +  ancount--;
 +  }
 +#else
+   
if( ns_initparse( querybuf, size, nsh ) != 0 )

Re: [UPDATE] net/bitlbee

[LEVAI Daniel]

On v, jan 27, 2013 at 16:13:24 -0500, Okan Demirmen wrote:
 Here's one that makes sure the otr FLAVOR continues to work:
[...]

This also works for me.


Daniel

-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: [UPDATE] net/bitlbee

[Okan Demirmen]

Here's one that makes sure the otr FLAVOR continues to work:

Cheers,
Okan

Index: Makefile
===
RCS file: /home/open/anoncvs/cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile27 Nov 2012 15:40:56 -  1.46
+++ Makefile27 Jan 2013 21:07:30 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.0.6
+DISTNAME=  bitlbee-3.2
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
@@ -15,8 +15,7 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB += c pthread glib-2.0 gmodule-2.0 gnutls=13
-WANTLIB += gcrypt gpg-error
+WANTLIB += c pthread glib-2.0 gmodule-2.0 ssl crypto
 
 MASTER_SITES=  http://get.bitlbee.org/src/
 
@@ -28,16 +27,14 @@ EXAMPLEDIR= ${PREFIX}/share/examples/bi
 DOCS=  ${WRKSRC}/doc/user-guide/user-guide.html
 DOCDIR=${PREFIX}/share/doc/bitlbee/
 
-LIB_DEPENDS=   devel/glib2 \
-   security/gnutls \
-   security/libgcrypt
+LIB_DEPENDS=   devel/glib2
 
 CONFIGURE_STYLE=   simple
 CONFIGURE_ARGS+=   --bindir=${PREFIX}/libexec \
--mandir=${PREFIX}/man \
--config=${DB_DIR} \
--etcdir=${ETCDIR} \
-   --ssl=gnutls
+   --ssl=openssl
 
 USE_GMAKE= Yes
 MAKE_ENV=  CC=${CC} CFLAGS=${CFLAGS}
@@ -50,16 +47,13 @@ FLAVOR ?=
 
 .if ${FLAVOR:L:Mlibpurple}
 CONFIGURE_ARGS +=  --purple=1
-LIB_DEPENDS += net/pidgin,-libpurple \
-   devel/silc-toolkit \
-   net/meanwhile \
-   net/libgadu
+LIB_DEPENDS += net/pidgin,-libpurple
 WANTLIB += purple
 .endif
 .if ${FLAVOR:L:Motr}
-CONFIGURE_ARGS +=  --otr=1
-LIB_DEPENDS += security/libotr
-WANTLIB += otr
+CONFIGURE_ARGS +=  --otr=1
+LIB_DEPENDS += security/libotr security/libgcrypt
+WANTLIB += gcrypt otr
 .endif
 
 NO_REGRESS=Yes
Index: distinfo
===
RCS file: /home/open/anoncvs/cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo27 Nov 2012 15:40:56 -  1.23
+++ distinfo27 Jan 2013 14:57:05 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.0.6.tar.gz) = Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug=
-SIZE (bitlbee-3.0.6.tar.gz) = 730918
+SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
+SIZE (bitlbee-3.2.tar.gz) = 666404

Re: [UPDATE] net/bitlbee

[Okan Demirmen]

Hi - Missed this thread; however, I see 1 or 2 diff's - is there one
complete diff?  And on what networks/servers has the openssl switch
been tested? (I don't have have accounts on all networks to test
myself :))

Cheers,
Okan

On Thu, Jan 17, 2013 at 2:26 PM, Tom Doherty tomd2...@gmail.com wrote:
 I like it a lot. Okan? :-)



 On Thu, Jan 10, 2013 at 10:02 AM, LEVAI Daniel l...@ecentrum.hu wrote:

 On sze, jan 09, 2013 at 19:30:17 +0100, Landry Breuil wrote:
  On Wed, Jan 09, 2013 at 02:34:10PM +0100, LEVAI Daniel wrote:
   On sze, jan 09, 2013 at 10:35:00 +, Stuart Henderson wrote:
On 2013/01/09 10:11, LEVAI Daniel wrote:
   [...]
 I've been meaning to ask if it would be okay to drop the gnutls
 dep.,
 and switch bitlbee to OpenSSL. I've been using it with it since
 3.0 beta
 times and never had a problem, plus bitlbee would depend on one
 less pkg
 :) I'll cook up a diff if this can be considered.
   [...]
So because OpenSSL is in base, and bitlbee is distributed separately
in packages, I think we are OK there.
   [...]
 
  Fwiw that version with the libpurple flavor seems to work with
  jabber(+tls)  oscar. You might want to fix the depends though ;
 
  LIB_DEPENDS devel/silc-toolkit not needed for net/bitlbee,libpurple ?
  LIB_DEPENDS net/meanwhile not needed for net/bitlbee,libpurple ?
  LIB_DEPENDS net/libgadu not needed for net/bitlbee,libpurple ?

 That is right, those are pidgin,-libpurple depends.

 New diff:

 Index: Makefile
 ===
 RCS file: /cvs/ports/net/bitlbee/Makefile,v
 retrieving revision 1.46
 diff -p -u -r1.46 Makefile
 --- Makefile27 Nov 2012 15:40:56 -  1.46
 +++ Makefile10 Jan 2013 10:01:01 -
 @@ -2,7 +2,7 @@

  COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and
 Yahoo

 -DISTNAME=  bitlbee-3.0.6
 +DISTNAME=  bitlbee-3.2
  CATEGORIES=net

  HOMEPAGE=  http://bitlbee.org/
 @@ -15,8 +15,8 @@ PERMIT_PACKAGE_FTP=   Yes
  PERMIT_DISTFILES_CDROM=Yes
  PERMIT_DISTFILES_FTP=  Yes

 -WANTLIB += c pthread glib-2.0 gmodule-2.0 gnutls=13
 -WANTLIB += gcrypt gpg-error
 +WANTLIB += c pthread glib-2.0 gmodule-2.0 ssl crypto
 +WANTLIB += gcrypt

  MASTER_SITES=  http://get.bitlbee.org/src/

 @@ -29,7 +29,6 @@ DOCS= ${WRKSRC}/doc/user-guide/user-gu
  DOCDIR=${PREFIX}/share/doc/bitlbee/

  LIB_DEPENDS=   devel/glib2 \
 -   security/gnutls \
 security/libgcrypt

  CONFIGURE_STYLE=   simple
 @@ -37,7 +36,7 @@ CONFIGURE_ARGS+=  --bindir=${PREFIX}/libe
 --mandir=${PREFIX}/man \
 --config=${DB_DIR} \
 --etcdir=${ETCDIR} \
 -   --ssl=gnutls
 +   --ssl=openssl

  USE_GMAKE= Yes
  MAKE_ENV=  CC=${CC} CFLAGS=${CFLAGS}
 @@ -50,10 +49,7 @@ FLAVOR ?=

  .if ${FLAVOR:L:Mlibpurple}
  CONFIGURE_ARGS +=  --purple=1
 -LIB_DEPENDS += net/pidgin,-libpurple \
 -   devel/silc-toolkit \
 -   net/meanwhile \
 -   net/libgadu
 +LIB_DEPENDS += net/pidgin,-libpurple
  WANTLIB += purple
  .endif
  .if ${FLAVOR:L:Motr}
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/bitlbee/distinfo,v
 retrieving revision 1.23
 diff -p -u -r1.23 distinfo
 --- distinfo27 Nov 2012 15:40:56 -  1.23
 +++ distinfo10 Jan 2013 10:01:01 -
 @@ -1,2 +1,2 @@
 -SHA256 (bitlbee-3.0.6.tar.gz) =
 Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug=
 -SIZE (bitlbee-3.0.6.tar.gz) = 730918
 +SHA256 (bitlbee-3.2.tar.gz) =
 G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
 +SIZE (bitlbee-3.2.tar.gz) = 666404



 Daniel

 --
 LÉVAI Dániel
 PGP key ID = 0x83B63A8F
 Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: [UPDATE] net/bitlbee

[Landry Breuil]

On Sat, Jan 19, 2013 at 02:48:13PM -0500, Okan Demirmen wrote:
 Hi - Missed this thread; however, I see 1 or 2 diff's - is there one
 complete diff?  And on what networks/servers has the openssl switch
 been tested? (I don't have have accounts on all networks to test
 myself :))

Re ssl, i've only tested it against my $work jabber server running
prosody - with the purple flavor. Without it it doesnt seem to do proper
xmpp ping and disconnects me often, but that doesnt seem to be a
regression from what we have now.
The last diff with depends fixed is the one to test.

Landry

 On Thu, Jan 17, 2013 at 2:26 PM, Tom Doherty tomd2...@gmail.com wrote:
  I like it a lot. Okan? :-)
 
 
 
  On Thu, Jan 10, 2013 at 10:02 AM, LEVAI Daniel l...@ecentrum.hu wrote:
 
  On sze, jan 09, 2013 at 19:30:17 +0100, Landry Breuil wrote:
   On Wed, Jan 09, 2013 at 02:34:10PM +0100, LEVAI Daniel wrote:
On sze, jan 09, 2013 at 10:35:00 +, Stuart Henderson wrote:
 On 2013/01/09 10:11, LEVAI Daniel wrote:
[...]
  I've been meaning to ask if it would be okay to drop the gnutls
  dep.,
  and switch bitlbee to OpenSSL. I've been using it with it since
  3.0 beta
  times and never had a problem, plus bitlbee would depend on one
  less pkg
  :) I'll cook up a diff if this can be considered.
[...]
 So because OpenSSL is in base, and bitlbee is distributed separately
 in packages, I think we are OK there.
[...]
  
   Fwiw that version with the libpurple flavor seems to work with
   jabber(+tls)  oscar. You might want to fix the depends though ;
  
   LIB_DEPENDS devel/silc-toolkit not needed for net/bitlbee,libpurple ?
   LIB_DEPENDS net/meanwhile not needed for net/bitlbee,libpurple ?
   LIB_DEPENDS net/libgadu not needed for net/bitlbee,libpurple ?
 
  That is right, those are pidgin,-libpurple depends.
 
  New diff:
 
  Index: Makefile
  ===
  RCS file: /cvs/ports/net/bitlbee/Makefile,v
  retrieving revision 1.46
  diff -p -u -r1.46 Makefile
  --- Makefile27 Nov 2012 15:40:56 -  1.46
  +++ Makefile10 Jan 2013 10:01:01 -
  @@ -2,7 +2,7 @@
 
   COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and
  Yahoo
 
  -DISTNAME=  bitlbee-3.0.6
  +DISTNAME=  bitlbee-3.2
   CATEGORIES=net
 
   HOMEPAGE=  http://bitlbee.org/
  @@ -15,8 +15,8 @@ PERMIT_PACKAGE_FTP=   Yes
   PERMIT_DISTFILES_CDROM=Yes
   PERMIT_DISTFILES_FTP=  Yes
 
  -WANTLIB += c pthread glib-2.0 gmodule-2.0 gnutls=13
  -WANTLIB += gcrypt gpg-error
  +WANTLIB += c pthread glib-2.0 gmodule-2.0 ssl crypto
  +WANTLIB += gcrypt
 
   MASTER_SITES=  http://get.bitlbee.org/src/
 
  @@ -29,7 +29,6 @@ DOCS= ${WRKSRC}/doc/user-guide/user-gu
   DOCDIR=${PREFIX}/share/doc/bitlbee/
 
   LIB_DEPENDS=   devel/glib2 \
  -   security/gnutls \
  security/libgcrypt
 
   CONFIGURE_STYLE=   simple
  @@ -37,7 +36,7 @@ CONFIGURE_ARGS+=  --bindir=${PREFIX}/libe
  --mandir=${PREFIX}/man \
  --config=${DB_DIR} \
  --etcdir=${ETCDIR} \
  -   --ssl=gnutls
  +   --ssl=openssl
 
   USE_GMAKE= Yes
   MAKE_ENV=  CC=${CC} CFLAGS=${CFLAGS}
  @@ -50,10 +49,7 @@ FLAVOR ?=
 
   .if ${FLAVOR:L:Mlibpurple}
   CONFIGURE_ARGS +=  --purple=1
  -LIB_DEPENDS += net/pidgin,-libpurple \
  -   devel/silc-toolkit \
  -   net/meanwhile \
  -   net/libgadu
  +LIB_DEPENDS += net/pidgin,-libpurple
   WANTLIB += purple
   .endif
   .if ${FLAVOR:L:Motr}
  Index: distinfo
  ===
  RCS file: /cvs/ports/net/bitlbee/distinfo,v
  retrieving revision 1.23
  diff -p -u -r1.23 distinfo
  --- distinfo27 Nov 2012 15:40:56 -  1.23
  +++ distinfo10 Jan 2013 10:01:01 -
  @@ -1,2 +1,2 @@
  -SHA256 (bitlbee-3.0.6.tar.gz) =
  Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug=
  -SIZE (bitlbee-3.0.6.tar.gz) = 730918
  +SHA256 (bitlbee-3.2.tar.gz) =
  G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
  +SIZE (bitlbee-3.2.tar.gz) = 666404
 
 
 
  Daniel
 
  --
  LÉVAI Dániel
  PGP key ID = 0x83B63A8F
  Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F
 
 
 

Re: [UPDATE] net/bitlbee

[Tom Doherty]

I like it a lot. Okan? :-)



On Thu, Jan 10, 2013 at 10:02 AM, LEVAI Daniel l...@ecentrum.hu wrote:

 On sze, jan 09, 2013 at 19:30:17 +0100, Landry Breuil wrote:
  On Wed, Jan 09, 2013 at 02:34:10PM +0100, LEVAI Daniel wrote:
   On sze, jan 09, 2013 at 10:35:00 +, Stuart Henderson wrote:
On 2013/01/09 10:11, LEVAI Daniel wrote:
   [...]
 I've been meaning to ask if it would be okay to drop the gnutls
 dep.,
 and switch bitlbee to OpenSSL. I've been using it with it since
 3.0 beta
 times and never had a problem, plus bitlbee would depend on one
 less pkg
 :) I'll cook up a diff if this can be considered.
   [...]
So because OpenSSL is in base, and bitlbee is distributed separately
in packages, I think we are OK there.
   [...]
 
  Fwiw that version with the libpurple flavor seems to work with
  jabber(+tls)  oscar. You might want to fix the depends though ;
 
  LIB_DEPENDS devel/silc-toolkit not needed for net/bitlbee,libpurple ?
  LIB_DEPENDS net/meanwhile not needed for net/bitlbee,libpurple ?
  LIB_DEPENDS net/libgadu not needed for net/bitlbee,libpurple ?

 That is right, those are pidgin,-libpurple depends.

 New diff:

 Index: Makefile
 ===
 RCS file: /cvs/ports/net/bitlbee/Makefile,v
 retrieving revision 1.46
 diff -p -u -r1.46 Makefile
 --- Makefile27 Nov 2012 15:40:56 -  1.46
 +++ Makefile10 Jan 2013 10:01:01 -
 @@ -2,7 +2,7 @@

  COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and
 Yahoo

 -DISTNAME=  bitlbee-3.0.6
 +DISTNAME=  bitlbee-3.2
  CATEGORIES=net

  HOMEPAGE=  http://bitlbee.org/
 @@ -15,8 +15,8 @@ PERMIT_PACKAGE_FTP=   Yes
  PERMIT_DISTFILES_CDROM=Yes
  PERMIT_DISTFILES_FTP=  Yes

 -WANTLIB += c pthread glib-2.0 gmodule-2.0 gnutls=13
 -WANTLIB += gcrypt gpg-error
 +WANTLIB += c pthread glib-2.0 gmodule-2.0 ssl crypto
 +WANTLIB += gcrypt

  MASTER_SITES=  http://get.bitlbee.org/src/

 @@ -29,7 +29,6 @@ DOCS= ${WRKSRC}/doc/user-guide/user-gu
  DOCDIR=${PREFIX}/share/doc/bitlbee/

  LIB_DEPENDS=   devel/glib2 \
 -   security/gnutls \
 security/libgcrypt

  CONFIGURE_STYLE=   simple
 @@ -37,7 +36,7 @@ CONFIGURE_ARGS+=  --bindir=${PREFIX}/libe
 --mandir=${PREFIX}/man \
 --config=${DB_DIR} \
 --etcdir=${ETCDIR} \
 -   --ssl=gnutls
 +   --ssl=openssl

  USE_GMAKE= Yes
  MAKE_ENV=  CC=${CC} CFLAGS=${CFLAGS}
 @@ -50,10 +49,7 @@ FLAVOR ?=

  .if ${FLAVOR:L:Mlibpurple}
  CONFIGURE_ARGS +=  --purple=1
 -LIB_DEPENDS += net/pidgin,-libpurple \
 -   devel/silc-toolkit \
 -   net/meanwhile \
 -   net/libgadu
 +LIB_DEPENDS += net/pidgin,-libpurple
  WANTLIB += purple
  .endif
  .if ${FLAVOR:L:Motr}
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/bitlbee/distinfo,v
 retrieving revision 1.23
 diff -p -u -r1.23 distinfo
 --- distinfo27 Nov 2012 15:40:56 -  1.23
 +++ distinfo10 Jan 2013 10:01:01 -
 @@ -1,2 +1,2 @@
 -SHA256 (bitlbee-3.0.6.tar.gz) =
 Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug=
 -SIZE (bitlbee-3.0.6.tar.gz) = 730918
 +SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
 +SIZE (bitlbee-3.2.tar.gz) = 666404



 Daniel

 --
 LÉVAI Dániel
 PGP key ID = 0x83B63A8F
 Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: [UPDATE] net/bitlbee

[LEVAI Daniel]

On sze, jan 09, 2013 at 19:30:17 +0100, Landry Breuil wrote:
 On Wed, Jan 09, 2013 at 02:34:10PM +0100, LEVAI Daniel wrote:
  On sze, jan 09, 2013 at 10:35:00 +, Stuart Henderson wrote:
   On 2013/01/09 10:11, LEVAI Daniel wrote:
  [...]
I've been meaning to ask if it would be okay to drop the gnutls dep.,
and switch bitlbee to OpenSSL. I've been using it with it since 3.0 beta
times and never had a problem, plus bitlbee would depend on one less pkg
:) I'll cook up a diff if this can be considered.
  [...]
   So because OpenSSL is in base, and bitlbee is distributed separately
   in packages, I think we are OK there.
  [...]
 
 Fwiw that version with the libpurple flavor seems to work with
 jabber(+tls)  oscar. You might want to fix the depends though ;
 
 LIB_DEPENDS devel/silc-toolkit not needed for net/bitlbee,libpurple ?
 LIB_DEPENDS net/meanwhile not needed for net/bitlbee,libpurple ?
 LIB_DEPENDS net/libgadu not needed for net/bitlbee,libpurple ?

That is right, those are pidgin,-libpurple depends.

New diff:

Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.46
diff -p -u -r1.46 Makefile
--- Makefile27 Nov 2012 15:40:56 -  1.46
+++ Makefile10 Jan 2013 10:01:01 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.0.6
+DISTNAME=  bitlbee-3.2
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
@@ -15,8 +15,8 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB += c pthread glib-2.0 gmodule-2.0 gnutls=13
-WANTLIB += gcrypt gpg-error
+WANTLIB += c pthread glib-2.0 gmodule-2.0 ssl crypto
+WANTLIB += gcrypt
 
 MASTER_SITES=  http://get.bitlbee.org/src/
 
@@ -29,7 +29,6 @@ DOCS= ${WRKSRC}/doc/user-guide/user-gu
 DOCDIR=${PREFIX}/share/doc/bitlbee/
 
 LIB_DEPENDS=   devel/glib2 \
-   security/gnutls \
security/libgcrypt
 
 CONFIGURE_STYLE=   simple
@@ -37,7 +36,7 @@ CONFIGURE_ARGS+=  --bindir=${PREFIX}/libe
--mandir=${PREFIX}/man \
--config=${DB_DIR} \
--etcdir=${ETCDIR} \
-   --ssl=gnutls
+   --ssl=openssl
 
 USE_GMAKE= Yes
 MAKE_ENV=  CC=${CC} CFLAGS=${CFLAGS}
@@ -50,10 +49,7 @@ FLAVOR ?=
 
 .if ${FLAVOR:L:Mlibpurple}
 CONFIGURE_ARGS +=  --purple=1
-LIB_DEPENDS += net/pidgin,-libpurple \
-   devel/silc-toolkit \
-   net/meanwhile \
-   net/libgadu
+LIB_DEPENDS += net/pidgin,-libpurple
 WANTLIB += purple
 .endif
 .if ${FLAVOR:L:Motr}
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.23
diff -p -u -r1.23 distinfo
--- distinfo27 Nov 2012 15:40:56 -  1.23
+++ distinfo10 Jan 2013 10:01:01 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.0.6.tar.gz) = Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug=
-SIZE (bitlbee-3.0.6.tar.gz) = 730918
+SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
+SIZE (bitlbee-3.2.tar.gz) = 666404



Daniel

-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: [UPDATE] net/bitlbee

[LEVAI Daniel]

On k, jan 08, 2013 at 21:36:53 +, Tom Doherty wrote:
 Hi
 Update net/bitlbee to 3.2:
[...]
 Works for me with msn/jabber/oscar/sipe
[...]

Hi!

It seems that this works here also; only tested msn, jabber and oscar
protocols with the otr flavor.

I've been meaning to ask if it would be okay to drop the gnutls dep.,
and switch bitlbee to OpenSSL. I've been using it with it since 3.0 beta
times and never had a problem, plus bitlbee would depend on one less pkg
:) I'll cook up a diff if this can be considered.


Daniel

-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: [UPDATE] net/bitlbee

[Stuart Henderson]

On 2013/01/09 10:11, LEVAI Daniel wrote:
 On k, jan 08, 2013 at 21:36:53 +, Tom Doherty wrote:
  Hi
  Update net/bitlbee to 3.2:
 [...]
  Works for me with msn/jabber/oscar/sipe
 [...]
 
 Hi!
 
 It seems that this works here also; only tested msn, jabber and oscar
 protocols with the otr flavor.
 
 I've been meaning to ask if it would be okay to drop the gnutls dep.,
 and switch bitlbee to OpenSSL. I've been using it with it since 3.0 beta
 times and never had a problem, plus bitlbee would depend on one less pkg
 :) I'll cook up a diff if this can be considered.

I think that would be alright as the GPL has a clause like this:

anything that is normally distributed...with the major components...of
the operating system on which the executable runs, unless that
component itself accompanies the executable.

So because OpenSSL is in base, and bitlbee is distributed separately
in packages, I think we are OK there.

(if it were not for this, we couldn't distribute packages, as GPL is
incompatible with the OpenSSL license; this is why several GPL projects
have specific exemptions for linking against OpenSSL).

Re: [UPDATE] net/bitlbee

[LEVAI Daniel]

On sze, jan 09, 2013 at 10:35:00 +, Stuart Henderson wrote:
 On 2013/01/09 10:11, LEVAI Daniel wrote:
[...]
  I've been meaning to ask if it would be okay to drop the gnutls dep.,
  and switch bitlbee to OpenSSL. I've been using it with it since 3.0 beta
  times and never had a problem, plus bitlbee would depend on one less pkg
  :) I'll cook up a diff if this can be considered.
[...]
 So because OpenSSL is in base, and bitlbee is distributed separately
 in packages, I think we are OK there.
[...]



Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.46
diff -p -u -r1.46 Makefile
--- Makefile27 Nov 2012 15:40:56 -  1.46
+++ Makefile9 Jan 2013 13:08:08 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.0.6
+DISTNAME=  bitlbee-3.2
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
@@ -15,8 +15,8 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB += c pthread glib-2.0 gmodule-2.0 gnutls=13
-WANTLIB += gcrypt gpg-error
+WANTLIB += c pthread glib-2.0 gmodule-2.0 ssl crypto
+WANTLIB += gcrypt
 
 MASTER_SITES=  http://get.bitlbee.org/src/
 
@@ -29,7 +29,6 @@ DOCS= ${WRKSRC}/doc/user-guide/user-gu
 DOCDIR=${PREFIX}/share/doc/bitlbee/
 
 LIB_DEPENDS=   devel/glib2 \
-   security/gnutls \
security/libgcrypt
 
 CONFIGURE_STYLE=   simple
@@ -37,7 +36,7 @@ CONFIGURE_ARGS+=  --bindir=${PREFIX}/libe
--mandir=${PREFIX}/man \
--config=${DB_DIR} \
--etcdir=${ETCDIR} \
-   --ssl=gnutls
+   --ssl=openssl
 
 USE_GMAKE= Yes
 MAKE_ENV=  CC=${CC} CFLAGS=${CFLAGS}
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.23
diff -p -u -r1.23 distinfo
--- distinfo27 Nov 2012 15:40:56 -  1.23
+++ distinfo9 Jan 2013 13:08:08 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.0.6.tar.gz) = Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug=
-SIZE (bitlbee-3.0.6.tar.gz) = 730918
+SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
+SIZE (bitlbee-3.2.tar.gz) = 666404



Daniel


-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: [UPDATE] net/bitlbee

[Landry Breuil]

On Wed, Jan 09, 2013 at 02:34:10PM +0100, LEVAI Daniel wrote:
 On sze, jan 09, 2013 at 10:35:00 +, Stuart Henderson wrote:
  On 2013/01/09 10:11, LEVAI Daniel wrote:
 [...]
   I've been meaning to ask if it would be okay to drop the gnutls dep.,
   and switch bitlbee to OpenSSL. I've been using it with it since 3.0 beta
   times and never had a problem, plus bitlbee would depend on one less pkg
   :) I'll cook up a diff if this can be considered.
 [...]
  So because OpenSSL is in base, and bitlbee is distributed separately
  in packages, I think we are OK there.
 [...]

Fwiw that version with the libpurple flavor seems to work with
jabber(+tls)  oscar. You might want to fix the depends though ;

LIB_DEPENDS devel/silc-toolkit not needed for net/bitlbee,libpurple ?
LIB_DEPENDS net/meanwhile not needed for net/bitlbee,libpurple ?
LIB_DEPENDS net/libgadu not needed for net/bitlbee,libpurple ?

Landry

[UPDATE] net/bitlbee

[Tom Doherty]

Hi
Update net/bitlbee to 3.2:

Version 3.2 (released 2013-01-06) hilights:
Updated Twitter module. Support for Twitter API 1.1, streaming API, direct 
messages and some other improvements.
Fixed potential connection issue to Google Talk, OpenFire, possibly other 
Jabber services.
A bunch of other things.

Version 3.0.6 (released 2012-10-14) hilights:
Updated MSN module, now speaking the MSNP18 protocol. This adds support for 
MPOP and also fixes sending off-line messages.
Loads of bugfixes, etc. accumulated over the last half a year.

Version 3.0.5 (released 2012-02-18) hilights:
OAuth2 support for Google Talk, Facebook chat and MSN Messenger (via XMPP).
SSL certificate verification (edit your bitlbee.conf to enable it). Works only 
with GnuTLS!
Loads of bugfixes, etc.

Version 3.0.4 (released 2011-12-04) hilights:
Fixed MSN Messenger login issues.
Twitter improvements: Fetch mentions, show originals of t.co shortened links.
Merged the Skype plugin.

Version 3.0.3 (released 2011-06-12) hilights:
Twitter fixes (Twitter deprecated the API call BitlBee used to fetch the 
contact list).
Twitter enhancement: Ability to RT/reply to older tweets from someone (help set 
show_ids).
Lots of other small stuff.

Version 3.0.2 (released 2011-03-07) hilights:
MSN login fixes (@msn.com compatibility).
CTCP support, /CTCP VERSION on Jabber contacts and /CTCP NUDGE on MSN contacts 
(overuse this feature and I'll remove it again :-P).
The usual bugfixes/improvements.

Version 3.0.1 (released 2010-11-24) hilights:
MSN login fixes, Jabber (3.0 had a bug that made Jabber contacts never go 
offline), some other minor IM module fixes (including the new default ICQ login 
server).
Fixed build issues on some non-Linux systems.
Minor bugfixes/improvements.

Version 3.0 (released 2010-10-22) hilights:
Lots of stuff, see the development version below.
MSN protocol module was rewritten. This fixes some problems many people were 
having with the old code lately, and adds support for things like status 
messages and offline messages.
The bitlbee-otr branch is now merged into mainline, which means you can compile 
BitlBee with OTR encryption support, if you want, without any need for 
patches/alternative branches.
Many more fixes, small changes, etc. Just read the full non-bzr changelog for 
all details.
Development version 1.3dev (released 2010-08-06) hilights:
Too much to mention here, see the Wiki and doc/CHANGES for more details.
IRC core completely rewritten. This adds support for multiple configurable 
control channels (for example one channel per group, one per IM 
account/protocol, a channel with just your offline contacts), easier groupchat 
support, more flexibility in how nicknames are generated, and finally you can 
easily change your nickname whenever you want.
The ability to use libpurple instead of the built-in code. This adds support 
for more IM protocols and more features. Possibly less stable and lightweight, 
so by default the built-in code will still be used.
Support for file transfers.

Works for me with msn/jabber/oscar/sipe

Cheers
Tom


Index: Makefile
===
RCS file: /cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.46
diff -u Makefile
--- Makefile27 Nov 2012 15:40:56 -  1.46
+++ Makefile8 Jan 2013 21:33:32 -
@@ -2,7 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.0.6
+DISTNAME=  bitlbee-3.2
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
Index: distinfo
===
RCS file: /cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.23
diff -u distinfo
--- distinfo27 Nov 2012 15:40:56 -  1.23
+++ distinfo8 Jan 2013 21:33:32 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.0.6.tar.gz) = Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug=
-SIZE (bitlbee-3.0.6.tar.gz) = 730918
+SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA=
+SIZE (bitlbee-3.2.tar.gz) = 666404

update: net/bitlbee

[Okan Demirmen]

update to 3.0.4.

testing, comments and oks.

cheers,
okan

Index: Makefile
===
RCS file: /home/okan/openbsd/cvs/ports/net/bitlbee/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile3 Oct 2011 14:41:45 -   1.41
+++ Makefile15 Dec 2011 16:51:52 -
@@ -2,8 +2,7 @@
 
 COMMENT=   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
-DISTNAME=  bitlbee-3.0.3
-REVISION=  0
+DISTNAME=  bitlbee-3.0.4
 CATEGORIES=net
 
 HOMEPAGE=  http://bitlbee.org/
Index: distinfo
===
RCS file: /home/okan/openbsd/cvs/ports/net/bitlbee/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo3 Oct 2011 14:33:14 -   1.20
+++ distinfo15 Dec 2011 16:43:52 -
@@ -1,5 +1,5 @@
-MD5 (bitlbee-3.0.3.tar.gz) = T+aI46gO/gEXQ/TJJlwDEA==
-RMD160 (bitlbee-3.0.3.tar.gz) = S1N4ce7xu1toORBbx7yfJWfluOE=
-SHA1 (bitlbee-3.0.3.tar.gz) = QUDreqosajn6BZ0Z+PuuwNeh6/8=
-SHA256 (bitlbee-3.0.3.tar.gz) = gsp1iTfOe+2qtJ7ex19K1FoxAqw76qkytkw0+7HjryU=
-SIZE (bitlbee-3.0.3.tar.gz) = 676417
+MD5 (bitlbee-3.0.4.tar.gz) = PrHj4wwBWIXGQVA+7EsFyw==
+RMD160 (bitlbee-3.0.4.tar.gz) = zWskT5XiZvbBw+JcNldS/t/ABic=
+SHA1 (bitlbee-3.0.4.tar.gz) = LCdClI0e0sg+5dstL7/16LZWuMQ=
+SHA256 (bitlbee-3.0.4.tar.gz) = ZHiOfvehddzakV+tOo5BmQzkvuPM27S/sKLVp4cpzNs=
+SIZE (bitlbee-3.0.4.tar.gz) = 744599

Re: update: net/bitlbee

[LEVAI Daniel]

On cs, dec 15, 2011 at 16:54:42 -0500, Okan Demirmen wrote:
 update to 3.0.4.
 
 testing, comments and oks.
 

Working great on i386. I've been using it for a solid week now, with the
otr flavor. Tested with Jabber, MSN, iCQ, and no problem so far.


Daniel

-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: UPDATE: net/bitlbee

[viq]

i386 current from Feb 19, compiled and upgraded fine, added account for jabber 
via ssl, that and MSN connection seem to work.

-- 
viq

-
Toshiba i FIFA World Cup
Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology
http://link.interia.pl/f1912

Re: UPDATE: net/bitlbee

[Josh Rivel]

Seems to be working fine for me, i386-current as of Feb 26th.
Thanks!

Josh

Re: UPDATE: net/bitlbee

[Will Maier]

On Tue, Mar 07, 2006 at 08:19:59AM +1100, Andrew Dalgleish wrote:
 I used 'cvs diff -uwN' instead of 'cvs diff -uN'.
 Faulty finger macros.

Patched port upgrades just fine. Jabber, AIM and Yahoo transports
all appear to be working (as is Google Chat); SSL is enabled.

Thanks, Andrew!

# uname -a
OpenBSD merkur.atekomi.net 3.8 GENERIC#0 i386
# pkg_info | grep bitl
bitlbee-1.0.1   IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo

-- 

o--{ Will Maier }--o
| jabber:[EMAIL PROTECTED] | [EMAIL PROTECTED] |
| freenode:..lt_kije | freenode:#madlug,#wilug |
*--[ BSD Unix: Live Free or Die ]--*