diff --git a/target/tor/VERSION b/target/tor/VERSION new file mode 100644 index 000000000..9e11b32fc --- /dev/null +++ b/target/tor/VERSION @@ -0,0 +1 @@ +0.3.1 diff --git a/target/tor/build_stage2.sh b/target/tor/build_stage2.sh index 041235f0f..2568835b6 100644 --- a/target/tor/build_stage2.sh +++ b/target/tor/build_stage2.sh @@ -2,6 +2,7 @@ # set -e # +read ROCKATE_VERSION < $base/target/$target/VERSION echo_header "Creating 2nd stage filesystem:" mkdir -p $disksdir/2nd_stage cd $disksdir/2nd_stage @@ -116,6 +117,8 @@ cp $base/target/tor/fixedfiles/icewm_menu usr/share/icewm/menu cp $base/target/tor/fixedfiles/rock-menu usr/share/icewm/rock-menu chmod +x usr/share/icewm/rock-menu chroot . /usr/share/icewm/rock-menu + +echo ${ROCKATE_VERSION} > etc/ROCKATE_VERSION # temporary fl_wrapper addition for dependency checking #echo "export FLWRAPPER_WLOG=\"/tmp/fl_wrapper.wlog\"" >> etc/profile #echo "export FLWRAPPER_RLOG=\"/tmp/fl_wrapper.rlog\"" >> etc/profile diff --git a/target/tor/dillo.patch b/target/tor/dillo.patch new file mode 100644 index 000000000..e4ea37257 --- /dev/null +++ b/target/tor/dillo.patch @@ -0,0 +1,513 @@ +--- dillo-0.8.6/src/IO/about.c.orig 2007-04-25 09:46:33.000000000 +0200 ++++ dillo-0.8.6/src/IO/about.c 2007-05-17 17:36:20.000000000 +0200 +@@ -33,355 +33,196 @@ + "\n" + "\n" + "\n" +-"Splash screen for dillo-" VERSION "\n" ++"Welcome to ROCKate ROCKATE-VERSION\n" + "\n" + "\n" + "\n" +-"\n" + "\n" + "\n" + "\n" +-" \n" ++ "\n" ++ "\n" + "
\n" +-" \n" +-" \n" +-"
\n" +-" \n" +-" \n" +-"
\n" +-"

 Welcome to Dillo " VERSION " 

\n" +-"
\n" +-"
\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "

 Welcome to ROCKate ROCKATE-VERSION 

\n" ++ "
\n" ++ "
\n" ++ "
\n" + "\n" + "
\n" + "\n" +-"\n" + "\n" + "\n" + "\n" +-"\n" ++ "\n" + "\n" + "\n" + "\n" +-"\n" ++ "\n" ++ "\n" + "\n" + "\n" +-"\n" + "\n" + "\n" +-"\n" +-"\n" ++ "\n" + "
\n" +-"\n" ++ "
\n" + "\n" + "\n" + "\n" +-"\n" +-"\n" +-"
\n" +-" \n" +-" \n" +-" \n" +-"
Dillo\n" +-"
\n" +-"
\n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-"
\n" +-" \n" +-" \n" +-" Help\n" +-"
  \n" +-" \n" +-" Home\n" +-"
  \n" +-" \n" +-" \n" +-" Objectives\n" +-"
  \n" +-" \n" +-" \n" +-" ChangeLog\n" +-"
  \n" +-" \n" +-" \n" +-" Interview\n" +-"
  \n" +-" \n" +-" \n" +-" Authors\n" +-"
  \n" +-" \n" +-" \n" +-" Donate\n" +-"
\n" +-"
\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"\n" +-"\n" +-"
\n" +-" \n" +-" \n" +-" \n" +-"
Magazines\n" +-"\n" +-"
\n" +-"
\n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-"
  \n" +-" \n" +-" LWN\n" +-"
  \n" +-" \n" +-" Slashdot\n" +-"
  \n" +-" \n" +-" KuroShin\n" +-"
  \n" +-" \n" +-" Nexus M.\n" +-"
  \n" +-" \n" +-" Monster News\n" +-"
  \n" +-" \n" +-" The Register\n" +-"
\n" +-"
\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"\n" +-"\n" +-"
\n" +-" \n" +-" \n" +-" \n" +-"
Additional Stuff\n" +-"\n" +-"
\n" +-"
\n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-" \n" +-"
  \n" +-" Google\n" +-"
  \n" +-" Wikipedia\n" +-"
  \n" +-" P. Gutenberg\n" +-"
  \n" +-" FreshMeat\n" +-"
  \n" +-" GNU\n" +-" project\n" +-"
  \n" +-" LinuxFund\n" +-"
\n" +-"
\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"\n" +-"\n" +-"
\n" +-" \n" +-" \n" +-" \n" +-"
Essential Readings\n" +-"\n" +-"
\n" +-"
\n" +-" \n" +-"
  \n" +-" Peace&Violence\n" +-"
  \n" +-" " +-" Right to Read\n" +-"
\n" +-"
\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
ROCKate
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
  ROCKate Hidden Website
\n" ++ "
\n" ++ "
\n" ++ "
\n" + "\n" ++ "		\n" +-"\n" ++ "\n" + "\n" + "\n" + "\n" +-"
\n" +-"\n" +-"\n" +-" \n" +-"
\n" +-"

Free Software

\n" +-"
\n" +-"
\n" +-"

\n" +-" Dillo is Free Software in the terms of the GPL.\n" +-" This means you have four basic freedoms:\n" +-"

    \n" +-"
  • Freedom to use the program any way you see fit.\n" +-"
  • Freedom to study and modify the source code.\n" +-"
  • Freedom to make backup copies.\n" +-"
  • Freedom to redistribute it.\n" +-"
\n" +-" The GPL\n" +-" is the legal mechanism that gives you these freedoms.\n" +-" It also protects them from being taken away: any derivative work\n" +-" based on the program must be under the GPL.
\n" +-"
\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"\n" +-" \n" +-"
\n" +-"

Release overview

\n" +-" April 26, 2006\n" +-"
\n" +-" \n" +-" \n" +-"
\n" +-"

\n" +-"This release is hopefully the last from the GTK1 series. The port to\n" +-"FLTK2 is almost finished now!\n" +-"

\n" +-"This release comes with extensive work on the plugins side. A new dpip\n" +-"library, a new FLTK2-based GUI for downloads!, a \"data:\"\n" +-"URI handler, a important bug fix in the FTP plugin, and a cookies server\n" +-"dpi that enables all Dillo instances to use cookies at the same time!\n" +-"

\n" +-"There's also the \"./configure --disable-threaded-dns\"\n" +-"option (mainly for some non reentrant BSDs), among many other improvements.\n" +-"

\n" +-"Remember that dillo project uses a release model where every new\n" +-"browser shall be better than the former.\n" +-"Keep up with the latest one!\n" +-"

\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"\n" +-" \n" +-"
\n" +-"

ChangeLog highlights

\n" +-" (Extracted from the\n" +-" full\n" +-" ChangeLog)\n" +-"
\n" +-" \n" +-" \n" +-"
\n" +-"
    \n" +-"
  • Designed and implemented a dpi protocol library (libDpip.a in /dpip).\n" +-"
  • Ported the bookmarks, download, file, https, ftp and hello plugins,\n" +-" plus the dpid daemon and the rest of the source tree to use it.\n" +-"
  • Improved the dpi buffer reception to handle split buffers (This was\n" +-" required for handling arbitrary data streams with dpip).\n" +-"
  • Fixed a serious bug with the FTP plugin that led to two downloads\n" +-" of the same file when left-clicking a non-viewable file.\n" +-"
  • Improved the accuracy of the illegal-character error reporting\n" +-" for URLs.\n" +-"
  • Added dpi/downloads.cc (Default FLTK2-based GUI for downloads dpi).\n" +-"
  • Added \"./configure --disable-dlgui\" to build without FLTK2-GUI\n" +-" downloads.\n" +-"
  • Fixed dpip's tag syntax and its parsing to accept any value string.\n" +-"
  • Added DOCTYPE parsing (for better bug-meter error messages).\n" +-"
  • Fixed bookmarks dpi to escape ' in URLs and &<>\"' in titles\n" +-" (BUG#655).\n" +-"
  • Added a check for malicious image sizes in IMG tags.\n" +-"\n" +-"
  • Added a datauri dpi to handle \"data:\" URIs (RFC-2397).\n" +-"
  • Moved the cookies management into a dpi server: cookies.dpi.\n" +-"
  • Removed the restriction of only one dillo with cookies enabled!\n" +-"
  • Added \"./configure --disable-threaded-dns\" (for some non\n" +-" reentrant BSDs).\n" +-"
\n" +-"
\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"\n" +-" \n" +-"
\n" +-"

Notes

\n" +-"
\n" +-" \n" +-" \n" +-"
\n" +-"
    \n" +-"
  • There's a\n" +-" dillorc\n" +-" (readable config) file within the tarball; It is well commented\n" +-" and has plenty of options to customize dillo, so copy\n" +-" it to your ~/.dillo/ directory, and\n" +-" modify to your taste.\n" +-"
  • There's documentation for developers in the /doc\n" +-" dir within the tarball; you can find directions on everything\n" +-" else at the home page.\n" +-"
  • Dillo has context sensitive menus using the\n" +-" right mouse button (available on pages, links, images,\n" +-" the Back and Forward buttons, and bug meter).\n" +-"
  • Dillo behaves very nicely when browsing local files, images, and HTML.\n" +-" It's also very good for Internet searching (try Google!).\n" +-"
  • This release is mainly intended for developers\n" +-" and advanced users.\n" +-"
  • Frames, Java and Javascript are not supported.\n" +-"
\n" +-"
\n" +-"
\n" +-"
\n" +-"
\n" +-"\n" +-"
\n" +-"\n" +-"\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "

ROCKate

\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "

\n" ++ "Welcome to the ROCKate ROCKATE-VERSION LiveCD
\n" ++ "This Webbrowser is called 'dillo' and is configured to route all requests through the Tor network. As such, your anonymity while browsing is ensured, unless you provide personal information yourself.\n" ++ "

\n" ++ "
\n" ++ "
\n" ++ "
\n" ++"\n" ++ "
\n" ++"\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "

ChangeLog

\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "
\n"
++"* V0.3.1, May 17th, 2007 \n"
++"\n"
++"* added fixes to actually make these nifty things work\n"
++"\n"
++"* V0.3, May 15th, 2007 \n"
++"\n"
++"* updated to Tor 0.1.2.13\n"
++"* added transparent Tor routing to config dialog\n"
++"* added runtime update mechanism\n"
++"\n"
++"* V0.2, April 19th, 2007 \n"
++"\n"
++"* Added background image\n"
++"* Added irssi (preconfigured to use freenodes hidden service)\n"
++"* Added stone plugin for simple network configuration\n"
++"* Shrinked the Small version to 41 Megabyte \n"
++"\n"
++"*  V0.1 'Ignition', April 4th, 2007 \n"
++"Initial release \n"
++	   "
\n" ++ "
\n" ++ "
\n" ++ "
\n" + "\n" + "\n" +-"		\n" +-"\n" +-"\n" ++ "\n" ++ "\n" + "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
Tor
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "\n" ++ "
  Information about Tor
\n" ++ "
\n" ++ "
\n" ++ "
\n" + "\n" ++ "
\n" + "\n" + "\n" + "\n" +-"

\n" ++"
\n" ++"
\n" ++"
\n" + "
\n" + "
\n" + "
\n" diff --git a/target/tor/fixedfiles/mod_rockate.sh b/target/tor/fixedfiles/mod_rockate.sh index c4b9147b3..558fc665d 100644 --- a/target/tor/fixedfiles/mod_rockate.sh +++ b/target/tor/fixedfiles/mod_rockate.sh @@ -1,3 +1,4 @@ +#!/bin/bash # --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. @@ -25,7 +26,7 @@ rockate_configure() { local device="${1}" read inet ip rest < <( ip addr show ${device} | grep 'inet ' ) - gui_input "Enter IP address for ${device}" ${ip} newip + gui_input "Enter IP address for ${device}" "${ip}" newip if [ -n "${newip}" -a "${newip}" != "${ip}" ] ; then ip addr del "${ip}" dev "${device}" ip addr add "${newip}" dev "${device}" @@ -34,13 +35,92 @@ rockate_configure() { rockate_defaultroute(){ local gw="${1}" - gui_input "Enter IP Address for the default router" ${gw} newgw + gui_input "Enter IP Address for the default router" "${gw}" newgw if [ -n "${newgw}" -a "${gw}" != "${newgw}" ] ; then route del -net default ${gw} route add -net default ${newgw} fi } +rockate_update(){ + read version < /etc/ROCKATE_VERSION + tmp="/tmp/update.${$}" + echo "Downloading Updatelist" + wget -O ${tmp} http://xsanr2oqmett7ovm.onion/UPDATES_${version} + if [ ! -s "${tmp}" ] ; then + echo "No updates available for version ${version}." + rm -f ${tmp} + return + fi + while read url description ; do + echo "Downloading update: ${description}" + wget -O /tmp/update.tar.bz2 "${url}" + cd / + echo "Installing update: ${description}" + tar xf /tmp/update.tar.bz2 + cd - + rm -f /tmp/update.tar.bz2 + done < ${tmp} + rm -f ${tmp} +} + +rockate_transparent_tor(){ + # based on http://wiki.noreply.org/noreply/TheOnionRouter/TransparentProxy +# destinations you don't want routed through Tor + NON_TOR="" + while read inet addr brd bcast rest ; do +# inet 127.0.0.1/8 scope host lo +# inet 213.239.220.170/27 brd 213.239.220.191 scope global eth0 + [ "${addr:0:3}" == "127" ] && continue + + read addr1 addr2 addr3 addr4 subnet <<< "${addr//[.\/]/ }" + read bcast1 bcast2 bcast3 bcast4 <<< "${bcast//./ }" + unset netaddr + for x in 1 2 3 4 ; do + eval a="\${addr${x}}" + eval b="\${bcast${x}}" + if [ ${subnet} -ge 8 ] ; then + # the simple case + netaddr="${netaddr}${netaddr:+.}${a}" + subnet=$(( ${subnet} - 8 )) + elif [ ${subnet} -eq 0 ] ; then + # the other simple case + netaddr="${netaddr}${netaddr:+.}0" + else + # 0 < subnet < 8 + b="$(( ( ${b} + 1 ) - ( 2 ** ( 8 - ${subnet} ) ) ))" + netaddr="${netaddr}${netaddr:+.}${b}" + subnet=0 + fi + done + NON_TOR="${NON_TOR} ${netaddr}/${addr##*/}" + done < <( ip a | grep inet | grep -v inet6 ) + +# the UID Tor runs as + TOR_UID="79" + +# Tor's TransPort + TRANS_PORT="9040" + + lsmod | grep ipt_owner || modprobe ipt_owner + + iptables -F + iptables -t nat -F + + iptables -t nat -A OUTPUT -m owner --uid-owner $TOR_UID -j RETURN + for NET in $NON_TOR 127.0.0.0/9 127.128.0.0/10; do + iptables -t nat -A OUTPUT -d $NET -j RETURN + done + iptables -t nat -A OUTPUT -p tcp --syn -j DNAT --to-dest 127.0.0.1:$TRANS_PORT + + iptables -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + for NET in $NON_TOR 127.0.0.0/8; do + iptables -A OUTPUT -d $NET -j ACCEPT + done + iptables -A OUTPUT -m owner --uid-owner $TOR_UID -j ACCEPT + iptables -A OUTPUT -j REJECT +} + main() { #eth0 Link encap:Ethernet HWaddr 00:10:DC:7C:EE:8A while @@ -55,6 +135,12 @@ main() { menu="${menu} '' ''" read dest gw msk fl met ref use dev < <( route -n | grep ^0.0.0.0 ) menu="${menu} 'Default Route: ${gw} (via ${dev})' 'rockate_defaultroute ${gw}'" + menu="${menu} '' ''" + menu="${menu} 'Setup transparent Tor proxy (use after network setup)' 'rockate_transparent_tor'" + menu="${menu} 'The following option can be used to update the ROCKate environment at' ''" + menu="${menu} 'runtime if an update file has been provided. These changes will be' ''" + menu="${menu} 'gone after reboot, so please use only if you really want to.' ''" + menu="${menu} 'Update ROCKate' 'rockate_update'" eval gui_menu FOO "'ROCKate Configuration'" ${menu} do : ; done } diff --git a/target/tor/fixedfiles/torrc b/target/tor/fixedfiles/torrc index 83d73ca73..18f9867a5 100644 --- a/target/tor/fixedfiles/torrc +++ b/target/tor/fixedfiles/torrc @@ -14,6 +14,9 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## controller applications, as documented in control-spec.txt. ControlPort 9051 +## The Transparent Router Port +TransPort 9040 + ## The user tor will run as User tor diff --git a/target/tor/needed_files b/target/tor/needed_files index 4cbbdb917..c7e8b5781 100644 --- a/target/tor/needed_files +++ b/target/tor/needed_files @@ -1,5 +1,6 @@ bin/bash bin/bash2 +bin/bzip2 bin/cat bin/chmod bin/chown @@ -19,6 +20,7 @@ bin/sh bin/sleep bin/stty bin/su +bin/tar bin/umount bin/uname bin/xargs @@ -443,6 +445,92 @@ lib/modules/2.6.20.2-rock/kernel/drivers/net/wireless/wl3501_cs.ko lib/modules/2.6.20.2-rock/kernel/drivers/net/wireless/zd1201.ko lib/modules/2.6.20.2-rock/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko lib/modules/2.6.20.2-rock/kernel/drivers/net/yellowfin.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/arp_tables.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/arpt_mangle.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/arptable_filter.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ip_queue.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ip_tables.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_ECN.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_LOG.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_MASQUERADE.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_NETMAP.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_REJECT.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_SAME.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_TCPMSS.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_TOS.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_TTL.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_ULOG.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_addrtype.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_ah.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_ecn.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_iprange.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_owner.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_recent.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_tos.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/ipt_ttl.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/iptable_filter.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/iptable_mangle.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/iptable_nat.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/iptable_raw.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_amanda.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_ftp.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_h323.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_irc.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_pptp.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_proto_gre.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_sip.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko +lib/modules/2.6.20.2-rock/kernel/net/ipv4/netfilter/nf_nat_tftp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/ +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_amanda.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_ftp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_h323.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_irc.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_netbios_ns.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_netlink.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_pptp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_proto_gre.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_proto_sctp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_sip.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nf_conntrack_tftp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nfnetlink.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nfnetlink_log.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/nfnetlink_queue.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/x_tables.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_CLASSIFY.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_DSCP.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_MARK.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_NFLOG.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_NFQUEUE.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_NOTRACK.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_comment.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_conntrack.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_dccp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_dscp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_esp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_hashlimit.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_helper.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_length.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_limit.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_mac.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_mark.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_multiport.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_physdev.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_pkttype.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_policy.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_quota.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_realm.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_sctp.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_state.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_statistic.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_string.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_tcpmss.ko +lib/modules/2.6.20.2-rock/kernel/net/netfilter/xt_tcpudp.ko lib/modules/2.6.20.2-rock/modules.inputmap lib/modules/2.6.20.2-rock/modules.pcimap lib/security/pam_cracklib.so @@ -494,7 +582,9 @@ sbin/fsck sbin/hotplug sbin/ifconfig sbin/init +sbin/insmod sbin/ip +sbin/iptables sbin/ldconfig sbin/losetup sbin/lsmod @@ -3141,6 +3231,7 @@ usr/bin/torify usr/bin/touch usr/bin/tsocks usr/bin/wc +usr/bin/wget usr/bin/xterm usr/lib/gcc/i386-unknown-linux-gnu/3.4.6/libgcc_s.so.1 usr/lib/gcc/i386-unknown-linux-gnu/3.4.6/libstdc++.so.6 @@ -3149,6 +3240,84 @@ usr/lib/gcc/i386-unknown-linux-gnu/4.0.4/libgcc_s.so.1 usr/lib/gcc/i386-unknown-linux-gnu/4.0.4/libstdc++.so usr/lib/gcc/i386-unknown-linux-gnu/4.0.4/libstdc++.so.6 usr/lib/gcc/i386-unknown-linux-gnu/4.0.4/libstdc++.so.6.0.7 +usr/lib/iptables/libip6t_CONNMARK.so +usr/lib/iptables/libip6t_HL.so +usr/lib/iptables/libip6t_LOG.so +usr/lib/iptables/libip6t_MARK.so +usr/lib/iptables/libip6t_NFQUEUE.so +usr/lib/iptables/libip6t_TRACE.so +usr/lib/iptables/libip6t_connmark.so +usr/lib/iptables/libip6t_eui64.so +usr/lib/iptables/libip6t_hl.so +usr/lib/iptables/libip6t_icmpv6.so +usr/lib/iptables/libip6t_length.so +usr/lib/iptables/libip6t_limit.so +usr/lib/iptables/libip6t_mac.so +usr/lib/iptables/libip6t_mark.so +usr/lib/iptables/libip6t_multiport.so +usr/lib/iptables/libip6t_owner.so +usr/lib/iptables/libip6t_physdev.so +usr/lib/iptables/libip6t_policy.so +usr/lib/iptables/libip6t_standard.so +usr/lib/iptables/libip6t_state.so +usr/lib/iptables/libip6t_tcp.so +usr/lib/iptables/libip6t_udp.so +usr/lib/iptables/libipt_CLASSIFY.so +usr/lib/iptables/libipt_CONNMARK.so +usr/lib/iptables/libipt_DNAT.so +usr/lib/iptables/libipt_DSCP.so +usr/lib/iptables/libipt_ECN.so +usr/lib/iptables/libipt_LOG.so +usr/lib/iptables/libipt_MARK.so +usr/lib/iptables/libipt_MASQUERADE.so +usr/lib/iptables/libipt_MIRROR.so +usr/lib/iptables/libipt_NETMAP.so +usr/lib/iptables/libipt_NFQUEUE.so +usr/lib/iptables/libipt_NOTRACK.so +usr/lib/iptables/libipt_REDIRECT.so +usr/lib/iptables/libipt_REJECT.so +usr/lib/iptables/libipt_SAME.so +usr/lib/iptables/libipt_SNAT.so +usr/lib/iptables/libipt_TARPIT.so +usr/lib/iptables/libipt_TCPMSS.so +usr/lib/iptables/libipt_TOS.so +usr/lib/iptables/libipt_TRACE.so +usr/lib/iptables/libipt_TTL.so +usr/lib/iptables/libipt_ULOG.so +usr/lib/iptables/libipt_addrtype.so +usr/lib/iptables/libipt_ah.so +usr/lib/iptables/libipt_comment.so +usr/lib/iptables/libipt_connlimit.so +usr/lib/iptables/libipt_connmark.so +usr/lib/iptables/libipt_conntrack.so +usr/lib/iptables/libipt_dscp.so +usr/lib/iptables/libipt_ecn.so +usr/lib/iptables/libipt_esp.so +usr/lib/iptables/libipt_hashlimit.so +usr/lib/iptables/libipt_helper.so +usr/lib/iptables/libipt_icmp.so +usr/lib/iptables/libipt_iprange.so +usr/lib/iptables/libipt_length.so +usr/lib/iptables/libipt_limit.so +usr/lib/iptables/libipt_mac.so +usr/lib/iptables/libipt_mark.so +usr/lib/iptables/libipt_multiport.so +usr/lib/iptables/libipt_owner.so +usr/lib/iptables/libipt_physdev.so +usr/lib/iptables/libipt_pkttype.so +usr/lib/iptables/libipt_policy.so +usr/lib/iptables/libipt_realm.so +usr/lib/iptables/libipt_recent.so +usr/lib/iptables/libipt_rpc.so +usr/lib/iptables/libipt_sctp.so +usr/lib/iptables/libipt_standard.so +usr/lib/iptables/libipt_state.so +usr/lib/iptables/libipt_tcp.so +usr/lib/iptables/libipt_tcpmss.so +usr/lib/iptables/libipt_tos.so +usr/lib/iptables/libipt_ttl.so +usr/lib/iptables/libipt_udp.so +usr/lib/iptables/libipt_unclean.so usr/lib/libcowfs.so usr/lib/libcrack.so usr/lib/libcrack.so.2 diff --git a/target/tor/pkg_dillo.conf b/target/tor/pkg_dillo.conf index 42e7069c8..84ddb09ca 100644 --- a/target/tor/pkg_dillo.conf +++ b/target/tor/pkg_dillo.conf @@ -1,4 +1,6 @@ [ -f $confdir/$pkg.conf ] && . $confdir/$pkg.conf +read ROCKATE_VERSION < $base/target/$target/VERSION hook_add postmake 9 "echo http_proxy=http://127.0.0.1:8118/ > $root/etc/dillorc" +prepatch="sed 's,ROCKATE-VERSION,${ROCKATE_VERSION},g' $base/target/$target/dillo.patch | patch -p1" var_append extraconfopt " " "--disable-dlgui" diff --git a/target/tor/x86/isolinux.cfg b/target/tor/x86/isolinux.cfg index 72f349491..a04d6f0ed 100644 --- a/target/tor/x86/isolinux.cfg +++ b/target/tor/x86/isolinux.cfg @@ -29,4 +29,4 @@ LABEL rockate-640 LABEL rockate-text kernel vmlinuz - APPEND initrd=initrd.gz root=/dev/ram devfs=nocompat init=/linuxrc autoboot=1 vga=0 rw + APPEND initrd=initrd.gz root=/dev/ram devfs=nocompat init=/linuxrc autoboot=1 vga=0 rw 3