bitlbee: update to 3.5.1

11 files changed, 30 insertions, 153 deletions

diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 59ede8f3d..dae6d01c4 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		bitlbee
-PKG_VERSION:=		3.0.1
+PKG_VERSION:=		3.5.1
 PKG_RELEASE:=		1
-PKG_HASH:=		408a737b35db4b9c407e3db09b2d2e7b528836a68e2d783373254b78812bf608
+PKG_HASH:=		9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69
 PKG_DESCR:=		irc gateway to im chat networks
 PKG_SECTION:=		app/chat
 PKG_DEPENDS:=		glib libressl
diff --git a/package/bitlbee/patches/patch-Makefile b/package/bitlbee/patches/patch-Makefile
deleted file mode 100644
index d5f501a7f..000000000
--- a/package/bitlbee/patches/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- bitlbee-3.0.1.orig/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/Makefile	2011-03-03 22:44:43.000000000 +0100
-@@ -120,17 +120,17 @@ $(subdirs):
- 
- $(OTR_PI): %.so: $(SRCDIR)%.c
- 	@echo '*' Building plugin $@
--	@$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $< -o $@
-+	$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $< -o $@
- 
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- $(objects): Makefile Makefile.settings config.h
- 
- $(OUTFILE): $(objects) $(subdirs)
- 	@echo '*' Linking $(OUTFILE)
--	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS)
-+	$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS)
- ifndef DEBUG
- 	@echo '*' Stripping $(OUTFILE)
- 	@-$(STRIP) $(OUTFILE)
diff --git a/package/bitlbee/patches/patch-configure b/package/bitlbee/patches/patch-configure
deleted file mode 100644
index 72b91af09..000000000
--- a/package/bitlbee/patches/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
---- bitlbee-3.0.1.orig/configure	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/configure	2011-03-03 22:36:43.000000000 +0100
-@@ -171,12 +171,9 @@ EOF
- 
- 
- if [ -n "$target" ]; then
--	PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
--	export PKG_CONFIG_LIBDIR
- 	PATH=/usr/$target/bin:$PATH
--	CC=$target-cc
-+	CC=$target-gcc
- 	LD=$target-ld
--	systemlibdirs="/usr/$target/lib"
- fi
- 
- 
-@@ -225,7 +222,7 @@ if [ -z "$PKG_CONFIG" ]; then
- 	PKG_CONFIG=pkg-config
- fi
- 
--if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
-+if $PKG_CONFIG --version && $PKG_CONFIG glib-2.0; then
- 	if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
- 		cat<<EOF>>Makefile.settings
- EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile
index 3d15131d8..f55340876 100644
--- a/package/bitlbee/patches/patch-lib_Makefile
+++ b/package/bitlbee/patches/patch-lib_Makefile
@@ -1,26 +1,20 @@
---- bitlbee-3.0.1.orig/lib/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/lib/Makefile	2011-03-03 22:39:24.000000000 +0100
+--- bitlbee-3.5.1.orig/lib/Makefile	2017-01-30 21:45:59.000000000 +0100
++++ bitlbee-3.5.1/lib/Makefile	2017-05-20 12:20:09.898551807 +0200
 @@ -14,7 +14,7 @@ endif
  # [SH] Program variables
- objects = arc.o base64.o $(DES) $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+ objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
  
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: lib.o
-@@ -35,12 +35,12 @@ distclean: clean $(subdirs)
+@@ -35,7 +35,7 @@ distclean: clean $(subdirs)
  
  lib.o: $(objects) $(subdirs)
  	@echo '*' Linking lib.o
 -	@$(LD) $(LFLAGS) $(objects) -o lib.o
-+	$(CC) $(LFLAGS) $(objects) -o lib.o
++	@$(CC) $(LFLAGS) $(objects) -o lib.o
  
  $(objects): ../Makefile.settings Makefile
  
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile
index 2608b77b0..77ce80f3d 100644
--- a/package/bitlbee/patches/patch-protocols_Makefile
+++ b/package/bitlbee/patches/patch-protocols_Makefile
@@ -1,5 +1,5 @@
---- bitlbee-3.0.1.orig/protocols/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/protocols/Makefile	2011-03-03 22:43:33.000000000 +0100
+--- bitlbee-3.5.1.orig/protocols/Makefile	2017-01-30 21:45:59.000000000 +0100
++++ bitlbee-3.5.1/protocols/Makefile	2017-05-20 12:17:34.748567834 +0200
 @@ -24,7 +24,7 @@ subdirobjs = $(PROTOOBJS)
  
  # Expansion of variables
@@ -9,18 +9,12 @@
  
  # [SH] Phony targets
  all: protocols.o
-@@ -48,12 +48,12 @@ $(subdirs):
+@@ -48,7 +48,7 @@ $(subdirs):
  
  protocols.o: $(objects) $(subdirs)
  	@echo '*' Linking protocols.o
 -	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
-+	$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
++	@$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
  
  $(objects): ../Makefile.settings Makefile
  
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile
index 0e227dcca..9bf83badc 100644
--- a/package/bitlbee/patches/patch-protocols_jabber_Makefile
+++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile
@@ -1,24 +1,19 @@
---- bitlbee-3.0.1.orig/protocols/jabber/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/protocols/jabber/Makefile	2011-03-03 22:41:38.000000000 +0100
+--- bitlbee-3.5.1.orig/protocols/jabber/Makefile	2017-01-30 21:45:59.000000000 +0100
++++ bitlbee-3.5.1/protocols/jabber/Makefile	2017-05-20 12:15:26.360306005 +0200
 @@ -14,7 +14,7 @@ endif
  # [SH] Program variables
- objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o
+ objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o hipchat.o
  
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: jabber_mod.o
-@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
+@@ -41,6 +41,6 @@ $(objects): %.o: $(_SRCDIR_)%.c
  
  jabber_mod.o: $(objects)
  	@echo '*' Linking jabber_mod.o
 -	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
-+	$(CC) $(LFLAGS) $(objects) -o jabber_mod.o
++	@$(CC) $(LFLAGS) $(objects) -o jabber_mod.o
  
  -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile
index 2d0081117..b2b730cc7 100644
--- a/package/bitlbee/patches/patch-protocols_msn_Makefile
+++ b/package/bitlbee/patches/patch-protocols_msn_Makefile
@@ -1,24 +1,19 @@
---- bitlbee-3.0.1.orig/protocols/msn/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/protocols/msn/Makefile	2011-03-03 22:41:12.000000000 +0100
+--- bitlbee-3.5.1.orig/protocols/msn/Makefile	2017-01-30 21:45:59.000000000 +0100
++++ bitlbee-3.5.1/protocols/msn/Makefile	2017-05-20 12:15:47.329655386 +0200
 @@ -14,7 +14,7 @@ endif
  # [SH] Program variables
- objects = msn.o msn_util.o ns.o sb.o soap.o tables.o
+ objects = msn.o msn_util.o ns.o soap.o tables.o gw.o
  
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: msn_mod.o
-@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
+@@ -41,6 +41,6 @@ $(objects): %.o: $(_SRCDIR_)%.c
  
  msn_mod.o: $(objects)
  	@echo '*' Linking msn_mod.o
 -	@$(LD) $(LFLAGS) $(objects) -o msn_mod.o
-+	$(CC) $(LFLAGS) $(objects) -o msn_mod.o
++	@$(CC) $(LFLAGS) $(objects) -o msn_mod.o
  
  -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile
index c11eaea1c..b9dcedf9f 100644
--- a/package/bitlbee/patches/patch-protocols_oscar_Makefile
+++ b/package/bitlbee/patches/patch-protocols_oscar_Makefile
@@ -1,5 +1,5 @@
---- bitlbee-3.0.1.orig/protocols/oscar/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/protocols/oscar/Makefile	2011-03-03 22:40:43.000000000 +0100
+--- bitlbee-3.5.1.orig/protocols/oscar/Makefile	2017-01-30 21:45:59.000000000 +0100
++++ bitlbee-3.5.1/protocols/oscar/Makefile	2017-05-20 12:16:09.175061142 +0200
 @@ -15,7 +15,7 @@ endif
  # [SH] Program variables
  objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
@@ -11,10 +11,10 @@
  all: oscar_mod.o
 @@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Make
  
- $(objects): %.o: $(SRCDIR)%.c
+ $(objects): %.o: $(_SRCDIR_)%.c
  	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
+-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
++	$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
  
  oscar_mod.o: $(objects)
  	@echo '*' Linking oscar_mod.o
diff --git a/package/bitlbee/patches/patch-protocols_purple_Makefile b/package/bitlbee/patches/patch-protocols_purple_Makefile
deleted file mode 100644
index 81be67309..000000000
--- a/package/bitlbee/patches/patch-protocols_purple_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- bitlbee-3.0.1.orig/protocols/purple/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/protocols/purple/Makefile	2011-03-03 22:42:10.000000000 +0100
-@@ -15,7 +15,7 @@ endif
- objects = ft.o purple.o
- 
- CFLAGS += -Wall $(PURPLE_CFLAGS)
--LFLAGS += -r
-+LFLAGS += -Wl,-r -nostdlib
- 
- # [SH] Phony targets
- all: purple_mod.o
-@@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- purple_mod.o: $(objects)
- 	@echo '*' Linking purple_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o purple_mod.o
-+	$(CC) $(LFLAGS) $(objects) -o purple_mod.o
- 
- -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_twitter_Makefile b/package/bitlbee/patches/patch-protocols_twitter_Makefile
index b51c8d2e2..1dba18e51 100644
--- a/package/bitlbee/patches/patch-protocols_twitter_Makefile
+++ b/package/bitlbee/patches/patch-protocols_twitter_Makefile
@@ -1,5 +1,5 @@
---- bitlbee-3.0.1.orig/protocols/twitter/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/protocols/twitter/Makefile	2011-03-03 22:42:34.000000000 +0100
+--- bitlbee-3.5.1.orig/protocols/twitter/Makefile	2017-01-30 21:45:59.000000000 +0100
++++ bitlbee-3.5.1/protocols/twitter/Makefile	2017-05-20 12:16:01.590573095 +0200
 @@ -14,7 +14,7 @@ endif
  # [SH] Program variables
  objects = twitter.o twitter_http.o twitter_lib.o
@@ -9,16 +9,11 @@
  
  # [SH] Phony targets
  all: twitter_mod.o
-@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
+@@ -41,6 +41,6 @@ $(objects): %.o: $(_SRCDIR_)%.c
  
  twitter_mod.o: $(objects)
  	@echo '*' Linking twitter_mod.o
 -	@$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
-+	$(CC) $(LFLAGS) $(objects) -o twitter_mod.o
++	@$(CC) $(LFLAGS) $(objects) -o twitter_mod.o
  	
  -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_yahoo_Makefile b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
deleted file mode 100644
index 4a5a7b72a..000000000
--- a/package/bitlbee/patches/patch-protocols_yahoo_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- bitlbee-3.0.1.orig/protocols/yahoo/Makefile	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/protocols/yahoo/Makefile	2011-03-03 22:40:20.000000000 +0100
-@@ -15,7 +15,7 @@ endif
- objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
- 
- CFLAGS += -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
--LFLAGS += -r
-+LFLAGS += -Wl,-r -nostdlib
- 
- # [SH] Phony targets
- all: yahoo_mod.o
-@@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: $(SRCDIR)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- yahoo_mod.o: $(objects)
- 	@echo '*' Linking yahoo_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
-+	$(CC) $(LFLAGS) $(objects) -o yahoo_mod.o
- 
- -include .depend/*.d