--- make/Config.in.orig	2006-06-15 16:20:54.000000000 +0200
+++ make/Config.in	2006-09-22 17:35:47.000000000 +0200
@@ -22,6 +22,7 @@
 source make/openvpn/Config.in
 source make/samba/Config.in
 source make/screen/Config.in
+source make/tor/Config.in
 source make/vpnc/Config.in
 
 comment "Extensions"
--- make/tor/Config.in.orig	2006-09-23 13:22:00.000000000 +0200
+++ make/tor/Config.in	2006-12-21 00:00:00.000000000 +0200
@@ -0,0 +1,8 @@
+config DS_PACKAGE_TOR
+	bool "tor 0.1.1.26"
+	select DS_LIB_libevent
+	select DS_LIB_libssl
+	select DS_LIB_libz
+	default n
+	help
+	    An anonymous Internet communication system
--- make/tor/tor.mk.orig	2006-09-23 13:21:46.000000000 +0200
+++ make/tor/tor.mk	2006-12-21 00:00:00.000000000 +0200
@@ -0,0 +1,95 @@
+# released under the GNU public license v2
+#
+TOR_VERSION:=0.1.1.26
+TOR_SOURCE:=tor-$(TOR_VERSION).tar.gz
+TOR_SITE:=http://tor.eff.org/dist
+TOR_DIR:=$(SOURCE_DIR)/tor-$(TOR_VERSION)
+TOR_TARGET_BINARY:=src/or/tor
+TOR_PKG_VERSION:=0.6
+TOR_PKG_SITE:=http://netfreaks.org/ds-mod
+TOR_PKG_NAME:=tor-$(TOR_VERSION)
+TOR_PKG_SOURCE:=tor-$(TOR_VERSION)-dsmod-$(TOR_PKG_VERSION).tar.bz2
+TOR_TARGET_DIR:=$(PACKAGES_DIR)/$(TOR_PKG_NAME)/root/usr/sbin
+
+$(DL_DIR)/$(TOR_SOURCE):
+	wget -P $(DL_DIR) $(TOR_SITE)/$(TOR_SOURCE)
+
+$(DL_DIR)/$(TOR_PKG_SOURCE):
+	@wget -P $(DL_DIR) $(TOR_PKG_SITE)/$(TOR_PKG_SOURCE)
+
+$(TOR_DIR)/.unpacked: $(DL_DIR)/$(TOR_SOURCE)
+	tar -C $(SOURCE_DIR) $(VERBOSE) -xzf $(DL_DIR)/$(TOR_SOURCE)
+	touch $@
+
+$(TOR_DIR)/.configured: $(TOR_DIR)/.unpacked
+	( cd $(TOR_DIR); rm -f config.status; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(TARGET_TOOLCHAIN_STAGING_DIR)/include \
+		-I$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include" \
+		LDFLAGS="-static-libgcc -L$(TARGET_TOOLCHAIN_STAGING_DIR)/lib \
+		-L$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib" \
+		ac_cv_libevent_linker_option='(none)' \
+		ac_cv_openssl_linker_option='(none)' \
+		tor_cv_null_is_zero=yes \
+		tor_cv_unaligned_ok=yes \
+		tor_cv_time_t_signed=yes \
+		./configure \
+		  --target=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
+		  --build=$(GNU_HOST_NAME) \
+		  --program-prefix="" \
+		  --program-suffix="" \
+		  --prefix=/usr \
+		  --exec-prefix=/usr \
+		  --bindir=/usr/sbin \
+		  --datadir=/usr/share \
+		  --includedir=/usr/include \
+		  --infodir=/usr/share/info \
+		  --libdir=/usr/lib \
+		  --libexecdir=/usr/lib \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/mod/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
+		  --enable-shared \
+		  --disable-static \
+	);
+	touch $@
+
+$(TOR_DIR)/$(TOR_TARGET_BINARY): $(TOR_DIR)/.configured
+	PATH="$(TARGET_PATH)" \
+	$(MAKE) -C $(TOR_DIR)
+
+$(PACKAGES_DIR)/.$(TOR_PKG_NAME): $(DL_DIR)/$(TOR_PKG_SOURCE)
+	@tar -C $(PACKAGES_DIR) -xjf $(DL_DIR)/$(TOR_PKG_SOURCE)
+	@touch $@
+
+tor: $(PACKAGES_DIR)/.$(TOR_PKG_NAME)
+
+tor-package: $(PACKAGES_DIR)/.$(TOR_PKG_NAME)
+	tar -C $(PACKAGES_DIR) $(VERBOSE) -cjf $(PACKAGES_BUILD_DIR)/$(TOR_PKG_SOURCE) $(TOR_PKG_NAME)
+
+tor-precompiled: $(TOR_DIR)/$(TOR_TARGET_BINARY) tor
+	$(TARGET_STRIP) $(TOR_DIR)/$(TOR_TARGET_BINARY)
+	cp $(TOR_DIR)/$(TOR_TARGET_BINARY) $(TOR_TARGET_DIR)/
+
+tor-source: $(TOR_DIR)/.unpacked $(PACKAGES_DIR)/.$(TOR_PKG_NAME)
+
+tor-clean:
+	-$(MAKE) -C $(TOR_DIR) clean
+	rm -f $(PACKAGES_BUILD_DIR)/$(TOR_PKG_SOURCE)
+
+tor-dirclean:
+	rm -rf $(TOR_DIR)
+	rm -rf $(PACKAGES_DIR)/$(TOR_PKG_NAME)
+	rm -f $(PACKAGES_DIR)/.$(TOR_PKG_NAME)
+
+tor-list:
+ifeq ($(strip $(DS_PACKAGE_TOR)),y)
+	@echo "S40tor-$(TOR_VERSION)" >> .static
+else
+	@echo "S40tor-$(TOR_VERSION)" >> .dynamic
+endif
--- make/tor/Makefile.in.orig	2006-09-23 13:21:52.000000000 +0200
+++ make/tor/Makefile.in	2006-09-22 17:34:03.000000000 +0200
@@ -0,0 +1,3 @@
+ifeq ($(strip $(DS_PACKAGE_TOR)),y)
+PACKAGES+=tor
+endif
--- make/libs/libevent.mk.orig	2006-09-23 13:21:34.000000000 +0200
+++ make/libs/libevent.mk	2006-09-23 12:48:38.000000000 +0200
@@ -0,0 +1,78 @@
+# released under the GNU public license v2
+#
+LIBEVENT_VERSION:=1.1b
+LIBEVENT_SOURCE:=libevent-$(LIBEVENT_VERSION).tar.gz
+LIBEVENT_SITE:=http://www.monkey.org/~provos
+LIBEVENT_DIR:=$(SOURCE_DIR)/libevent-$(LIBEVENT_VERSION)
+LIBEVENT_MAKE_DIR:=$(MAKE_DIR)/libs
+
+$(DL_DIR)/$(LIBEVENT_SOURCE):
+	wget -P $(DL_DIR) $(LIBEVENT_SITE)/$(LIBEVENT_SOURCE)
+
+$(LIBEVENT_DIR)/.unpacked: $(DL_DIR)/$(LIBEVENT_SOURCE)
+	tar -C $(SOURCE_DIR) $(VERBOSE) -xzf $(DL_DIR)/$(LIBEVENT_SOURCE)
+	touch $@
+
+$(LIBEVENT_DIR)/.configured: $(LIBEVENT_DIR)/.unpacked
+	( cd $(LIBEVENT_DIR); rm -f config.status; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		CPPFLAGS="-I$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include" \
+		LDFLAGS="-XCClinker -static-libgcc -L$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib" \
+		./configure \
+		  --target=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
+		  --build=$(GNU_HOST_NAME) \
+		  --program-prefix="" \
+		  --program-suffix="" \
+		  --prefix=/usr \
+		  --exec-prefix=/usr \
+		  --bindir=/usr/bin \
+		  --datadir=/usr/share \
+		  --includedir=/usr/include \
+		  --infodir=/usr/share/info \
+		  --libdir=/usr/lib \
+		  --libexecdir=/usr/lib \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
+		  --enable-shared \
+		  --disable-static \
+	);
+	touch $@
+
+$(LIBEVENT_DIR)/.compiled: $(LIBEVENT_DIR)/.configured
+	PATH=$(TARGET_TOOLCHAIN_PATH) $(MAKE) \
+		-C $(LIBEVENT_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		libevent.la
+	touch $@
+
+$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libevent.so: $(LIBEVENT_DIR)/.compiled
+	PATH=$(TARGET_TOOLCHAIN_PATH) $(MAKE) \
+		-C $(LIBEVENT_DIR) \
+		DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \
+		install-strip
+	touch -c $@
+
+ifeq ($(strip $(DS_EXTERNAL_COMPILER)),y)
+libevent libevent-precompiled:
+	@echo 'External compiler used. Skipping libevent...'
+else
+libevent: uclibc $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libevent.so
+libevent-precompiled: libevent
+	$(TARGET_STRIP) $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libevent*.so*
+	cp -a $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libevent*.so* root/usr/lib/
+endif
+
+libevent-source: $(LIBEVENT_DIR)/.unpacked
+
+libevent-clean:
+	-$(MAKE) -C $(LIBEVENT_DIR) clean
+
+libevent-dirclean:
+	rm -rf $(LIBEVENT_DIR)
--- make/libs/Config.in.orig	2006-07-23 17:32:36.000000000 +0200
+++ make/libs/Config.in	2006-09-22 17:26:45.000000000 +0200
@@ -305,6 +305,13 @@
 
 endmenu
 
+menu "libevent"
+
+config DS_LIB_libevent
+	bool "libevent.so"
+	default n
+endmenu
+
 menu "libncurses"
 
 config DS_LIB_libncurses
--- make/libs/Makefile.in.orig	2006-07-23 17:36:30.000000000 +0200
+++ make/libs/Makefile.in	2006-09-22 17:27:12.000000000 +0200
@@ -20,6 +20,10 @@
 LIBS+=ncurses
 endif
 
+ifeq ($(strip $(DS_LIB_libevent)),y)
+LIBS+=libevent
+endif
+
 ifeq ($(strip $(DS_LIB_libcrypto)),y)
 # libssl depends on libcrypto
 LIBS+=openssl
--- fwmod.orig	2006-08-07 01:21:30.000000000 +0200
+++ fwmod	2006-09-23 13:55:57.000000000 +0200
@@ -731,7 +731,7 @@
 		do
 			bn="$(basename "$i")"
 			lib="${bn%\.so*}"
-			lib="$(echo "$lib" | sed -e 's/-[\.0-9]*$//')"
+			lib="$(echo "$lib" | sed -e 's/-[\.0-9a-z]*$//')"
 			if [ "$(eval "echo \"\$DS_LIB_$(echo "$lib" | tr '\-+' '_x')\"")" == "y" ]
 			then
 				[ "$DS_VERBOSITY_LEVEL" -ge 2 ] && echo "${L2}${bn}"