bitlbee: update to 3.6

7 files changed, 20 insertions, 62 deletions

diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index dae6d01c4..d9a8cf6b8 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		bitlbee
-PKG_VERSION:=		3.5.1
+PKG_VERSION:=		3.6
 PKG_RELEASE:=		1
-PKG_HASH:=		9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69
+PKG_HASH:=		9f15de46f29b46bf1e39fc50bdf4515e71b17f551f3955094c5da792d962107e
 PKG_DESCR:=		irc gateway to im chat networks
 PKG_SECTION:=		app/chat
 PKG_DEPENDS:=		glib libressl
@@ -35,6 +35,7 @@ CONFIGURE_ARGS:=	--target=${GNU_TARGET_NAME} \
 			--ipv6=1 \
 			--ssl=openssl
 INSTALL_TARGET=		install-etc install-bin
+XAKE_ENV+=		VERBOSE=1
 
 post-configure:
 	@echo 'CFLAGS+="-I${STAGING_TARGET_DIR}/usr/include/iconv"' >> \
diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile
index f55340876..a0f65192c 100644
--- a/package/bitlbee/patches/patch-lib_Makefile
+++ b/package/bitlbee/patches/patch-lib_Makefile
@@ -1,8 +1,8 @@
---- 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
+--- bitlbee-3.6.orig/lib/Makefile	2019-02-07 20:53:38.000000000 +0100
++++ bitlbee-3.6/lib/Makefile	2024-02-14 17:50:24.243531011 +0100
 @@ -14,7 +14,7 @@ endif
  # [SH] Program variables
- 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
+ objects = arc.o base64.o canohost.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
@@ -13,8 +13,8 @@
  
  lib.o: $(objects) $(subdirs)
  	@echo '*' Linking lib.o
--	@$(LD) $(LFLAGS) $(objects) -o lib.o
-+	@$(CC) $(LFLAGS) $(objects) -o lib.o
+-	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o
++	$(VERBOSE) $(CC) $(LFLAGS) $(objects) -o lib.o
  
  $(objects): ../Makefile.settings Makefile
  
diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile
index 77ce80f3d..80407a7e6 100644
--- a/package/bitlbee/patches/patch-protocols_Makefile
+++ b/package/bitlbee/patches/patch-protocols_Makefile
@@ -1,5 +1,5 @@
---- 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
+--- bitlbee-3.6.orig/protocols/Makefile	2019-02-07 20:53:38.000000000 +0100
++++ bitlbee-3.6/protocols/Makefile	2024-02-14 17:50:36.259530848 +0100
 @@ -24,7 +24,7 @@ subdirobjs = $(PROTOOBJS)
  
  # Expansion of variables
@@ -13,8 +13,8 @@
  
  protocols.o: $(objects) $(subdirs)
  	@echo '*' Linking protocols.o
--	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
-+	@$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
+-	$(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
++	$(VERBOSE) $(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
  
  $(objects): ../Makefile.settings Makefile
  
diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile
index 9bf83badc..3eca97198 100644
--- a/package/bitlbee/patches/patch-protocols_jabber_Makefile
+++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile
@@ -1,5 +1,5 @@
---- 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
+--- bitlbee-3.6.orig/protocols/jabber/Makefile	2019-02-07 20:53:38.000000000 +0100
++++ bitlbee-3.6/protocols/jabber/Makefile	2024-02-14 17:50:47.363530697 +0100
 @@ -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 hipchat.o
@@ -13,7 +13,7 @@
  
  jabber_mod.o: $(objects)
  	@echo '*' Linking jabber_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
-+	@$(CC) $(LFLAGS) $(objects) -o jabber_mod.o
+-	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
++	$(VERBOSE) $(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
deleted file mode 100644
index b2b730cc7..000000000
--- a/package/bitlbee/patches/patch-protocols_msn_Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 soap.o tables.o gw.o
- 
--LFLAGS += -r
-+LFLAGS += -Wl,-r -nostdlib
- 
- # [SH] Phony targets
- all: msn_mod.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
- 
- -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile
deleted file mode 100644
index b9dcedf9f..000000000
--- a/package/bitlbee/patches/patch-protocols_oscar_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
- 
--LFLAGS += -r
-+LFLAGS += -Wl,-r -nostdlib
- 
- # [SH] Phony targets
- all: oscar_mod.o
-@@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- oscar_mod.o: $(objects)
- 	@echo '*' Linking oscar_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
-+	$(CC) $(LFLAGS) $(objects) -o oscar_mod.o
- 
- -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_twitter_Makefile b/package/bitlbee/patches/patch-protocols_twitter_Makefile
index 1dba18e51..f9be7d888 100644
--- a/package/bitlbee/patches/patch-protocols_twitter_Makefile
+++ b/package/bitlbee/patches/patch-protocols_twitter_Makefile
@@ -1,5 +1,5 @@
---- 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
+--- bitlbee-3.6.orig/protocols/twitter/Makefile	2019-02-07 20:53:38.000000000 +0100
++++ bitlbee-3.6/protocols/twitter/Makefile	2024-02-14 17:50:59.239530536 +0100
 @@ -14,7 +14,7 @@ endif
  # [SH] Program variables
  objects = twitter.o twitter_http.o twitter_lib.o
@@ -13,7 +13,7 @@
  
  twitter_mod.o: $(objects)
  	@echo '*' Linking twitter_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
-+	@$(CC) $(LFLAGS) $(objects) -o twitter_mod.o
+-	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
++	$(VERBOSE) $(CC) $(LFLAGS) $(objects) -o twitter_mod.o
  	
  -include .depend/*.d