7 files changed, 68 insertions, 1 deletions
diff --git a/package/Config.in b/package/Config.in
index 62c7ac5cf..2f3fddc4c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -40,6 +40,7 @@ source "package/sablevm-classpath/Config.in"
 source "package/libffi-sable/Config.in"
 endmenu
 source "package/sane-backends/Config.in"
+source "package/ser2net/Config.in"
 menu "rrdtool........................... Round-Robin Database (RRD) libraries and tools"
 source "package/rrdtool/Config.in"
 source "package/rrdtool1/Config.in"
diff --git a/package/Makefile b/package/Makefile
index 724079a41..740555946 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -210,6 +210,7 @@ package-$(BR2_PACKAGE_SCANLOGD) += scanlogd
 package-$(BR2_PACKAGE_SCDP) += scdp
 package-$(BR2_PACKAGE_SCREEN) += screen
 package-$(BR2_PACKAGE_SDK) += sdk
+package-$(BR2_PACKAGE_SER2NET) += ser2net
 package-$(BR2_PACKAGE_SERDISPLIB) += serdisplib
 package-$(BR2_PACKAGE_SETPWC) += setpwc
 package-$(BR2_PACKAGE_SETSERIAL) += setserial
diff --git a/package/bitlbee/Config.in b/package/bitlbee/Config.in
index a62e10b37..3560e2848 100644
--- a/package/bitlbee/Config.in
+++ b/package/bitlbee/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_BITLBEE
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENSSL
-	select BR2_PACKAGE_LIBGLIB
+	select BR2_PACKAGE_GLIB1
 	select BR2_PACKAGE_LIBICONV
 	help
 
diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in
new file mode 100644
index 000000000..b52c26bb6
--- /dev/null
+++ b/package/ser2net/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SER2NET
+        prompt "ser2net........................... Serial port TCP/IP redirector"
+        tristate
+	default m if CONFIG_DEVEL
+        help
+	  This is ser2net, a program for allowing network connections to serial
+	  ports. See the man page for information about using the program. Note 
+          that ser2net supports RFC 2217 (remote control of serial port parameters),
+          but you must have a complient client. 
+
diff --git a/package/ser2net/Makefile b/package/ser2net/Makefile
new file mode 100644
index 000000000..3651155ea
--- /dev/null
+++ b/package/ser2net/Makefile
@@ -0,0 +1,49 @@
+# $Id$
+	
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ser2net
+PKG_VERSION:=2.3
+PKG_RELEASE:=1
+PKG_MD5SUM:=5f83a3e8aec18331cb61069dccdfba47
+ 
+PKG_SOURCE_URL:=@SF/ser2net/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+	
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,SER2NET,ser2net,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	./configure \
+	--target=$(GNU_TARGET_NAME) \
+	--host=$(GNU_TARGET_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	);
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(TARGET_CONFIGURE_OPTS) \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
+	touch $@
+ 
+$(IPKG_SER2NET):
+	install -d -m0755 $(IDIR_SER2NET)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(IDIR_SER2NET)/usr/sbin
+	install -d -m0755 $(IDIR_SER2NET)/etc
+	cp -fpR $(PKG_BUILD_DIR)/ser2net.conf $(IDIR_SER2NET)/etc
+	$(RSTRIP) $(IDIR_SER2NET)
+	$(IPKG_BUILD) $(IDIR_SER2NET) $(PACKAGE_DIR)
diff --git a/package/ser2net/ipkg/ser2net.conffiles b/package/ser2net/ipkg/ser2net.conffiles
new file mode 100644
index 000000000..16bb67f20
--- /dev/null
+++ b/package/ser2net/ipkg/ser2net.conffiles
@@ -0,0 +1 @@
+/etc/ser2net.conf
diff --git a/package/ser2net/ipkg/ser2net.control b/package/ser2net/ipkg/ser2net.control
new file mode 100644
index 000000000..0b1b22ad4
--- /dev/null
+++ b/package/ser2net/ipkg/ser2net.control
@@ -0,0 +1,5 @@
+Package: ser2net
+Priority: optional
+Section: net
+Source: http://jaist.dl.sourceforge.net/sourceforge/ser2net/
+Description: a program for allowing network connections to serial ports