From d41b150e8f88bc028d2ce251b2dde2f7cf3eb51f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 8 Mar 2011 13:08:36 +0100
Subject: update to latest upstream version

---
 package/bitlbee/Makefile                           | 14 ++++----
 package/bitlbee/patches/patch-Makefile             | 23 +++++++++++++
 package/bitlbee/patches/patch-configure            | 38 +++++++---------------
 package/bitlbee/patches/patch-lib_Makefile         | 20 ++++++++----
 package/bitlbee/patches/patch-protocols_Makefile   | 18 ++++++----
 .../patches/patch-protocols_jabber_Makefile        | 21 ++++++++----
 .../bitlbee/patches/patch-protocols_msn_Makefile   | 21 +++++++-----
 .../bitlbee/patches/patch-protocols_oscar_Makefile | 19 +++++++----
 .../patches/patch-protocols_purple_Makefile        | 24 ++++++++++++++
 .../patches/patch-protocols_twitter_Makefile       | 24 ++++++++++++++
 .../bitlbee/patches/patch-protocols_yahoo_Makefile | 19 +++++++----
 11 files changed, 168 insertions(+), 73 deletions(-)
 create mode 100644 package/bitlbee/patches/patch-Makefile
 create mode 100644 package/bitlbee/patches/patch-protocols_purple_Makefile
 create mode 100644 package/bitlbee/patches/patch-protocols_twitter_Makefile

(limited to 'package/bitlbee')

diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 77bf2246f..016f1b6e7 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bitlbee
-PKG_VERSION:=		1.2.4
+PKG_VERSION:=		3.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		26b9bfc5446bdf0e932e8074d117be67
+PKG_MD5SUM:=		4d00c6e09859b653f955b16b988db0ac
 PKG_DESCR:=		IRC gateway to IM chat networks
 PKG_SECTION:=		chat
 PKG_DEPENDS:=		glib libiconv libopenssl
@@ -21,11 +21,11 @@ $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
 CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-fPIC
 CONFIGURE_ARGS:=	--target=${REAL_GNU_TARGET_NAME} \
-			--prefix=/usr/ \
-			--bindir=/usr/sbin/ \
-			--etcdir=/etc/bitlbee/ \
-			--datadir=/usr/share/bitlbee/ \
-			--config=/var/lib/bitlbee/ \
+			--prefix=/usr \
+			--bindir=/usr/sbin \
+			--etcdir=/etc/bitlbee \
+			--datadir=/usr/share/bitlbee \
+			--config=/var/lib/bitlbee \
 			--arch=Linux \
 			--cpu="${ARCH}" \
 			--debug=0 \
diff --git a/package/bitlbee/patches/patch-Makefile b/package/bitlbee/patches/patch-Makefile
new file mode 100644
index 000000000..d5f501a7f
--- /dev/null
+++ b/package/bitlbee/patches/patch-Makefile
@@ -0,0 +1,23 @@
+--- 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
index 1f4538ac4..72b91af09 100644
--- a/package/bitlbee/patches/patch-configure
+++ b/package/bitlbee/patches/patch-configure
@@ -1,20 +1,12 @@
---- bitlbee-1.2.3.orig/configure	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/configure	2008-10-08 16:07:32.000000000 +0200
-@@ -19,7 +19,6 @@ libevent='/usr/'
- pidfile='/var/run/bitlbee.pid'
- ipcsocket='/var/run/bitlbee.sock'
- pcdir='$prefix/lib/pkgconfig'
--systemlibdirs="/lib /usr/lib /usr/local/lib"
- 
- msn=1
- jabber=1
-@@ -137,12 +136,8 @@ EOF
+--- 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
+ 	PATH=/usr/$target/bin:$PATH
 -	CC=$target-cc
 +	CC=$target-gcc
  	LD=$target-ld
@@ -22,18 +14,12 @@
  fi
  
  
-@@ -348,14 +343,6 @@ fi;
- 
- echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
- 
--for i in $systemlibdirs; do
--	if [ -f $i/libresolv.a ]; then
--		echo '#define HAVE_RESOLV_A' >> config.h
--		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
--		break
--	fi
--done
--
- STORAGES="text xml"
+@@ -225,7 +222,7 @@ if [ -z "$PKG_CONFIG" ]; then
+ 	PKG_CONFIG=pkg-config
+ fi
  
- if [ "$ldap" = "auto" ]; then
+-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 8fc2484cc..3d15131d8 100644
--- a/package/bitlbee/patches/patch-lib_Makefile
+++ b/package/bitlbee/patches/patch-lib_Makefile
@@ -1,20 +1,26 @@
---- bitlbee-1.2.4.orig/lib/Makefile	2009-10-17 17:26:46.000000000 +0200
-+++ bitlbee-1.2.4/lib/Makefile	2010-03-07 19:58:49.626028152 +0100
-@@ -12,7 +12,7 @@
- objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+--- 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
+@@ -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
  
- CFLAGS += -Wall
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: lib.o
-@@ -32,7 +32,7 @@ distclean: clean $(subdirs)
+@@ -35,12 +35,12 @@ 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 ffb47b391..2608b77b0 100644
--- a/package/bitlbee/patches/patch-protocols_Makefile
+++ b/package/bitlbee/patches/patch-protocols_Makefile
@@ -1,20 +1,26 @@
---- bitlbee-1.2.4.orig/protocols/Makefile	2009-10-17 17:26:46.000000000 +0200
-+++ bitlbee-1.2.4/protocols/Makefile	2010-03-07 20:02:06.789785295 +0100
-@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS)
+--- 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
+@@ -24,7 +24,7 @@ subdirobjs = $(PROTOOBJS)
+ 
  # Expansion of variables
  subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
- CFLAGS += -Wall
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: protocols.o
-@@ -44,7 +44,7 @@ $(subdirs):
+@@ -48,12 +48,12 @@ $(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 b1dc63a0e..0e227dcca 100644
--- a/package/bitlbee/patches/patch-protocols_jabber_Makefile
+++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile
@@ -1,17 +1,24 @@
---- bitlbee-1.2.4.orig/protocols/jabber/Makefile	2009-10-17 17:26:46.000000000 +0200
-+++ bitlbee-1.2.4/protocols/jabber/Makefile	2010-03-07 20:00:36.426039459 +0100
-@@ -12,7 +12,7 @@
- objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
+--- 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
+@@ -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
  
- CFLAGS += -Wall
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: jabber_mod.o
-@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Make
+ 
+ $(objects): %.o: $(SRCDIR)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) $< -o $@
  
  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 8f634c5f6..2d0081117 100644
--- a/package/bitlbee/patches/patch-protocols_msn_Makefile
+++ b/package/bitlbee/patches/patch-protocols_msn_Makefile
@@ -1,19 +1,24 @@
---- bitlbee-1.2.4.orig/protocols/msn/Makefile	2009-10-17 17:26:46.000000000 +0200
-+++ bitlbee-1.2.4/protocols/msn/Makefile	2010-03-07 20:00:17.406036329 +0100
-@@ -12,7 +12,7 @@
- objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+--- 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
+@@ -14,7 +14,7 @@ endif
+ # [SH] Program variables
+ objects = msn.o msn_util.o ns.o sb.o soap.o tables.o
  
- CFLAGS += -Wall
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: msn_mod.o
-@@ -38,6 +38,6 @@ $(objects): %.o: %.c
+@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Make
+ 
+ $(objects): %.o: $(SRCDIR)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) $< -o $@
  
  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 2d7e0dde0..c11eaea1c 100644
--- a/package/bitlbee/patches/patch-protocols_oscar_Makefile
+++ b/package/bitlbee/patches/patch-protocols_oscar_Makefile
@@ -1,17 +1,24 @@
---- bitlbee-1.2.4.orig/protocols/oscar/Makefile	2009-10-17 17:26:46.000000000 +0200
-+++ bitlbee-1.2.4/protocols/oscar/Makefile	2010-03-07 20:00:56.836124250 +0100
-@@ -12,7 +12,7 @@
+--- 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
+@@ -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
  
- CFLAGS += -Wall
 -LFLAGS += -r
 +LFLAGS += -Wl,-r -nostdlib
  
  # [SH] Phony targets
  all: oscar_mod.o
-@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+@@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Make
+ 
+ $(objects): %.o: $(SRCDIR)%.c
+ 	@echo '*' Compiling $<
+-	@$(CC) -c $(CFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) $< -o $@
  
  oscar_mod.o: $(objects)
  	@echo '*' Linking oscar_mod.o
 -	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
-+	@$(CC) $(LFLAGS) $(objects) -o oscar_mod.o
++	$(CC) $(LFLAGS) $(objects) -o oscar_mod.o
+ 
+ -include .depend/*.d
diff --git a/package/bitlbee/patches/patch-protocols_purple_Makefile b/package/bitlbee/patches/patch-protocols_purple_Makefile
new file mode 100644
index 000000000..81be67309
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_purple_Makefile
@@ -0,0 +1,24 @@
+--- 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
new file mode 100644
index 000000000..b51c8d2e2
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_twitter_Makefile
@@ -0,0 +1,24 @@
+--- 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
+@@ -14,7 +14,7 @@ endif
+ # [SH] Program variables
+ objects = twitter.o twitter_http.o twitter_lib.o
+ 
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+ 
+ # [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 $@
+ 
+ twitter_mod.o: $(objects)
+ 	@echo '*' Linking twitter_mod.o
+-	@$(LD) $(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
index 4df3cc046..4a5a7b72a 100644
--- a/package/bitlbee/patches/patch-protocols_yahoo_Makefile
+++ b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
@@ -1,17 +1,24 @@
---- bitlbee-1.2.4.orig/protocols/yahoo/Makefile	2009-10-17 17:26:46.000000000 +0200
-+++ bitlbee-1.2.4/protocols/yahoo/Makefile	2010-03-07 20:01:11.066203660 +0100
-@@ -12,7 +12,7 @@
+--- 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 += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
+ 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,4 +38,4 @@ $(objects): %.o: %.c
+@@ -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
++	$(CC) $(LFLAGS) $(objects) -o yahoo_mod.o
+ 
+ -include .depend/*.d
-- 
cgit v1.2.3