Merge remote branch 'phil/auto-config-in'

Conflicts:
	Config.in
	package/dropbear/Makefile
	package/iptables/Makefile
	package/kismet/Makefile
	package/nfs-utils/Makefile
	package/ntpclient/Makefile
	package/openvpn/Makefile
	package/pkgmaker
	package/rxvt-unicode/Makefile
	package/vgp/Makefile
	package/wpa_supplicant/Makefile
	package/xf86-input-keyboard/Makefile
	package/xf86-input-mouse/Makefile

.gitignore

@@ -29,6 +29,8 @@ config/*.o
 config/lxdialog/*.o
 make.log
 dl/
+package/Config.in.auto*
+package/pkgconfigs.d/
 package/*/info.mk
 package/*/Config.in
 package/*/Config.in.lib

Config.in

@@ -177,4 +177,23 @@ config ADK_RUNTIME_TIMEZONE
 
 endmenu
 
-source "package/Config.in"
+menu "Package selection"
+config ADK_ENABLE_IPV6
+	prompt "enable IPv6 globally"
+	boolean
+	default y
+	# FIXME: selecting stuff here is ugly, better fix package flavours to
+	#        support a symbol-value-based default (i.e., "default y if IPV6")
+	select ADK_PACKAGE_NFS_UTILS_WITH_TIRPC if ADK_PACKAGE_NFS_UTILS != n
+	help
+	  This enables IPv6 support in all related applications. Basically this
+	  just means passing --enable-ipv6 to the configure script, but the
+	  exception proves the rule. ;)
+
+source "package/Config.in.auto.global"
+source "package/Config.in.auto"
+endmenu
+
+menu "Kernel configuration"
+source "target/linux/Config.in"
+endmenu

mk/build.mk

@@ -175,7 +175,7 @@ newpackage:
 	$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
 	$(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile
 	@echo "Edit package/$(PKG)/Makefile to complete"
-	@echo "Do not forget to add package to package/Config.in"
+	@echo "choose PKG_SECTION to add it to an existent submenu"  
 
 #############################################################
 #
@@ -483,10 +483,12 @@ bulkallmod:
 	done <${TOPDIR}/target/bulk.lst
 
 menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
+	@echo "Generating menu structure ..."
 	mksh $(TOPDIR)/package/pkgmaker
 	@:>.menu
 
 dep:
+	@echo "Generating dependencies ..."
 	mksh $(TOPDIR)/package/depmaker
 
 .PHONY: menu dep

mk/package.mk

@@ -143,6 +143,7 @@ ALL_PKGOPTS+=	$(1)
 PKGNAME_$(1)=	$(2)
 PKGDEPS_$(1)=	$(4)
 PKGDESC_$(1)=	$(5)
+PKGSECT_$(1)=	$(6)
 IPKG_$(1)=	$(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
 IDIR_$(1)=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
 ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)

package/6tunnel/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.11rc2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		74e02d4f0704b3083a01feda66033449
 PKG_DESCR:=		IPv4/IPv6 tunnel proxy
-PKG_SECTION:=		net
+PKG_SECTION:=		ipv6
 PKG_DEPENDS:=		kmod-ipv6
 PKG_URL:=		http://toxygen.net/6tunnel/
 PKG_SITES:=		http://toxygen.net/6tunnel/

package/Config.in

@@ -1,723 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-menu "Package selection"
-
-config ADK_ENABLE_IPV6
-	prompt "enable IPv6 globally"
-	boolean
-	default y
-	# FIXME: selecting stuff here is ugly, better fix package flavours to
-	#        support a symbol-value-based default (i.e., "default y if IPV6")
-	select ADK_PACKAGE_NFS_UTILS_WITH_TIRPC if ADK_PACKAGE_NFS_UTILS != n
-	help
-	  This enables IPv6 support in all related applications. Basically this
-	  just means passing --enable-ipv6 to the configure script, but the
-	  exception proves the rule. ;)
-
-menu "Basesystem"
-source "package/alix-switch/Config.in"
-source "package/adkinstall/Config.in"
-source "package/base-files/Config.in"
-source "package/base-files/Config.in.manual"
-source "package/busybox/Config.in.manual"
-source "package/cfgfs/Config.in"
-source "package/cryptinit/Config.in"
-source "package/uclibc/Config.in.manual"
-source "package/glibc/Config.in.manual"
-source "package/eglibc/Config.in.manual"
-source "package/libc/Config.in.manual"
-source "package/grub/Config.in"
-source "package/grub-bin/Config.in"
-source "package/rpm/Config.in"
-source "package/uvd/Config.in"
-endmenu
-
-menu "Bluetooth"
-source "package/bluez-firmware/Config.in"
-source "package/bluez/Config.in"
-source "package/miax/Config.in"
-source "package/obexftp/Config.in"
-source "package/ussp-push/Config.in"
-endmenu
-
-menu "Browser / Editor / Pager"
-source "package/elinks/Config.in"
-source "package/less/Config.in"
-source "package/links/Config.in"
-source "package/lynx/Config.in"
-source "package/nano/Config.in"
-source "package/vim/Config.in"
-endmenu
-
-menu "Compression and Archivers"
-source "package/bzip2/Config.in"
-source "package/cpio/Config.in"
-source "package/tar/Config.in"
-source "package/xz/Config.in"
-endmenu
-
-menu "Cryptography"
-source "package/ccid/Config.in"
-source "package/cryptsetup/Config.in"
-source "package/gnupg/Config.in"
-source "package/gnutls/Config.in"
-source "package/heimdal/Config.in"
-source "package/krb5/Config.in"
-source "package/openct/Config.in"
-source "package/opensc/Config.in"
-source "package/openssl/Config.in"
-source "package/openssl-pkcs11/Config.in"
-source "package/pcsc-lite/Config.in"
-source "package/rng-tools/Config.in"
-endmenu
-
-menu "Debugging / Analyzing"
-source "package/exmap/Config.in"
-source "package/gdb/Config.in"
-source "package/gdbserver/Config.in"
-source "package/oprofile/Config.in"
-source "package/strace/Config.in"
-source "package/valgrind/Config.in"
-endmenu
-
-menu "DNS / DHCP"
-source "package/atftp/Config.in"
-source "package/avahi/Config.in"
-source "package/bind/Config.in"
-source "package/dhcp/Config.in"
-source "package/dhcp-forwarder/Config.in"
-source "package/dnsmasq/Config.in"
-source "package/ez-ipupdate/Config.in"
-source "package/maradns/Config.in"
-source "package/pdnsd/Config.in"
-source "package/updatedd/Config.in"
-endmenu
-
-menu "Filesystem / Blockdevice utilities"
-source "package/aufs2-util/Config.in"
-source "package/dosfstools/Config.in"
-source "package/e2fsprogs/Config.in"
-source "package/fuse/Config.in"
-source "package/mdadm/Config.in"
-source "package/mtd/Config.in"
-source "package/nand/Config.in"
-source "package/lvm/Config.in"
-source "package/parted/Config.in"
-source "package/util-linux-ng/Config.in"
-source "package/wdfs/Config.in"
-source "package/xfsprogs/Config.in"
-endmenu
-
-menu "Firewall / Routing / Bridging"
-source "package/arpd/Config.in"
-source "package/bridge-utils/Config.in"
-source "package/linux-atm/Config.in"
-source "package/conntrack-tools/Config.in"
-source "package/cutter/Config.in"
-source "package/ebtables/Config.in"
-source "package/ether-wake/Config.in"
-source "package/iproute2/Config.in"
-source "package/ipset/Config.in"
-source "package/iptables/Config.in"
-source "package/knock/Config.in"
-source "package/macchanger/Config.in"
-source "package/netstat-nat/Config.in"
-source "package/quagga/Config.in"
-source "package/ulogd/Config.in"
-source "package/shorewall-common/Config.in"
-source "package/shorewall-shell/Config.in"
-source "package/wol/Config.in"
-source "package/wondershaper/Config.in"
-source "package/vrrpd/Config.in"
-endmenu
-
-menu "HTTP / FTP"
-source "package/curl/Config.in"
-source "package/gatling/Config.in"
-source "package/lighttpd/Config.in"
-source "package/mini_httpd/Config.in"
-source "package/proftpd/Config.in"
-source "package/tntnet/Config.in"
-source "package/vsftpd/Config.in"
-source "package/wget/Config.in"
-source "package/wput/Config.in"
-endmenu
-
-menu "IPv6"
-source "package/6tunnel/Config.in"
-source "package/aiccu/Config.in"
-source "package/miredo/Config.in"
-source "package/mrd6/Config.in"
-source "package/ndisc/Config.in"
-source "package/radvd/Config.in"
-endmenu
-
-menu "IRC / ICQ / JABBER"
-source "package/bitlbee/Config.in"
-source "package/irssi/Config.in"
-source "package/miau/Config.in"
-source "package/reaim/Config.in"
-source "package/tmsnc/Config.in"
-endmenu
-
-menu "Libraries"
-source "package/alsa-lib/Config.in"
-source "package/apr/Config.in"
-source "package/apr-util/Config.in"
-source "package/atk/Config.in"
-source "package/avahi/Config.in.lib"
-source "package/axtls/Config.in.lib"
-source "package/bind/Config.in.lib"
-source "package/cairo/Config.in"
-source "package/cgilib/Config.in"
-source "package/curl/Config.in.lib"
-source "package/cxxtools/Config.in"
-source "package/dbus/Config.in"
-source "package/dbus-glib/Config.in"
-source "package/dbus-glib/Config.in.lib"
-source "package/DirectFB/Config.in"
-source "package/DirectFB/Config.in.lib"
-source "package/e2fsprogs/Config.in.lib"
-source "package/fltk/Config.in"
-source "package/fltk/Config.in.lib"
-source "package/fontconfig/Config.in"
-source "package/freeglut/Config.in"
-source "package/gettext/Config.in"
-source "package/glib/Config.in"
-source "package/gtk+/Config.in"
-source "package/heimdal/Config.in.lib"
-source "package/id3lib/Config.in"
-source "package/imlib2/Config.in"
-source "package/libao/Config.in"
-source "package/libao/Config.in.lib"
-source "package/libaudiofile/Config.in"
-source "package/libaudiofile/Config.in.lib"
-source "package/libart/Config.in"
-source "package/libart/Config.in.lib"
-source "package/linux-atm/Config.in.lib"
-source "package/libcli/Config.in"
-source "package/libcli/Config.in.lib"
-source "package/libdaemon/Config.in"
-source "package/libdaemon/Config.in.lib"
-source "package/libdb/Config.in"
-source "package/libdb/Config.in.lib"
-source "package/libdnet/Config.in"
-source "package/libdnet/Config.in.lib"
-source "package/libelf/Config.in"
-source "package/libelf/Config.in.lib"
-source "package/libevent/Config.in"
-source "package/libevent/Config.in.lib"
-source "package/libffi/Config.in"
-source "package/libffi/Config.in.lib"
-source "package/freeradius-client/Config.in.lib"
-source "package/expat/Config.in"
-source "package/expat/Config.in.lib"
-source "package/faad2/Config.in" 
-source "package/faad2/Config.in.lib" 
-source "package/flac/Config.in"
-source "package/flac/Config.in.lib"
-source "package/freetype/Config.in"
-source "package/freetype/Config.in.lib"
-source "package/libgcrypt/Config.in"
-source "package/libgcrypt/Config.in.lib"
-source "package/libgd/Config.in"
-source "package/libgd/Config.in.lib"
-source "package/gdbm/Config.in"
-source "package/gdbm/Config.in.lib"
-source "package/libgssglue/Config.in"
-source "package/libgssglue/Config.in.lib"
-source "package/gmp/Config.in" 
-source "package/gmp/Config.in.lib" 
-source "package/gnutls/Config.in.lib"
-source "package/libgpg-error/Config.in"
-source "package/libgpg-error/Config.in.lib"
-source "package/gsm/Config.in"
-source "package/gsm/Config.in.lib"
-source "package/libiconv/Config.in"
-source "package/libiconv/Config.in.lib"
-source "package/libid3tag/Config.in"
-source "package/libid3tag/Config.in.lib"
-source "package/libIDL/Config.in"
-source "package/libIDL/Config.in.lib"
-source "package/jpeg/Config.in"
-source "package/jpeg/Config.in.lib"
-source "package/krb5/Config.in.lib"
-source "package/lame/Config.in.lib"
-source "package/mpfr/Config.in"
-source "package/mysql/Config.in"
-source "package/mysql/Config.in.lib"
-source "package/libnotify/Config.in"
-source "package/libnotify/Config.in.lib"
-source "package/nspr/Config.in"
-source "package/nss/Config.in"
-source "package/libtool/Config.in.lib" 
-source "package/openldap/Config.in.lib"
-source "package/liblzo/Config.in"
-source "package/liblzo/Config.in.lib"
-source "package/libmad/Config.in"
-source "package/libmad/Config.in.lib"
-source "package/libmms/Config.in"
-source "package/libmms/Config.in.lib"
-source "package/ncurses/Config.in"  
-source "package/ncurses/Config.in.lib" 
-source "package/neon/Config.in"
-source "package/libnet/Config.in"
-source "package/libnet/Config.in.lib"
-source "package/libnetfilter_conntrack/Config.in"
-source "package/libnetfilter_conntrack/Config.in.lib"
-source "package/libnetfilter_log/Config.in"
-source "package/libnetfilter_log/Config.in.lib"
-source "package/libnetfilter_queue/Config.in"
-source "package/libnetfilter_queue/Config.in.lib"
-source "package/libnfsidmap/Config.in"
-source "package/libnfnetlink/Config.in"
-source "package/libnfnetlink/Config.in.lib"
-source "package/libnids/Config.in"
-source "package/libnids/Config.in.lib"
-source "package/libnl/Config.in"
-source "package/libnl/Config.in.lib"
-source "package/libogg/Config.in"
-source "package/libogg/Config.in.lib"
-source "package/libol/Config.in"
-source "package/libol/Config.in.lib"
-source "package/opencdk/Config.in"  
-source "package/opencdk/Config.in.lib"  
-source "package/obexftp/Config.in.lib"
-source "package/openobex/Config.in"
-source "package/libosip2/Config.in"
-source "package/libosip2/Config.in.lib"
-source "package/libp11/Config.in"
-source "package/libp11/Config.in.lib"
-source "package/libpcap/Config.in"
-source "package/libpcap/Config.in.lib"
-source "package/libpri/Config.in"
-source "package/libpri/Config.in.lib"
-source "package/lvm/Config.in.lib"
-source "package/pango/Config.in"
-source "package/pcre/Config.in"
-source "package/pcre/Config.in.lib"
-source "package/libpng/Config.in"
-source "package/libpng/Config.in.lib"
-source "package/popt/Config.in"
-source "package/popt/Config.in.lib"
-source "package/postgresql/Config.in"
-source "package/postgresql/Config.in.lib"
-source "package/libpthread/Config.in"
-source "package/libpthread/Config.in.lib"
-source "package/libthread_db/Config.in"
-source "package/libthread_db/Config.in.lib"
-source "package/readline/Config.in"
-source "package/readline/Config.in.lib"
-source "package/cyrus-sasl/Config.in"
-source "package/cyrus-sasl/Config.in.lib"
-source "package/sdl/Config.in"
-source "package/sdl/Config.in.lib"
-source "package/sdl-image/Config.in"
-source "package/sdl-image/Config.in.lib"
-source "package/net-snmp/Config.in.lib"
-source "package/speex/Config.in"
-source "package/speex/Config.in.lib"
-source "package/openssl/Config.in.lib"
-source "package/sqlite/Config.in.lib"
-source "package/librpcsecgss/Config.in"
-source "package/librpcsecgss/Config.in.lib"
-source "package/libshout/Config.in"
-source "package/libshout/Config.in.lib"
-source "package/libsigc++/Config.in"
-source "package/libsigc++/Config.in.lib"
-source "package/libstdcxx/Config.in"
-source "package/libstdcxx/Config.in.lib"
-source "package/libtasn1/Config.in"
-source "package/libtasn1/Config.in.lib"
-source "package/libtiff/Config.in"
-source "package/libtiff/Config.in.lib"
-source "package/libtirpc/Config.in"
-source "package/libtirpc/Config.in.lib"
-source "package/libtorrent/Config.in"
-source "package/libtorrent/Config.in.lib"
-source "package/libupnp/Config.in"
-source "package/libupnp/Config.in.lib"
-source "package/libusb/Config.in"
-source "package/libusb/Config.in.lib"
-source "package/libusb-compat/Config.in"
-source "package/libusb-compat/Config.in.lib"
-source "package/libvirt/Config.in"
-source "package/libvirt/Config.in.lib"
-source "package/libvorbis/Config.in"
-source "package/libvorbis/Config.in.lib"
-source "package/libvorbisidec/Config.in"
-source "package/libvorbisidec/Config.in.lib"
-source "package/tcp_wrappers/Config.in"
-source "package/tslib/Config.in"
-source "package/libxml2/Config.in"
-source "package/libxml2/Config.in.lib"
-source "package/libxslt/Config.in"
-source "package/libxslt/Config.in.lib"
-source "package/lua/Config.in.lib"
-source "package/uclibc++/Config.in.manual"
-source "package/zlib/Config.in"
-endmenu
-
-menu "Mail"
-source "package/bogofilter/Config.in"
-source "package/dovecot/Config.in"
-source "package/fetchmail/Config.in"
-source "package/mini_sendmail/Config.in"
-source "package/mutt/Config.in"
-source "package/procmail/Config.in"
-source "package/ssmtp/Config.in"
-source "package/vilistextum/Config.in"
-endmenu
-
-menu "Misc"
-source "package/collectd/Config.in"
-source "package/deco/Config.in"
-source "package/dialog/Config.in"
-source "package/digitemp/Config.in"
-source "package/gpm/Config.in"
-source "package/gpsd/Config.in"
-source "package/logrotate/Config.in"
-source "package/mc/Config.in"
-source "package/mgetty/Config.in"
-source "package/monit/Config.in"
-source "package/motion/Config.in"
-source "package/osiris/Config.in"
-source "package/rrdtool/Config.in"
-source "package/rrdcollect/Config.in"
-source "package/sane-backends/Config.in"
-source "package/screen/Config.in"
-source "package/scsi-spin/Config.in"
-source "package/ser2net/Config.in"
-source "package/sqlite/Config.in"
-source "package/syslog-ng/Config.in"
-endmenu
-
-menu "Multimedia"
-source "package/alsa-utils/Config.in"
-source "package/esound/Config.in"
-source "package/ffmpeg/Config.in"
-source "package/gmediaserver/Config.in"
-source "package/icecast/Config.in"
-source "package/lame/Config.in"
-source "package/madplay/Config.in"
-source "package/mpg123/Config.in"
-source "package/moc/Config.in"
-source "package/mpd/Config.in"
-source "package/mplayer/Config.in"
-source "package/mt-daapd/Config.in"
-source "package/palantir/Config.in"
-source "package/setpwc/Config.in"
-endmenu
-
-menu "Network - Analyze / Debugging / Monitoring"
-source "package/bwm/Config.in"
-source "package/dsniff/Config.in"
-source "package/ethtool/Config.in"
-source "package/fping/Config.in"
-source "package/fprobe/Config.in"
-source "package/fprobe-ulog/Config.in"
-source "package/httping/Config.in"
-source "package/iftop/Config.in"
-source "package/ipcad/Config.in"
-source "package/iperf/Config.in"
-source "package/iptraf/Config.in"
-source "package/mtr/Config.in"
-source "package/netperf/Config.in"
-source "package/nmap/Config.in"
-source "package/sipsak/Config.in"
-source "package/tcpdump/Config.in"
-source "package/tptest/Config.in"
-source "package/traceroute/Config.in"
-source "package/trafshow/Config.in"
-source "package/ttcp/Config.in"
-endmenu
-
-menu "Networking Misc"
-source "package/cups/Config.in"
-source "package/fakeidentd/Config.in"
-source "package/gkrellmd/Config.in"
-source "package/net-snmp/Config.in"
-# intentionally inserted here, as it depends on the above
-source "package/iptables-snmp/Config.in"
-source "package/nut/Config.in"
-source "package/openldap/Config.in"
-source "package/p910nd/Config.in"
-source "package/pipacs/Config.in"
-#source "package/pmacct/Config.in"
-source "package/portmap/Config.in"
-source "package/rarpd/Config.in"
-source "package/rpcbind/Config.in"
-source "package/rrs/Config.in"
-source "package/rsync/Config.in"
-source "package/shat/Config.in"
-source "package/socat/Config.in"
-source "package/udp-broadcast-relay/Config.in"
-source "package/vgp/Config.in"
-source "package/vnstat/Config.in"
-source "package/vtun/Config.in"
-source "package/wccpd/Config.in"
-source "package/xinetd/Config.in"
-endmenu
-
-menu "Network Filesystems"
-source "package/davfs2/Config.in"
-source "package/davfs2/Config.in.kernel"
-source "package/nfs-utils/Config.in"
-source "package/samba/Config.in"
-endmenu
-
-menu "Network Security"
-source "package/arpwatch/Config.in"
-source "package/autossh/Config.in"
-source "package/axtls/Config.in"
-source "package/ca-certificates/Config.in"
-source "package/dropbear/Config.in"
-source "package/httptunnel/Config.in"
-source "package/ipsec-tools/Config.in"
-source "package/l2tpns/Config.in"
-source "package/openssh/Config.in"
-source "package/openssh/Config.in.kerberos"
-source "package/openswan/Config.in"
-source "package/openvpn/Config.in"
-source "package/portsentry/Config.in"
-source "package/ptunnel/Config.in"
-source "package/scanlogd/Config.in"
-source "package/snort/Config.in"
-source "package/ssltunnel/Config.in"
-source "package/tinc/Config.in"
-source "package/vpnc/Config.in"
-endmenu
-
-menu "NTP"
-source "package/htpdate/Config.in"
-source "package/ntpclient/Config.in"
-source "package/openntpd/Config.in"
-source "package/rdate/Config.in"
-endmenu
-
-menu "P2P"
-source "package/ctorrent/Config.in"
-source "package/rtorrent/Config.in"
-endmenu
-
-menu "PPP / PPTP / RADIUS"
-source "package/freeradius-client/Config.in"
-source "package/freeradius-server/Config.in"
-source "package/ppp/Config.in"
-source "package/pptp/Config.in"
-source "package/pptpd/Config.in"
-source "package/rp-pppoe/Config.in"
-source "package/raddump/Config.in"
-endmenu
-
-menu "Proxy"
-source "package/dansguardian/Config.in"
-source "package/frickin/Config.in"
-source "package/igmpproxy/Config.in"
-source "package/parprouted/Config.in"
-source "package/privoxy/Config.in"
-source "package/siproxd/Config.in"
-source "package/squid/Config.in"
-source "package/srelay/Config.in"
-source "package/tinyproxy/Config.in"
-source "package/tor/Config.in"
-source "package/vnc-reflector/Config.in"
-endmenu
-
-menu "Programming / Languages"
-source "package/autoconf/Config.in"
-source "package/automake/Config.in"
-source "package/binutils/Config.in"
-source "package/bison/Config.in"
-source "package/diffutils/Config.in"
-source "package/flex/Config.in"
-source "package/gawk/Config.in"
-source "package/gcc/Config.in"
-source "package/gperf/Config.in"
-source "package/haserl/Config.in"
-source "package/jamvm/Config.in"
-source "package/libtool/Config.in"
-source "package/lua/Config.in"
-source "package/m4/Config.in"
-source "package/make/Config.in"
-source "package/microperl/Config.in"
-source "package/perl/Config.in"
-source "package/php/Config.in"
-source "package/pkg-config/Config.in"
-source "package/python/Config.in"
-source "package/python2/Config.in"
-source "package/ruby/Config.in"
-source "package/tcl/Config.in"
-endmenu
-
-menu "SCM"
-#source "package/bzr/Config.in"
-source "package/cvs/Config.in"
-source "package/git/Config.in"
-source "package/subversion/Config.in"
-endmenu
-
-menu "Shells"
-source "package/bash/Config.in"
-source "package/mksh/Config.in"
-source "package/tcsh/Config.in"
-source "package/zsh/Config.in"
-endmenu
-
-menu "Serial communications & terminal emulation"
-source "package/heyu/Config.in"
-source "package/lrzsz/Config.in"
-source "package/picocom/Config.in"
-source "package/serdisplib/Config.in"
-source "package/setserial/Config.in"
-endmenu
-
-menu "Telephony"
-source "package/asterisk/Config.in"
-source "package/opensips/Config.in"
-endmenu
-
-menu "Utilities"
-source "package/bc/Config.in"
-source "package/comgt/Config.in"
-source "package/coreutils/Config.in"
-source "package/cpufrequtils/Config.in"
-source "package/fbset/Config.in"
-source "package/file/Config.in"
-source "package/findutils/Config.in"
-source "package/grep/Config.in"
-source "package/hdparm/Config.in"
-source "package/usbutils/Config.in"
-source "package/patch/Config.in"
-source "package/pciutils/Config.in"
-source "package/pcmciautils/Config.in"
-source "package/procps/Config.in"
-source "package/sispmctl/Config.in"
-source "package/stress/Config.in"
-source "package/sysfsutils/Config.in"
-source "package/sysstat/Config.in"
-source "package/udev/Config.in"
-source "package/watchdog/Config.in"
-endmenu
-
-menu "Wireless"
-source "package/aircrack-ng/Config.in"
-source "package/b43-firmware/Config.in"
-source "package/chillispot/Config.in"
-source "package/hostapd/Config.in"
-source "package/iw/Config.in"
-source "package/kismet/Config.in"
-source "package/olsrd/Config.in"
-source "package/p54-firmware/Config.in"
-source "package/rt61-firmware/Config.in"
-source "package/wifidog/Config.in"
-source "package/wireless-tools/Config.in"
-source "package/wpa_supplicant/Config.in"
-endmenu
-
-menu "X server and drivers"
-source "package/xorg-server/Config.in"
-source "package/xf86-video-cirrus/Config.in"
-source "package/xf86-video-geode/Config.in"
-source "package/xf86-video-fbdev/Config.in"
-source "package/xf86-video-intel/Config.in"
-source "package/xf86-video-siliconmotion/Config.in"
-source "package/xf86-input-mouse/Config.in"
-source "package/xf86-input-keyboard/Config.in"
-source "package/xf86-input-evtouch/Config.in"
-endmenu
-
-menu "X applications"
-source "package/dillo/Config.in"
-source "package/evilwm/Config.in"
-source "package/firefox/Config.in"
-source "package/fluxbox/Config.in"
-source "package/font-util/Config.in"
-source "package/qingy/Config.in"
-source "package/rxvt-unicode/Config.in"
-source "package/twm/Config.in"
-source "package/xauth/Config.in"
-source "package/xinit/Config.in"
-source "package/xlsfonts/Config.in"
-source "package/xterm/Config.in"
-source "package/xvinfo/Config.in"
-endmenu
-
-menu "X fonts"
-source "package/font-adobe-75dpi/Config.in"
-source "package/font-adobe-100dpi/Config.in"
-source "package/font-bitstream-75dpi/Config.in"
-source "package/font-bitstream-100dpi/Config.in"
-source "package/font-bitstream-type1/Config.in"
-source "package/font-bh-lucidatypewriter-75dpi/Config.in"
-source "package/font-bh-lucidatypewriter-100dpi/Config.in"
-source "package/font-bh-75dpi/Config.in"
-source "package/font-bh-100dpi/Config.in"
-source "package/font-bh-type1/Config.in"
-source "package/font-bh-ttf/Config.in"
-source "package/font-misc-misc/Config.in"
-source "package/font-xfree86-type1/Config.in"
-endmenu
-
-menu "X libraries"
-source "package/libdrm/Config.in"
-source "package/libdrm/Config.in.lib"
-source "package/libICE/Config.in"
-source "package/libICE/Config.in.lib"
-source "package/libSM/Config.in"
-source "package/libSM/Config.in.lib"
-source "package/libX11/Config.in"
-source "package/libX11/Config.in.lib"
-source "package/libXv/Config.in"
-source "package/libXv/Config.in.lib"
-source "package/libXdmcp/Config.in"
-source "package/libXdmcp/Config.in.lib"
-source "package/libXext/Config.in"
-source "package/libXext/Config.in.lib"
-source "package/libXfont/Config.in"
-source "package/libXfont/Config.in.lib"
-source "package/libfontenc/Config.in"
-source "package/libfontenc/Config.in.lib"
-source "package/libpciaccess/Config.in"
-source "package/libpciaccess/Config.in.lib"
-source "package/libxkbfile/Config.in"
-source "package/libxkbfile/Config.in.lib"
-source "package/libXau/Config.in"
-source "package/libXau/Config.in.lib"
-source "package/libXaw/Config.in"
-source "package/libXaw/Config.in.lib"
-source "package/libXdamage/Config.in"
-source "package/libXdamage/Config.in.lib"
-source "package/libXfixes/Config.in"
-source "package/libXfixes/Config.in.lib"
-source "package/libXi/Config.in"
-source "package/libXi/Config.in.lib"
-source "package/libXmu/Config.in"
-source "package/libXmu/Config.in.lib"
-source "package/libXpm/Config.in"
-source "package/libXpm/Config.in.lib"
-source "package/libXrender/Config.in"
-source "package/libXrender/Config.in.lib"
-source "package/libXScrnSaver/Config.in"
-source "package/libXScrnSaver/Config.in.lib"
-source "package/libXt/Config.in"
-source "package/libXt/Config.in.lib"
-source "package/libXft/Config.in"
-source "package/libXft/Config.in.lib"
-source "package/libXxf86dga/Config.in"
-source "package/libXxf86dga/Config.in.lib"
-source "package/libXxf86vm/Config.in"
-source "package/libXxf86vm/Config.in.lib"
-source "package/MesaLib/Config.in"
-source "package/MesaLib/Config.in.lib"
-source "package/pixman/Config.in"
-source "package/xkbcomp/Config.in"
-source "package/xkeyboard-config/Config.in"
-endmenu
-endmenu
-
-menu "Kernel configuration"
-source "target/linux/Config.in"
-source "package/rtsp/Config.in"
-endmenu

package/MesaLib/Makefile

@@ -16,9 +16,9 @@ PKG_URL:=		http://www.mesa3d.org/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.1/
 
 PKG_DESCR_GLXINFO:=	Display various GLX information
-PKG_SECT_GLXINFO:=	x11
+PKG_SECT_GLXINFO:=	x11/apps
 PKG_DESCR_GLXGEARS:=	Nice little OpenGL demo application
-PKG_SECT_GLXGEARS:=	x11
+PKG_SECT_GLXGEARS:=	x11/apps
 
 WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 

package/aiccu/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		20070115
 PKG_RELEASE:=		8
 PKG_MD5SUM:=		c9bcc83644ed788e22a7c3f3d4021350
 PKG_DESCR:=		SixXS Automatic IPv6 Connectivity Client Utility
-PKG_SECTION:=		net
+PKG_SECTION:=		ipv6
 PKG_DEPENDS:=		kmod-ipv6 libpthread
 PKG_URL:=		http://www.sixxs.net
 PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/

package/aircrack-ng/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f7a24ed8fad122c4187d06bfd6f998b4
 PKG_DESCR:=		set of tools for auditing wireless networks
-PKG_SECTION:=		net
+PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libpthread libopenssl libpcap
 PKG_BUILDDEP+=		openssl libpcap
 PKG_URL:=		http://www.aircrack-ng.org

package/alsa-utils/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.22
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		f7180316188552ee1e6759a03f1fe98d
 PKG_DESCR:=		ALSA mixer utility
-PKG_SECTION:=		utils
+PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libpthread
 PKG_BUILDDEP+=		alsa-lib
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)

package/arpd/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
-PKG_SECTION:=		net
+PKG_SECTION:=		route
 PKG_DEPENDS:=		libpcap libdnet libevent
 PKG_BUILDDEP+=		libpcap libdnet libevent
 PKG_URL:=		http://niels.xtdnet.nl/honeyd/

package/arpwatch/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.1a15
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cebfeb99c4a7c2a6cee2564770415fe7
 PKG_DESCR:=		Ethernet monitor program
-PKG_SECTION:=		net
+PKG_SECTION:=		net/security
 PKG_DEPENDS:=		libpcap
 PKG_BUILDDEP+=		libpcap
 PKG_URL:=		http://www-nrg.ee.lbl.gov

package/asterisk/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.6.2.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		861f57ba43bfe05dc645e0679a260e41
 PKG_DESCR:=		Open Source PBX
-PKG_SECTION:=		net
+PKG_SECTION:=		phone
 PKG_MULTI:=		1
 PKG_NOPARALLEL:=	1
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl

package/atftp/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
 PKG_DESCR:=		TFTP client
-PKG_SECTION:=		net
+PKG_SECTION:=		dhcp
 PKG_DEPENDS:=		libreadline libncurses
 PKG_BUILDDEP+=		readline ncurses
 PKG_URL:=		http://freshmeat.net/projects/atftp

package/aufs2-util/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		aufs2-util
 PKG_VERSION:=		130809
 PKG_RELEASE:=		1
 PKG_DESCR:=		aufs2 utilities
-PKG_SECTION:=		admin
+PKG_SECTION:=		fs
 PKG_URL:=		http://aufs.sf.net/
 PKG_HOST_DEPENDS:=	!cygwin !freebsd !openbsd !netbsd
 

package/autoconf/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.65
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		46cfb40e0babf4c64f8325f03da81c9b
 PKG_DESCR:=		GNU autoconf
-PKG_SECTION:=		utils
+PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/autoconf/
 PKG_SITES:=		${MASTER_SITE_GNU:=autoconf/}
 PKG_OPTS:=		noscripts

package/automake/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.10
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		452163c32d061c53a7acc0e8c1b689ba
 PKG_DESCR:=		GNU automake
-PKG_SECTION:=		utils
+PKG_SECTION:=		lang
 PKG_DEPENDS:=		microperl
 PKG_URL:=		http://www.gnu.org/software/automake/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}

package/autossh/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4b
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8f9aa006f6f69e912d3c2f504622d6f7
 PKG_DESCR:=		Automatically restart SSH sessions and tunnels
-PKG_SECTION:=		net
+PKG_SECTION:=		net/security
 PKG_DEPENDS:=		openssh-client
 PKG_URL:=		http://www.harding.motd.ca/autossh
 PKG_SITES:=		http://www.harding.motd.ca/autossh/

package/avahi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.6.25
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a83155a6e29e3988f07e5eea3287b21e
 PKG_DESCR:=		mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
-PKG_SECTION:=		net
+PKG_SECTION:=		dhcp
 PKG_DEPENDS:=		libavahi libdaemon libexpat gettext
 PKG_BUILDDEP+=		libdaemon expat gdbm glib gettext
 PKG_URL:=		http://avahi.org

package/axtls/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		03471b5a5874e2ce86025f24b3fa0958
 PKG_DESCR:=		small embedded webserver
-PKG_SECTION:=		net
+PKG_SECTION:=		net/security
 PKG_DEPENDS:=		libaxtls
 PKG_URL:=		http://axtls.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}

package/b43-firmware/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		37c8d2c029a7e5b82f4433a6fa1e2ee5
 PKG_DESCR:=		firmware for b43 wireless cards
-PKG_SECTION:=		sys
+PKG_SECTION:=		wifi
 PKG_SITES:=		http://openadk.org/distfiles/
 
 include ${TOPDIR}/mk/package.mk

package/bind/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		9.7.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c245b5d1aa0a4f53d9538faa1efe2c3f
 PKG_DESCR:=		popular DNS server
-PKG_SECTION:=		net
+PKG_SECTION:=		dns
 PKG_DEPENDS:=		libopenssl libbind libxml2
 PKG_BUILDDEP+=		openssl libxml2
 PKG_URL:=		https://www.isc.org/software/bind

package/binutils/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/binutils/Makefile.inc
 
 PKG_DESCR:=		binary utilities (nm, objdump, ar, as, ..)
-PKG_SECTION:=		comp
+PKG_SECTION:=		lang
 PKG_HOST_DEPENDS:=      !cygwin
 
 include ${TOPDIR}/mk/package.mk

package/bison/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.4.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c58aa1da418dc9704070872489e89bf5
 PKG_DESCR:=		GNU parser generator
-PKG_SECTION:=		utils
+PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/bison
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 

package/bitlbee/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		26b9bfc5446bdf0e932e8074d117be67
 PKG_DESCR:=		IRC gateway to IM chat networks
-PKG_SECTION:=		net
+PKG_SECTION:=		chat
 PKG_DEPENDS:=		glib libiconv libopenssl
 PKG_BUILDDEP+=		glib libiconv openssl
 PKG_URL:=		http://www.bitlbee.org

package/bridge-utils/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0182fcac3a2b307113bbec34e5f1c673
 PKG_DESCR:=		Ethernet bridging tools
-PKG_SECTION:=		net
+PKG_SECTION:=		bridge
 PKG_DEPENDS:=		kmod-bridge
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Bridge
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}

package/busybox/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.16.2
+PKG_VERSION:=		1.17.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2ba980f720a5bdce4ec05423519acc35
+PKG_MD5SUM:=		2908d1d1ca83ff12bc0b05f0d2a3335c
 PKG_DESCR:=		Core utilities for embedded Linux systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/

package/busybox/patches/001-ipkg.patch

@@ -1,7 +1,7 @@
-diff -Nur busybox-1.16.1.orig/archival/Config.in busybox-1.16.1/archival/Config.in
---- busybox-1.16.1.orig/archival/Config.in	2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1/archival/Config.in	2010-06-29 17:31:21.805863709 +0200
-@@ -187,6 +187,14 @@
+diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config.src
+--- busybox-1.17.0.orig/archival/Config.src	2010-06-25 01:32:35.000000000 +0200
++++ busybox-1.17.0/archival/Config.src	2010-07-08 12:04:28.571001869 +0200
+@@ -202,6 +202,14 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
  
@@ -15,10 +15,10 @@ diff -Nur busybox-1.16.1.orig/archival/Config.in busybox-1.16.1/archival/Config.
 +
  config RPM2CPIO
  	bool "rpm2cpio"
- 	default n
-diff -Nur busybox-1.16.1.orig/archival/ipkg.c busybox-1.16.1/archival/ipkg.c
---- busybox-1.16.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/ipkg.c	2010-06-29 17:31:21.827118101 +0200
+ 	default y
+diff -Nur busybox-1.17.0.orig/archival/ipkg.c busybox-1.17.0/archival/ipkg.c
+--- busybox-1.17.0.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/ipkg.c	2010-07-08 12:01:56.199003930 +0200
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -48,20 +48,20 @@ diff -Nur busybox-1.16.1.orig/archival/ipkg.c busybox-1.16.1/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.16.1.orig/archival/Kbuild busybox-1.16.1/archival/Kbuild
---- busybox-1.16.1.orig/archival/Kbuild	2010-03-20 03:58:07.000000000 +0100
-+++ busybox-1.16.1/archival/Kbuild	2010-06-29 17:31:21.865866986 +0200
-@@ -16,6 +16,7 @@
- lib-$(CONFIG_DPKG_DEB)		+= dpkg_deb.o
- lib-$(CONFIG_GUNZIP)		+= bbunzip.o
+diff -Nur busybox-1.17.0.orig/archival/Kbuild.src busybox-1.17.0/archival/Kbuild.src
+--- busybox-1.17.0.orig/archival/Kbuild.src	2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/archival/Kbuild.src	2010-07-08 12:02:53.135001644 +0200
+@@ -23,6 +23,7 @@
+ lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
+ lib-$(CONFIG_BZIP2)		+= bzip2.o bbunzip.o
 +lib-$(CONFIG_IPKG)		+= ipkg.o
- lib-$(CONFIG_LZOP)		+= lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
- lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
- lib-$(CONFIG_RPM2CPIO)		+= rpm2cpio.o
-diff -Nur busybox-1.16.1.orig/archival/libipkg/args.c busybox-1.16.1/archival/libipkg/args.c
---- busybox-1.16.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/args.c	2010-06-29 17:31:21.905863813 +0200
+ 
+ lib-$(CONFIG_UNXZ)		+= bbunzip.o
+ lib-$(CONFIG_UNLZMA)		+= bbunzip.o
+diff -Nur busybox-1.17.0.orig/archival/libipkg/args.c busybox-1.17.0/archival/libipkg/args.c
+--- busybox-1.17.0.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/args.c	2010-07-08 12:01:56.199003930 +0200
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -305,9 +305,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/args.c busybox-1.16.1/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/args.h busybox-1.16.1/archival/libipkg/args.h
---- busybox-1.16.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/args.h	2010-06-29 17:31:21.945866019 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/args.h busybox-1.17.0/archival/libipkg/args.h
+--- busybox-1.17.0.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/args.h	2010-07-08 12:01:56.199003930 +0200
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -381,9 +381,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/args.h busybox-1.16.1/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.c busybox-1.16.1/archival/libipkg/conffile.c
---- busybox-1.16.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile.c	2010-06-29 17:31:21.987118040 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.c busybox-1.17.0/archival/libipkg/conffile.c
+--- busybox-1.17.0.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile.c	2010-07-08 12:01:56.199003930 +0200
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -450,9 +450,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.c busybox-1.16.1/archiva
 +
 +    return ret;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.h busybox-1.16.1/archival/libipkg/conffile.h
---- busybox-1.16.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile.h	2010-06-29 17:31:22.018368070 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.h busybox-1.17.0/archival/libipkg/conffile.h
+--- busybox-1.17.0.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile.h	2010-07-08 12:01:56.203011424 +0200
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -484,9 +484,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.h busybox-1.16.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.c busybox-1.16.1/archival/libipkg/conffile_list.c
---- busybox-1.16.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile_list.c	2010-06-29 17:31:22.055873481 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.c busybox-1.17.0/archival/libipkg/conffile_list.c
+--- busybox-1.17.0.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile_list.c	2010-07-08 12:01:56.203011424 +0200
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -535,9 +535,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.c busybox-1.16.1/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.h busybox-1.16.1/archival/libipkg/conffile_list.h
---- busybox-1.16.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile_list.h	2010-06-29 17:31:22.089612450 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.h busybox-1.17.0/archival/libipkg/conffile_list.h
+--- busybox-1.17.0.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile_list.h	2010-07-08 12:01:56.203011424 +0200
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -575,9 +575,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.h busybox-1.16.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.c busybox-1.16.1/archival/libipkg/file_util.c
---- busybox-1.16.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/file_util.c	2010-06-29 17:31:22.137606321 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.c busybox-1.17.0/archival/libipkg/file_util.c
+--- busybox-1.17.0.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/file_util.c	2010-07-08 12:01:56.203011424 +0200
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -765,9 +765,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.c busybox-1.16.1/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.h busybox-1.16.1/archival/libipkg/file_util.h
---- busybox-1.16.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/file_util.h	2010-06-29 17:31:22.220596553 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.h busybox-1.17.0/archival/libipkg/file_util.h
+--- busybox-1.17.0.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/file_util.h	2010-07-08 12:01:56.203011424 +0200
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -798,9 +798,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.h busybox-1.16.1/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.c busybox-1.16.1/archival/libipkg/hash_table.c
---- busybox-1.16.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/hash_table.c	2010-06-29 17:31:22.257056261 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.c busybox-1.17.0/archival/libipkg/hash_table.c
+--- busybox-1.17.0.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/hash_table.c	2010-07-08 12:01:56.203011424 +0200
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -957,9 +957,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.c busybox-1.16.1/archi
 +    }
 +}
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.h busybox-1.16.1/archival/libipkg/hash_table.h
---- busybox-1.16.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/hash_table.h	2010-06-29 17:31:22.305858166 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.h busybox-1.17.0/archival/libipkg/hash_table.h
+--- busybox-1.17.0.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/hash_table.h	2010-07-08 12:01:56.203011424 +0200
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1005,9 +1005,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.h busybox-1.16.1/archi
 +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
 +
 +#endif /* _HASH_TABLE_H_ */
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.16.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_cmd.c	2010-06-29 19:19:50.699618181 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.0/archival/libipkg/ipkg_cmd.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.c	2010-07-08 12:01:56.206999641 +0200
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2375,9 +2375,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.16.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.16.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_cmd.h	2010-06-29 17:31:22.398358961 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.0/archival/libipkg/ipkg_cmd.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.h	2010-07-08 12:01:56.206999641 +0200
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2420,9 +2420,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.16.1/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c busybox-1.16.1/archival/libipkg/ipkg_conf.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_conf.c	2010-06-29 17:31:22.425857952 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c busybox-1.17.0/archival/libipkg/ipkg_conf.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.c	2010-07-08 12:01:56.211000430 +0200
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3135,9 +3135,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c busybox-1.16.1/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h busybox-1.16.1/archival/libipkg/ipkg_conf.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_conf.h	2010-06-29 17:31:22.458368131 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h busybox-1.17.0/archival/libipkg/ipkg_conf.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.h	2010-07-08 12:01:56.211000430 +0200
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3246,9 +3246,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h busybox-1.16.1/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c busybox-1.16.1/archival/libipkg/ipkg_configure.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_configure.c	2010-06-29 17:31:22.488368061 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c busybox-1.17.0/archival/libipkg/ipkg_configure.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.c	2010-07-08 12:01:56.211000430 +0200
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3290,9 +3290,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c busybox-1.16.1/a
 +    return 0;
 +}
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h busybox-1.16.1/archival/libipkg/ipkg_configure.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_configure.h	2010-06-29 17:31:22.527882534 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h busybox-1.17.0/archival/libipkg/ipkg_configure.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.h	2010-07-08 12:01:56.211000430 +0200
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3319,9 +3319,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h busybox-1.16.1/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.c busybox-1.16.1/archival/libipkg/ipkg_download.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_download.c	2010-06-29 17:31:22.569385415 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.c busybox-1.17.0/archival/libipkg/ipkg_download.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_download.c	2010-07-08 12:01:56.211000430 +0200
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3518,9 +3518,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.c busybox-1.16.1/ar
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.h busybox-1.16.1/archival/libipkg/ipkg_download.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_download.h	2010-06-29 17:31:22.608368046 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.h busybox-1.17.0/archival/libipkg/ipkg_download.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_download.h	2010-07-08 12:01:56.211000430 +0200
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3552,9 +3552,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.h busybox-1.16.1/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg.h busybox-1.16.1/archival/libipkg/ipkg.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg.h	2010-06-29 17:31:22.647281522 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg.h busybox-1.17.0/archival/libipkg/ipkg.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg.h	2010-07-08 12:01:56.211000430 +0200
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3624,9 +3624,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg.h busybox-1.16.1/archival/li
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h busybox-1.16.1/archival/libipkg/ipkg_includes.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_includes.h	2010-06-29 17:32:10.339618090 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h busybox-1.17.0/archival/libipkg/ipkg_includes.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_includes.h	2010-07-08 12:01:56.214999822 +0200
 @@ -0,0 +1,81 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3709,9 +3709,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h busybox-1.16.1/ar
 +#include <sys/mount.h> 
 +
 +#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.c busybox-1.16.1/archival/libipkg/ipkg_install.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_install.c	2010-06-29 17:31:22.727172508 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.c busybox-1.17.0/archival/libipkg/ipkg_install.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_install.c	2010-07-08 12:01:56.219000332 +0200
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5695,9 +5695,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.c busybox-1.16.1/arc
 +}
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.h busybox-1.16.1/archival/libipkg/ipkg_install.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_install.h	2010-06-29 17:31:22.768368136 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.h busybox-1.17.0/archival/libipkg/ipkg_install.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_install.h	2010-07-08 12:01:56.219000332 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5734,9 +5734,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.h busybox-1.16.1/arc
 +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.c busybox-1.16.1/archival/libipkg/ipkg_message.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_message.c	2010-06-29 17:31:22.798368009 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.c busybox-1.17.0/archival/libipkg/ipkg_message.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_message.c	2010-07-08 12:01:56.219000332 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5773,9 +5773,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.c busybox-1.16.1/arc
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.h busybox-1.16.1/archival/libipkg/ipkg_message.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_message.h	2010-06-29 17:31:22.839937503 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.h busybox-1.17.0/archival/libipkg/ipkg_message.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_message.h	2010-07-08 12:01:56.219000332 +0200
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5809,9 +5809,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.h busybox-1.16.1/arc
 +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
 +
 +#endif /* _IPKG_MESSAGE_H_ */
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c busybox-1.16.1/archival/libipkg/ipkg_remove.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_remove.c	2010-06-29 17:31:22.876628032 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c busybox-1.17.0/archival/libipkg/ipkg_remove.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.c	2010-07-08 12:01:56.219000332 +0200
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6198,9 +6198,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c busybox-1.16.1/arch
 +
 +    return 0;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h busybox-1.16.1/archival/libipkg/ipkg_remove.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_remove.h	2010-06-29 17:31:22.918368225 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h busybox-1.17.0/archival/libipkg/ipkg_remove.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.h	2010-07-08 12:01:56.223000282 +0200
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6235,9 +6235,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h busybox-1.16.1/arch
 +
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.16.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_upgrade.c	2010-06-29 17:31:22.976264794 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.0/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.c	2010-07-08 12:01:56.223000282 +0200
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6318,9 +6318,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.16.1/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.16.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_upgrade.h	2010-06-29 17:31:23.015873328 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.0/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.h	2010-07-08 12:01:56.223000282 +0200
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6340,9 +6340,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.16.1/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c busybox-1.16.1/archival/libipkg/ipkg_utils.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_utils.c	2010-06-29 17:31:23.067592883 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.c busybox-1.17.0/archival/libipkg/ipkg_utils.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_utils.c	2010-07-08 12:01:56.227000792 +0200
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6529,9 +6529,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c busybox-1.16.1/archi
 +}
 +
 +       
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h busybox-1.16.1/archival/libipkg/ipkg_utils.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_utils.h	2010-06-29 17:31:23.105873432 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h busybox-1.17.0/archival/libipkg/ipkg_utils.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_utils.h	2010-07-08 12:01:56.227000792 +0200
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6562,9 +6562,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h busybox-1.16.1/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/Kbuild busybox-1.16.1/archival/libipkg/Kbuild
---- busybox-1.16.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/Kbuild	2010-06-29 17:31:23.145868229 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/Kbuild busybox-1.17.0/archival/libipkg/Kbuild
+--- busybox-1.17.0.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/Kbuild	2010-07-08 12:01:56.227000792 +0200
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6626,9 +6626,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/Kbuild busybox-1.16.1/archival/li
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.c busybox-1.16.1/archival/libipkg/libipkg.c
---- busybox-1.16.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/libipkg.c	2010-06-29 19:58:50.069617923 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival/libipkg/libipkg.c
+--- busybox-1.17.0.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/libipkg.c	2010-07-08 12:01:56.231000184 +0200
 @@ -0,0 +1,550 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7180,9 +7180,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.c busybox-1.16.1/archival
 +
 +	return err;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.h busybox-1.16.1/archival/libipkg/libipkg.h
---- busybox-1.16.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/libipkg.h	2010-06-29 17:31:24.283460019 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.h busybox-1.17.0/archival/libipkg/libipkg.h
+--- busybox-1.17.0.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/libipkg.h	2010-07-08 12:01:56.231000184 +0200
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7262,9 +7262,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.h busybox-1.16.1/archival
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.c busybox-1.16.1/archival/libipkg/nv_pair.c
---- busybox-1.16.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair.c	2010-06-29 17:31:24.316180264 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.c busybox-1.17.0/archival/libipkg/nv_pair.c
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair.c	2010-07-08 12:01:56.231000184 +0200
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7306,9 +7306,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.c busybox-1.16.1/archival
 +}
 +
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.h busybox-1.16.1/archival/libipkg/nv_pair.h
---- busybox-1.16.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair.h	2010-06-29 17:31:24.358376170 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.h busybox-1.17.0/archival/libipkg/nv_pair.h
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair.h	2010-07-08 12:01:56.231000184 +0200
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7342,9 +7342,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.h busybox-1.16.1/archival
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c busybox-1.16.1/archival/libipkg/nv_pair_list.c
---- busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair_list.c	2010-06-29 17:31:24.395873641 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c busybox-1.17.0/archival/libipkg/nv_pair_list.c
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair_list.c	2010-07-08 12:01:56.231000184 +0200
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7444,9 +7444,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c busybox-1.16.1/arc
 +     }    
 +     return NULL;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h busybox-1.16.1/archival/libipkg/nv_pair_list.h
---- busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair_list.h	2010-06-29 17:31:24.439618049 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h busybox-1.17.0/archival/libipkg/nv_pair_list.h
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair_list.h	2010-07-08 12:01:56.235001811 +0200
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7508,9 +7508,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h busybox-1.16.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.c busybox-1.16.1/archival/libipkg/pkg.c
---- busybox-1.16.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg.c	2010-06-29 17:31:24.502860549 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.c busybox-1.17.0/archival/libipkg/pkg.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg.c	2010-07-08 12:01:56.239000923 +0200
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9269,9 +9269,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.c busybox-1.16.1/archival/lib
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.c busybox-1.16.1/archival/libipkg/pkg_depends.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_depends.c	2010-06-29 17:31:24.548368104 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.c busybox-1.17.0/archival/libipkg/pkg_depends.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_depends.c	2010-07-08 12:01:56.239000923 +0200
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10305,9 +10305,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.c busybox-1.16.1/arch
 +
 +     return 0;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.h busybox-1.16.1/archival/libipkg/pkg_depends.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_depends.h	2010-06-29 17:31:24.588368223 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.h busybox-1.17.0/archival/libipkg/pkg_depends.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_depends.h	2010-07-08 12:01:56.239000923 +0200
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10414,9 +10414,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.h busybox-1.16.1/arch
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.c busybox-1.16.1/archival/libipkg/pkg_dest.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest.c	2010-06-29 17:31:24.625873289 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.c busybox-1.17.0/archival/libipkg/pkg_dest.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest.c	2010-07-08 12:01:56.239000923 +0200
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10510,9 +10510,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.c busybox-1.16.1/archiva
 +
 +    dest->root_dir = NULL;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.h busybox-1.16.1/archival/libipkg/pkg_dest.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest.h	2010-06-29 17:31:24.669618111 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.h busybox-1.17.0/archival/libipkg/pkg_dest.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest.h	2010-07-08 12:01:56.239000923 +0200
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10552,9 +10552,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.h busybox-1.16.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.16.1/archival/libipkg/pkg_dest_list.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest_list.c	2010-06-29 17:31:24.715868178 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.0/archival/libipkg/pkg_dest_list.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest_list.c	2010-07-08 12:01:56.243001712 +0200
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10641,9 +10641,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.16.1/ar
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.16.1/archival/libipkg/pkg_dest_list.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest_list.h	2010-06-29 17:31:24.760275316 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.0/archival/libipkg/pkg_dest_list.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest_list.h	2010-07-08 12:01:56.243001712 +0200
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10695,9 +10695,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.16.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.c busybox-1.16.1/archival/libipkg/pkg_extract.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_extract.c	2010-06-29 17:31:24.818364193 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.c busybox-1.17.0/archival/libipkg/pkg_extract.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_extract.c	2010-07-08 12:01:56.243001712 +0200
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10954,9 +10954,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.c busybox-1.16.1/arch
 +	
 +	return 0;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.h busybox-1.16.1/archival/libipkg/pkg_extract.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_extract.h	2010-06-29 17:31:24.858368110 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.h busybox-1.17.0/archival/libipkg/pkg_extract.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_extract.h	2010-07-08 12:01:56.243001712 +0200
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10990,9 +10990,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.h busybox-1.16.1/arch
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.h busybox-1.16.1/archival/libipkg/pkg.h
---- busybox-1.16.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg.h	2010-06-29 17:31:24.897965989 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.h busybox-1.17.0/archival/libipkg/pkg.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg.h	2010-07-08 12:01:56.243001712 +0200
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11223,9 +11223,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.h busybox-1.16.1/archival/lib
 +int pkg_write_changed_filelists(ipkg_conf_t *conf);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.c busybox-1.16.1/archival/libipkg/pkg_hash.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_hash.c	2010-06-29 17:31:24.956062867 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.c busybox-1.17.0/archival/libipkg/pkg_hash.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_hash.c	2010-07-08 12:01:56.243001712 +0200
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11850,9 +11850,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.c busybox-1.16.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.h busybox-1.16.1/archival/libipkg/pkg_hash.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_hash.h	2010-06-29 17:31:25.005861391 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.h busybox-1.17.0/archival/libipkg/pkg_hash.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_hash.h	2010-07-08 12:01:56.327000396 +0200
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11915,9 +11915,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.h busybox-1.16.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.c busybox-1.16.1/archival/libipkg/pkg_parse.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_parse.c	2010-06-29 17:31:25.059133294 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.c busybox-1.17.0/archival/libipkg/pkg_parse.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_parse.c	2010-07-08 12:01:56.343005785 +0200
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12287,9 +12287,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.c busybox-1.16.1/archiv
 +
 +    return 0;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.h busybox-1.16.1/archival/libipkg/pkg_parse.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_parse.h	2010-06-29 17:31:25.098367969 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.h busybox-1.17.0/archival/libipkg/pkg_parse.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_parse.h	2010-07-08 12:01:56.343005785 +0200
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12322,9 +12322,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.h busybox-1.16.1/archiv
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.c busybox-1.16.1/archival/libipkg/pkg_src.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src.c	2010-06-29 17:31:25.135873346 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.c busybox-1.17.0/archival/libipkg/pkg_src.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src.c	2010-07-08 12:01:56.343005785 +0200
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12369,9 +12369,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.c busybox-1.16.1/archival
 +}
 +
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.h busybox-1.16.1/archival/libipkg/pkg_src.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src.h	2010-06-29 17:31:25.195873136 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.h busybox-1.17.0/archival/libipkg/pkg_src.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src.h	2010-07-08 12:01:56.343005785 +0200
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12407,9 +12407,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.h busybox-1.16.1/archival
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c busybox-1.16.1/archival/libipkg/pkg_src_list.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src_list.c	2010-06-29 17:31:25.238287396 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c busybox-1.17.0/archival/libipkg/pkg_src_list.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src_list.c	2010-07-08 12:01:56.359001397 +0200
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12486,9 +12486,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c busybox-1.16.1/arc
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h busybox-1.16.1/archival/libipkg/pkg_src_list.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src_list.h	2010-06-29 17:31:25.278367968 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h busybox-1.17.0/archival/libipkg/pkg_src_list.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src_list.h	2010-07-08 12:01:56.359001397 +0200
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12547,9 +12547,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h busybox-1.16.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.c busybox-1.16.1/archival/libipkg/pkg_vec.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_vec.c	2010-06-29 17:31:25.319617983 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.c busybox-1.17.0/archival/libipkg/pkg_vec.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_vec.c	2010-07-08 12:01:56.367001298 +0200
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12782,9 +12782,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.c busybox-1.16.1/archival
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.h busybox-1.16.1/archival/libipkg/pkg_vec.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_vec.h	2010-06-29 17:31:25.358368186 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.h busybox-1.17.0/archival/libipkg/pkg_vec.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_vec.h	2010-07-08 12:01:56.367001298 +0200
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12848,9 +12848,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.h busybox-1.16.1/archival
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.16.1/archival/libipkg/sprintf_alloc.h
---- busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/sprintf_alloc.h	2010-06-29 17:31:25.395865857 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.0/archival/libipkg/sprintf_alloc.h
+--- busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/sprintf_alloc.h	2010-07-08 12:01:56.375003713 +0200
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12877,9 +12877,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.16.1/ar
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.c busybox-1.16.1/archival/libipkg/str_list.c
---- busybox-1.16.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_list.c	2010-06-29 17:31:25.437577685 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.c busybox-1.17.0/archival/libipkg/str_list.c
+--- busybox-1.17.0.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_list.c	2010-07-08 12:01:56.375003713 +0200
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -12957,9 +12957,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.c busybox-1.16.1/archiva
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.h busybox-1.16.1/archival/libipkg/str_list.h
---- busybox-1.16.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_list.h	2010-06-29 17:31:25.487410851 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.h busybox-1.17.0/archival/libipkg/str_list.h
+--- busybox-1.17.0.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_list.h	2010-07-08 12:01:56.375003713 +0200
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13012,9 +13012,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.h busybox-1.16.1/archiva
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.c busybox-1.16.1/archival/libipkg/str_util.c
---- busybox-1.16.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_util.c	2010-06-29 17:31:25.540714295 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.c busybox-1.17.0/archival/libipkg/str_util.c
+--- busybox-1.17.0.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_util.c	2010-07-08 12:01:56.375003713 +0200
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13085,9 +13085,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.c busybox-1.16.1/archiva
 +    return str ? strdup(str) : NULL;
 +}
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.h busybox-1.16.1/archival/libipkg/str_util.h
---- busybox-1.16.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_util.h	2010-06-29 17:31:25.578749246 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.h busybox-1.17.0/archival/libipkg/str_util.h
+--- busybox-1.17.0.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_util.h	2010-07-08 12:01:56.391000442 +0200
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13116,9 +13116,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.h busybox-1.16.1/archiva
 +char *str_dup_safe(const char *str);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/user.c busybox-1.16.1/archival/libipkg/user.c
---- busybox-1.16.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/user.c	2010-06-29 17:31:25.628536327 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/user.c busybox-1.17.0/archival/libipkg/user.c
+--- busybox-1.17.0.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/user.c	2010-07-08 12:01:56.391000442 +0200
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13169,9 +13169,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/user.c busybox-1.16.1/archival/li
 +
 +     return response;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/user.h busybox-1.16.1/archival/libipkg/user.h
---- busybox-1.16.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/user.h	2010-06-29 17:31:25.678337891 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/user.h busybox-1.17.0/archival/libipkg/user.h
+--- busybox-1.17.0.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/user.h	2010-07-08 12:01:56.391000442 +0200
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13196,9 +13196,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/user.h busybox-1.16.1/archival/li
 +
 +char *get_user_response(const char *format, ...);
 +
-diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.c busybox-1.16.1/archival/libipkg/void_list.c
---- busybox-1.16.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/void_list.c	2010-06-29 17:31:25.715873105 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.c busybox-1.17.0/archival/libipkg/void_list.c
+--- busybox-1.17.0.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/void_list.c	2010-07-08 12:01:56.407001361 +0200
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13394,9 +13394,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.c busybox-1.16.1/archiv
 +     else
 +	  return NULL;
 +}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.h busybox-1.16.1/archival/libipkg/void_list.h
---- busybox-1.16.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/void_list.h	2010-06-29 17:31:25.758368030 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.h busybox-1.17.0/archival/libipkg/void_list.h
+--- busybox-1.17.0.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/void_list.h	2010-07-08 12:01:56.407001361 +0200
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13457,9 +13457,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.h busybox-1.16.1/archiv
 +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
 +
 +#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.c busybox-1.16.1/archival/libipkg/xsystem.c
---- busybox-1.16.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/xsystem.c	2010-06-29 17:31:25.799781135 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.c busybox-1.17.0/archival/libipkg/xsystem.c
+--- busybox-1.17.0.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/xsystem.c	2010-07-08 12:01:56.407001361 +0200
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13525,9 +13525,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.c busybox-1.16.1/archival
 +    return -1;
 +}
 +	 
-diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.h busybox-1.16.1/archival/libipkg/xsystem.h
---- busybox-1.16.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/xsystem.h	2010-06-29 17:31:25.855865061 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.h busybox-1.17.0/archival/libipkg/xsystem.h
+--- busybox-1.17.0.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/xsystem.h	2010-07-08 12:01:56.407001361 +0200
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13563,10 +13563,10 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.h busybox-1.16.1/archival
 +
 +#endif
 +	 
-diff -Nur busybox-1.16.1.orig/archival/libunarchive/Kbuild busybox-1.16.1/archival/libunarchive/Kbuild
---- busybox-1.16.1.orig/archival/libunarchive/Kbuild	2010-03-20 03:58:07.000000000 +0100
-+++ busybox-1.16.1/archival/libunarchive/Kbuild	2010-06-29 17:31:25.898368046 +0200
-@@ -40,6 +40,7 @@
+diff -Nur busybox-1.17.0.orig/archival/libunarchive/Kbuild.src busybox-1.17.0/archival/libunarchive/Kbuild.src
+--- busybox-1.17.0.orig/archival/libunarchive/Kbuild.src	2010-07-06 02:15:46.000000000 +0200
++++ busybox-1.17.0/archival/libunarchive/Kbuild.src	2010-07-08 12:03:29.499017277 +0200
+@@ -43,6 +43,7 @@
  lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
  lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
  lib-$(CONFIG_GUNZIP)                    += decompress_unzip.o
@@ -13574,10 +13574,10 @@ diff -Nur busybox-1.16.1.orig/archival/libunarchive/Kbuild busybox-1.16.1/archiv
  lib-$(CONFIG_RPM2CPIO)                  += decompress_unzip.o get_header_cpio.o
  lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o get_header_cpio.o
  lib-$(CONFIG_TAR)                       += get_header_tar.o
-diff -Nur busybox-1.16.1.orig/include/applets.h busybox-1.16.1/include/applets.h
---- busybox-1.16.1.orig/include/applets.h	2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1/include/applets.h	2010-06-29 17:31:25.938368064 +0200
-@@ -214,6 +214,7 @@
+diff -Nur busybox-1.17.0.orig/include/applets.src.h busybox-1.17.0/include/applets.src.h
+--- busybox-1.17.0.orig/include/applets.src.h	2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/include/applets.src.h	2010-07-08 12:04:57.087012849 +0200
+@@ -209,6 +209,7 @@
  IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
  IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
@@ -13585,10 +13585,10 @@ diff -Nur busybox-1.16.1.orig/include/applets.h busybox-1.16.1/include/applets.h
  IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP))
-diff -Nur busybox-1.16.1.orig/include/unarchive.h busybox-1.16.1/include/unarchive.h
---- busybox-1.16.1.orig/include/unarchive.h	2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1/include/unarchive.h	2010-06-29 17:31:25.978368044 +0200
-@@ -53,7 +53,7 @@
+diff -Nur busybox-1.17.0.orig/include/unarchive.h busybox-1.17.0/include/unarchive.h
+--- busybox-1.17.0.orig/include/unarchive.h	2010-07-03 13:18:17.000000000 +0200
++++ busybox-1.17.0/include/unarchive.h	2010-07-08 12:01:56.422999486 +0200
+@@ -76,7 +76,7 @@
  	off_t offset;
  
  	/* Archiver specific. Can make it a union if it ever gets big */
@@ -13597,7 +13597,7 @@ diff -Nur busybox-1.16.1.orig/include/unarchive.h busybox-1.16.1/include/unarchi
  	smallint tar__end;
  # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
  	char* tar__longname;
-@@ -65,7 +65,7 @@
+@@ -95,7 +95,7 @@
  	struct hardlinks_t *cpio__hardlinks_to_create;
  	struct hardlinks_t *cpio__created_hardlinks;
  #endif
@@ -13606,10 +13606,10 @@ diff -Nur busybox-1.16.1.orig/include/unarchive.h busybox-1.16.1/include/unarchi
  	/* Temporary storage */
  	char *dpkg__buffer;
  	/* How to process any sub archive, e.g. get_header_tar_gz */
-diff -Nur busybox-1.16.1.orig/include/usage.h busybox-1.16.1/include/usage.h
---- busybox-1.16.1.orig/include/usage.h	2010-03-28 19:44:04.000000000 +0200
-+++ busybox-1.16.1/include/usage.h	2010-06-29 17:31:26.018367985 +0200
-@@ -1592,6 +1592,82 @@
+diff -Nur busybox-1.17.0.orig/include/usage.src.h busybox-1.17.0/include/usage.src.h
+--- busybox-1.17.0.orig/include/usage.src.h	2010-07-03 13:18:17.000000000 +0200
++++ busybox-1.17.0/include/usage.src.h	2010-07-08 12:07:04.099000968 +0200
+@@ -1556,6 +1556,82 @@
         "$ ls -la /tmp/busybox*\n" \
         "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
  
@@ -13692,10 +13692,10 @@ diff -Nur busybox-1.16.1.orig/include/usage.h busybox-1.16.1/include/usage.h
  #define halt_trivial_usage \
         "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
  #define halt_full_usage "\n\n" \
-diff -Nur busybox-1.16.1.orig/Makefile busybox-1.16.1/Makefile
---- busybox-1.16.1.orig/Makefile	2010-03-28 19:44:09.000000000 +0200
-+++ busybox-1.16.1/Makefile	2010-06-29 17:31:26.058368031 +0200
-@@ -454,6 +454,7 @@
+diff -Nur busybox-1.17.0.orig/Makefile busybox-1.17.0/Makefile
+--- busybox-1.17.0.orig/Makefile	2010-07-06 04:16:45.000000000 +0200
++++ busybox-1.17.0/Makefile	2010-07-08 12:01:56.455000212 +0200
+@@ -459,6 +459,7 @@
  
  libs-y		:= \
  		archival/ \

package/busybox/patches/002-find-empty.patch

@@ -1,25 +1,22 @@
-diff -Nur busybox-1.15.2.orig/findutils/Config.in busybox-1.15.2/findutils/Config.in
---- busybox-1.15.2.orig/findutils/Config.in	2009-09-26 15:14:57.000000000 +0200
-+++ busybox-1.15.2/findutils/Config.in	2009-11-28 12:41:31.000000000 +0100
-@@ -81,6 +81,14 @@
- 	help
- 	  Support the 'find -inum' option for searching by inode number.
- 
-+config FEATURE_FIND_EMPTY
-+	bool "Enable -empty option matching empty files and directories"
-+	default y
-+	depends on FIND
-+	help
-+	  Support the 'find -empty' option for searching empty files 
-+	  and directories.
-+
- config FEATURE_FIND_EXEC
- 	bool "Enable -exec: execute commands"
- 	default y
-diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
---- busybox-1.15.2.orig/findutils/find.c	2009-10-08 03:04:40.000000000 +0200
-+++ busybox-1.15.2/findutils/find.c	2009-11-28 12:48:36.000000000 +0100
-@@ -93,6 +93,7 @@
+diff -Nur busybox-1.17.0.orig/findutils/find.c busybox-1.17.0/findutils/find.c
+--- busybox-1.17.0.orig/findutils/find.c	2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/findutils/find.c	2010-07-08 12:33:55.759015289 +0200
+@@ -133,6 +133,14 @@
+ //config:	help
+ //config:	  Support the 'find -inum' option for searching by inode number.
+ //config:
++//config:config FEATURE_FIND_EMPTY
++//config:       bool "Enable -empty option matching empty files and directories"
++//config:       default y
++//config:       depends on FIND
++//config:       help
++//config:         Support the 'find -empty' option for searching empty files 
++//config:         and directories.
++//config:
+ //config:config FEATURE_FIND_EXEC
+ //config:	bool "Enable -exec: execute commands"
+ //config:	default y
+@@ -270,6 +278,7 @@
  IF_FEATURE_FIND_CONTEXT(ACTS(context, security_context_t context;))
  IF_FEATURE_FIND_PAREN(  ACTS(paren, action ***subexpr;))
  IF_FEATURE_FIND_PRUNE(  ACTS(prune))
@@ -27,7 +24,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
  IF_FEATURE_FIND_DELETE( ACTS(delete))
  IF_FEATURE_FIND_EXEC(   ACTS(exec,  char **exec_argv; unsigned *subst_count; int exec_argc;))
  IF_FEATURE_FIND_GROUP(  ACTS(group, gid_t gid;))
-@@ -333,6 +334,34 @@
+@@ -519,6 +528,34 @@
  	return exec_actions(ap->subexpr, fileName, statbuf);
  }
  #endif
@@ -62,7 +59,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
  #if ENABLE_FEATURE_FIND_SIZE
  ACTF(size)
  {
-@@ -476,6 +505,7 @@
+@@ -686,6 +723,7 @@
  	IF_FEATURE_FIND_PRINT0( PARM_print0    ,)
  	IF_FEATURE_FIND_DEPTH(  PARM_depth     ,)
  	IF_FEATURE_FIND_PRUNE(  PARM_prune     ,)
@@ -70,7 +67,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
  	IF_FEATURE_FIND_DELETE( PARM_delete    ,)
  	IF_FEATURE_FIND_EXEC(   PARM_exec      ,)
  	IF_FEATURE_FIND_PAREN(  PARM_char_brace,)
-@@ -509,6 +539,7 @@
+@@ -720,6 +758,7 @@
  	IF_FEATURE_FIND_PRINT0( "-print0\0" )
  	IF_FEATURE_FIND_DEPTH(  "-depth\0"  )
  	IF_FEATURE_FIND_PRUNE(  "-prune\0"  )
@@ -78,7 +75,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
  	IF_FEATURE_FIND_DELETE( "-delete\0" )
  	IF_FEATURE_FIND_EXEC(   "-exec\0"   )
  	IF_FEATURE_FIND_PAREN(  "(\0"       )
-@@ -627,6 +658,12 @@
+@@ -839,6 +878,12 @@
  			(void) ALLOC_ACTION(prune);
  		}
  #endif
@@ -91,15 +88,3 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
  #if ENABLE_FEATURE_FIND_DELETE
  		else if (parm == PARM_delete) {
  			G.need_print = 0;
-diff -Nur busybox-1.15.2.orig/include/usage.h busybox-1.15.2/include/usage.h
---- busybox-1.15.2.orig/include/usage.h	2009-10-08 02:59:09.000000000 +0200
-+++ busybox-1.15.2/include/usage.h	2009-11-28 12:42:43.000000000 +0100
-@@ -1239,6 +1239,8 @@
-      "\n	-group NAME	File belongs to group NAME (numeric group ID allowed)") \
- 	IF_FEATURE_FIND_DEPTH( \
-      "\n	-depth		Process directory name after traversing it") \
-+ 	IF_FEATURE_FIND_EMPTY( \
-+     "\n	-empty		File or directory is empty") \
- 	IF_FEATURE_FIND_SIZE( \
-      "\n	-size N[bck]	File size is N (c:bytes,k:kbytes,b:512 bytes(def.))." \
-      "\n			+/-N: file size is bigger/smaller than N") \

package/busybox/patches/patch-include_libbb_h

@@ -1,18 +1,23 @@
---- busybox-1.15.2.orig/include/libbb.h	Thu Oct  8 03:04:16 2009
-+++ busybox-1.15.2/include/libbb.h	Sat Dec 19 12:42:57 2009
-@@ -48,6 +48,7 @@
- #define PATH_MAX 256
- #endif
- 
+diff -Nur busybox-1.17.0.orig/include/libbb.h busybox-1.17.0/include/libbb.h
+--- busybox-1.17.0.orig/include/libbb.h	2010-07-04 15:32:24.000000000 +0200
++++ busybox-1.17.0/include/libbb.h	2010-07-08 12:27:04.531002165 +0200
+@@ -40,6 +40,9 @@
+ /* Try to pull in PATH_MAX */
+ #include <limits.h>
+ #include <sys/param.h>
++
 +#if !(defined __APPLE__ || defined __FreeBSD__ || defined __MirBSD__ )
++
  #ifdef HAVE_MNTENT_H
  #include <mntent.h>
  #endif
-@@ -61,6 +62,7 @@
- #include <selinux/context.h>
+@@ -52,6 +55,9 @@
  #include <selinux/flask.h>
  #include <selinux/av_permissions.h>
-+#endif
  #endif
- 
++
++#endif
++
  #if ENABLE_LOCALE_SUPPORT
+ # include <locale.h>
+ #else

package/busybox/patches/patch-include_platform_h

@@ -1,15 +1,16 @@
---- busybox-1.15.2.orig/include/platform.h	Sat Sep 26 15:14:33 2009
-+++ busybox-1.15.2/include/platform.h	Sat Dec 19 12:53:00 2009
-@@ -7,6 +7,8 @@
- #ifndef	BB_PLATFORM_H
- #define BB_PLATFORM_H 1
+diff -Nur busybox-1.17.0.orig/include/platform.h busybox-1.17.0/include/platform.h
+--- busybox-1.17.0.orig/include/platform.h	2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/include/platform.h	2010-07-08 12:15:16.099001527 +0200
+@@ -20,6 +20,8 @@
+ #define HAVE_STRSIGNAL 1
+ #define HAVE_VASPRINTF 1
  
 +#include <sys/param.h>
 +
  /* Convenience macros to test the version of gcc. */
  #undef __GNUC_PREREQ
  #if defined __GNUC__ && defined __GNUC_MINOR__
-@@ -133,7 +135,7 @@ char *strchrnul(const char *s, int c);
+@@ -161,7 +163,7 @@
  # define bswap_32 __bswap32
  # define bswap_16 __bswap16
  # define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN)
@@ -18,16 +19,7 @@
  # include <byteswap.h>
  # include <endian.h>
  #endif
-@@ -190,7 +192,7 @@ char *strchrnul(const char *s, int c);
- 
- /* ---- Networking ------------------------------------------ */
- 
--#ifndef __APPLE__
-+#if !(defined __APPLE__ || defined BSD)
- # include <arpa/inet.h>
- # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED)
- typedef int socklen_t;
-@@ -202,7 +204,7 @@ typedef int socklen_t;
+@@ -230,7 +232,7 @@
  /* ---- Compiler dependent settings ------------------------- */
  
  #if (defined __digital__ && defined __unix__) \
@@ -36,12 +28,3 @@
  # undef HAVE_MNTENT_H
  # undef HAVE_SYS_STATFS_H
  #else
-@@ -231,7 +233,7 @@ typedef int socklen_t;
- # define HAVE_FEATURES_H
- # include <stdint.h>
- # define HAVE_STDINT_H
--#elif !defined __APPLE__
-+#elif !(defined __APPLE__ || defined BSD)
- /* Largest integral types. */
- # if BB_BIG_ENDIAN
- /* Looks BROKEN! */

package/bzip2/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		3c15a0c8d1d3ee1c46a1634d00617b1a
 PKG_DESCR:=		bzip2 compression utility
-PKG_SECTION:=		utils
+PKG_SECTION:=		archive
 PKG_URL:=		http://www.bzip.org
 PKG_SITES:=		http://www.bzip.org/1.0.5/
 

package/ca-certificates/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		20090814
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		307052c985bec7f9a00eb84293eef779
 PKG_DESCR:=		Collection of common CA certificates
-PKG_SECTION:=		shells
+PKG_SECTION:=		net/security
 PKG_DEPENDS:=		openssl-util libopenssl
 PKG_URL:=		http://packages.debian.org/sid/ca-certificates
 PKG_SITES:=		http://ftp.debian.org/debian/pool/main/c/ca-certificates/

package/ccid/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.3.12
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		7fcdbacacd955659286f988fa9b6e0be
 PKG_DESCR:=		a generic USB CCID and ICCD driver
-PKG_SECTION:=		security
+PKG_SECTION:=		crypto
 PKG_BUILDDEP+=		pcsc-lite
 PKG_URL:=		http://pcsclite.alioth.debian.org/ccid.html
 PKG_SITES:=		https://alioth.debian.org/frs/download.php/3281/

package/chillispot/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		9d2597756af3fa14d7331b4a3651fc9b
 PKG_DESCR:=		Wireless LAN Access Point Controller
-PKG_SECTION:=		net
+PKG_SECTION:=		wifi
 PKG_DEPENDS:=		kmod-tun
 PKG_URL:=		http://www.chillispot.info
 PKG_SITES=		http://www.chillispot.info/download/

package/collectd/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		4.10.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c473cf8e9f22f5a9f7ef4c5be1b0c436
 PKG_DESCR:=		System statistics collection daemon
-PKG_SECTION:=		console
+PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://collectd.org
 PKG_SITES:=		http://collectd.org/files/

package/comgt/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.32
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		db2452680c3d953631299e331daf49ef
 PKG_DESCR:=		3G/GPRS datacard control tool
-PKG_SECTION:=		console
+PKG_SECTION:=		utils
 PKG_URL:=		http://sourceforge.net/projects/comgt
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=comgt/}
 

package/coreutils/Makefile

@@ -13,11 +13,12 @@ PKG_URL:=		http://www.gnu.org/software/coreutils/
 PKG_SITES:=		http://ftp.gnu.org/gnu/coreutils/
 
 PKG_DESCR_TSORT:=	topological sort utility
+PKG_SECTION_TSORT:=	misc
 
 include $(TOPDIR)/mk/package.mk
 
 #$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TSORT},${PKG_SECTION}))
+$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TSORT},${PKG_SECTION_TSORT}))
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_TSORT)/usr/bin

package/cpio/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1112bb6c45863468b5496ba128792f6c
 PKG_DESCR:=		copies files into or out of a cpio archive
-PKG_SECTION:=		net
+PKG_SECTION:=		archive
 PKG_URL:=		http://www.gnu.org/software/cpio/
 PKG_SITES:=		${MASTER_SITE_GNU:=cpio/}
 

package/cryptsetup/Makefile

@@ -4,16 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
-PKG_VERSION:=		1.0.7
+PKG_VERSION:=		1.1.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5eea2a77391a8a1a651b31cbaef59e22
+PKG_MD5SUM:=		318a64470861ea5b92a52f2014f1e7c1
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt \
 			kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc \
 			kmod-crypto-sha256 kmod-blk-dev-dm
 PKG_BUILDDEP+=		libgcrypt popt e2fsprogs lvm
-PKG_URL:=		http://cryptsetup.googlecode.com
+PKG_URL:=		http://cryptsetup.googlecode.com/
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
 
 PKG_TARGET_DEPENDS:=	!foxboard

package/cryptsetup/patches/patch-lib_setup_c

@@ -1,17 +0,0 @@
-already added in svn upstream
---- cryptsetup-1.0.7.orig/lib/setup.c	2009-07-22 13:12:44.000000000 +0200
-+++ cryptsetup-1.0.7/lib/setup.c	2009-08-22 15:10:32.000000000 +0200
-@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
- start:
- 	mk=NULL;
- 
--	if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
-+	if(options->passphrase) {
-+		passwordLen = strlen(options->passphrase);
-+		password = safe_alloc(passwordLen + 1);
-+		strncpy(password, options->passphrase, passwordLen + 1);
-+		tries = 0;
-+	} else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
- 		tries--;
- 	else
- 		tries = 0;

package/ctorrent/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
-PKG_SECTION:=		net
+PKG_SECTION:=		p2p
 PKG_URL:=		http://www.rahul.net/dholmes/ctorrent
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=dtorrent/}
 

package/cups/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		d95e2d588e3d36e563027a963b117b1b
 PKG_DESCR:=		Common Unix Printing System
-PKG_SECTION:=		net
+PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		zlib libpthread
 PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.cups.org

package/curl/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		7.20.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d7df0507db48546661b155b612cac19c
 PKG_DESCR:=		a client-side URL transfer tool
-PKG_SECTION:=		net
+PKG_SECTION:=		www
 PKG_DEPENDS:=		libcurl
 PKG_BUILDDEP+=		openssl zlib
 PKG_URL:=		http://curl.haxx.se

package/cutter/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.03
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		50093db9b64277643969ee75b83ebbd1
 PKG_DESCR:=		Abort TCP/IP connections routed over a firewall
-PKG_SECTION:=		net
+PKG_SECTION:=		firewall
 PKG_URL:=		http://www.lowth.com/cutter/software/
 PKG_SITES:=		http://www.lowth.com/cutter/software/
 

package/cxxtools/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4.8
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		16ce92a83beb925fa5138fc9a52d55af
 PKG_DESCR:=		a collection of general-purpose C++ classes
-PKG_SECTION:=		net
+PKG_SECTION:=		libs
 PKG_DEPENDS:=		libiconv
 PKG_BUILDDEP+=		libiconv
 PKG_URL:=		http://www.tntnet.org

package/dansguardian/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.10.1.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0987a1c9bfbdf398118386f10279611a
 PKG_DESCR:=		web content filter proxy
-PKG_SECTION:=		net
+PKG_SECTION:=		proxy
 PKG_CXX:=		DANSGUARDIAN
 PKG_DEPENDS:=		libpcre zlib
 PKG_BUILDDEP+=		pcre zlib

package/davfs2/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c9e8aeb15daeba4b6283b40bb640e908
 PKG_DESCR:=		WebDAV filesystem
-PKG_SECTION:=		admin
+PKG_SECTION:=		net/fs
 PKG_BUILDDEP+=		libiconv neon
 ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
 PKG_BUILDDEP+=		fuse

package/dbus/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.24
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		565346cecd9cfecf1463540c6086cc2c
 PKG_DESCR:=		DBUS library
-PKG_SECTION:=		net
+PKG_SECTION:=		libs
 PKG_DEPENDS:=		libexpat
 PKG_BUILDDEP+=		expat
 PKG_URL:=		http://dbus.freedesktop.org

package/depmaker

@@ -34,5 +34,5 @@ for dn in */Makefile; do
 	done
 	print -r -- $x
 done >Depends.mk
-#pbar=done
-#print -u2 "$pbar"
+pbar=done
+print -u2 "$pbar"

package/dhcp-forwarder/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.8
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		fb3670dee9f71af1e55ac5dcd64e213e
 PKG_DESCR:=		DHCP relay agent
-PKG_SECTION:=		net
+PKG_SECTION:=		dhcp
 PKG_URL:=		http://www.nongnu.org/dhcp-fwd
 PKG_SITES:=		http://savannah.nongnu.org/download/dhcp-fwd/ \
 			http://ftp.cc.uoc.gr/mirrors/nongnu.org/dhcp-fwd/

package/dhcp/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		4.1.1
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		38a74c89d8913b9b5f33737047623c18
 PKG_DESCR:=		ISC DHCP server
-PKG_SECTION:=		net
+PKG_SECTION:=		dhcp
 PKG_URL:=		https://www.isc.org/software/dhcp
 PKG_SITES:=		ftp://ftp.isc.org/isc/dhcp/
 

package/diffutils/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.8.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		71f9c5ae19b60608f6c7f162da86a428
 PKG_DESCR:=		show differences between two files
-PKG_SECTION:=		comp
+PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/diffutils/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 

package/dillo/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f8bcd62093f178bed81e46cc54e73f42
 PKG_DESCR:=		small graphical web browser
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
 PKG_DEPENDS+=		libstdcxx
 PKG_BUILDDEP+=		fltk libXi libiconv jpeg libpng zlib

package/dnsmasq/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.55
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		b093d7c6bc7f97ae6fd35d048529232a
 PKG_DESCR:=		A lightweight DNS and DHCP server
-PKG_SECTION:=		net
+PKG_SECTION:=		dns
 PKG_URL:=		http://thekelleys.org.uk/dnsmasq
 PKG_SITES:=		http://thekelleys.org.uk/dnsmasq/
 

package/dosfstools/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		3.0.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		bd273cf8aa6341c0b52cbac72050bcf4
 PKG_DESCR:=		Utilities to create and check MS-DOS FAT filesystems
-PKG_SECTION:=		admin
+PKG_SECTION:=		fs
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools
 PKG_SITES:=		http://www.daniel-baumann.ch/software/dosfstools/
 

package/dovecot/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		b7d0081b17ff6afae85e8dc14157fa57
 PKG_DESCR:=		A minimal and secure imap server
-PKG_SECTION:=		net
+PKG_SECTION:=		mail
 PKG_URL:=		http://www.dovecot.org
 PKG_SITES:=		http://www.dovecot.org/releases/1.2/
 

package/dri2proto/Makefile

@@ -7,8 +7,6 @@ PKG_NAME:=		dri2proto
 PKG_VERSION:=		2.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2087269416782cff56f9b22d1449c192
-PKG_DESCR:=		DRI2 proto headers
-PKG_URL:=		add project url
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
 
 include $(TOPDIR)/mk/package.mk

package/dropbear/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.52
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
 PKG_DESCR:=		SSH 2 server/client designed for embedded systems
-PKG_SECTION:=		net
+PKG_SECTION:=		net/security
 PKG_URL:=		http://matt.ucc.asn.au/dropbear
 PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/
 

package/e2fsprogs/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.41.12
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1b24a21fc0c2381ef420961cbfec733f
 PKG_DESCR:=		Ext2/3/4 filesystem utilities
-PKG_SECTION:=		admin
+PKG_SECTION:=		fs
 PKG_DEPENDS:=		libcom-err libuuid libblkid libpthread
 PKG_URL:=		http://e2fsprogs.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}

package/ebtables/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.0.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0e0c20adf2bba6d91dbd0b74a1a38c33
 PKG_DESCR:=		ethernet bridging firewall tool
-PKG_SECTION:=		net
+PKG_SECTION:=		firewall
 PKG_URL:=		http://ebtables.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ebtables/}
 

package/elinks/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.11.7
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		145c510cae41c204d0f23dce4bdd23ab
 PKG_DESCR:=		advanced text web browser
-PKG_SECTION:=		text
+PKG_SECTION:=		browser
 PKG_DEPENDS:=		libopenssl
 PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://elinks.or.cz/

package/esound/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.2.41
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
-PKG_SECTION:=		net
+PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libaudiofile
 PKG_BUILDDEP+=		libaudiofile
 PKG_URL:=		http://www.tux.org/~ricdude/EsounD.html

package/evilwm/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8fd9256c635cce2289b648a01d54202c
 PKG_DESCR:=		A minimalist window manager for the X Window System
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libx11 libxext
 PKG_BUILDDEP+=		libX11 libXext
 PKG_URL:=		http://www.6809.org.uk/evilwm/

package/exmap/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.4.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		55aec784e214037e61400287a55b5426
 PKG_DESCR:=		memory analysing client tool
-PKG_SECTION:=		utils
+PKG_SECTION:=		debug
 PKG_DEPENDS:=		kmod-exmap libreadline glib
 PKG_BUILDDEP+=		glib readline
 PKG_SITES:=		http://labs.o-hand.com/sources/exmap-console/
@@ -19,13 +19,14 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
 PKG_DESCR_EXMAPD:=	memory analysing daemon
 PKG_DESCR_EXMAPSERVER:=	memory analysing server
 PKG_DESCR_KMOD_EXMAP:=	memory analysing kernel module
+PKG_SECTION_KMOD_EXMAP:=kernel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPD},${PKG_SECTION}))
 $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION_KMOD_EXMAP}))
 
 CONFIGURE_ARGS+=	--disable-doc
 CONFIGURE_ENV+=		LIBS="-lncurses"

package/ez-ipupdate/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		3.0.11b8
 PKG_RELEASE:=		10
 PKG_MD5SUM:=		000211add4c4845ffa4211841bff4fb0
 PKG_DESCR:=		a client for dynamic DNS services
-PKG_SECTION:=		net
+PKG_SECTION:=		dns
 PKG_URL:=		http://ez-ipupdate.com
 PKG_SITES:=		http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \
 			http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate/

package/fakeidentd/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ebf398bd1843a1fd8c71f5fcf4a6e4f7
 PKG_DESCR:=		A static, secure identd
-PKG_SECTION:=		net
+PKG_SECTION:=		net/misc
 PKG_SITES:=		http://distfiles.gentoo.org/distfiles/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2

package/fetchmail/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		6.3.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		72c20ad2b9629f1a109668b05a84d823
 PKG_DESCR:=		fetch mail from a POP or IMAP server
-PKG_SECTION:=		text
+PKG_SECTION:=		mail
 ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
 PKG_BUILDDEP+=		openssl
 endif

package/ffmpeg/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d6142a9a5821d6a6262a6edb903faa24
 PKG_DESCR:=		solution to record, convert and stream audio and video
-PKG_SECTION:=		sound
+PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libfaad2
 PKG_BUILDDEP+=		faad2
 PKG_URL:=		http://www.ffmpeg.org

package/firefox/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		3.6.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c9a071b31bb90d05edfb93117d0a7537
 PKG_DESCR:=		graphical webbrowser
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk+ libnotify libidl
 PKG_DEPENDS+=		nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
 PKG_DEPENDS+=		libxdamage libxfixes

package/flex/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.5.35
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		201d3f38758d95436cbc64903386de0b
 PKG_DESCR:=		fast lexical analyzer
-PKG_SECTION:=		utils
+PKG_SECTION:=		lang
 PKG_URL:=		http://flex.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
 

package/fluxbox/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e0be927617be4ffc1ddc79513f4eb0f9
 PKG_DESCR:=		Fluxbox is an X11 window manager featuring tabs and an iconbar
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		libXpm
 ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)

package/font-adobe-100dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		93bd04e2fb348a0c48e13ab3933f2381
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_DEPENDS:=		font-util
 PKG_BUILDDEP+=		font-util
 PKG_URL:=		http://www.x.org/

package/font-adobe-75dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d22283daba10129643800d73f5496aab
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_DEPENDS:=		font-util
 PKG_BUILDDEP+=		font-util
 PKG_URL:=		http://www.x.org/

package/font-bh-100dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d9383b2ddda241a464343b7b4de370a9
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bh-75dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		200b38e879dcbf922ca2a9f71ad44657
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bh-lucidatypewriter-100dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8fa38b7845c10ff83d6077a1e238b15b
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bh-lucidatypewriter-75dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f36b68aabef2d57258131ce6136c6f50
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bh-ttf/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		baea1bb10808857e595f13c6be9cbfbe
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bh-type1/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		000da66f92370ac59e3df1b6719fdd9a
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bitstream-100dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		823c3c2a1a2307bdca5961145e3db37d
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bitstream-75dpi/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f8e982bcaaed199fdac03e9fc12b2952
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-bitstream-type1/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		08722299c09753a5540a0752ec5b5fc7
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-misc-misc/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		047eae4d061f17d96213c4e78f7abccb
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_BUILDDEP+=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}

package/font-util/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		171ebfd3733aeae3af91ad57d126d29d
 PKG_DESCR:=		font util
-PKG_SECTION:=		libs
+PKG_SECTION:=		x11/apps
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/font-xfree86-type1/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		785f2b6e8d6d0dafec08b8d4c54ae2e3
 PKG_DESCR:=		X fonts
-PKG_SECTION:=		x11
+PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 

package/freeradius-client/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		edd4d904e802ff66d35532be1475cfa7
 PKG_DESCR:=		RADIUS client
-PKG_SECTION:=		net
+PKG_SECTION:=		ppp
 PKG_DEPENDS:=		libopenssl
 PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://www.freeradius.org
@@ -16,10 +16,12 @@ PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/ \
 			http://freeradius.portal-to-web.de/ \
 			ftp://ftp.uk.freeradius.org/pub/radius/
 
+PKG_SECTION_LIB:=	libs
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
 
 CONFIGURE_ENV+=		ac_cv_func_uname=no
 

package/freeradius-server/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.1.8
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		aa2ae711387af144df7c351b28b8789c
 PKG_DESCR:=		a flexible RADIUS server
-PKG_SECTION:=		net
+PKG_SECTION:=		ppp
 PKG_MULTI:=		1
 PKG_DEPENDS:=		libltdl libopenssl libpthread
 PKG_BUILDDEP+=		libtool openssl

package/frickin/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.3
 PKG_RELEASE:=		9
 PKG_MD5SUM:=		5b2e98da2310c71c703d4617b88a173f
 PKG_DESCR:=		PPTP proxy
-PKG_SECTION:=		net
+PKG_SECTION:=		proxy
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=frickin/}
 
 include ${TOPDIR}/mk/package.mk

package/fuse/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.7.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		4879f06570d2225667534c37fea04213
 PKG_DESCR:=		Filesystem in Userspace (utilities)
-PKG_SECTION:=		admin
+PKG_SECTION:=		fs
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://fuse.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}

package/gatling/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a0fb49ccb6b910bdbd7e76a9960394e3
 PKG_DESCR:=		small non-forking webserver
-PKG_SECTION:=		net
+PKG_SECTION:=		www
 PKG_DEPENDS:=		libiconv
 PKG_BUILDDEP+=		libowfat libiconv
 PKG_URL:=		http://www.fefe.de/gatling/

package/gawk/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		3.1.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a38d5dec19320ace01f1d16c8beb1363
 PKG_DESCR:=		GNU awk
-PKG_SECTION:=		utils
+PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/gawk/
 PKG_SITES:=		${MASTER_SITE_GNU:=gawk/}
 

package/gcc/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/gcc/Makefile.inc
 
 PKG_DESCR:=		GNU compiler collection
-PKG_SECTION:=		comp
+PKG_SECTION:=		lang
 PKG_OPTS:=		noremove
 PKG_DEPENDS:=		libgmp mpfr
 PKG_BUILDDEP+=		gmp mpfr

package/gdb/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_DESCR:=		GNU debugger
-PKG_SECTION:=		comp
+PKG_SECTION:=		debug
 PKG_DEPENDS:=		libthread-db libncurses libiconv libexpat
 PKG_BUILDDEP+=		ncurses readline libiconv expat
 PKG_TARGET_DEPENDS:=	!foxboard !ag241

package/gdbserver/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_DESCR:=		GNU debugger (small server)
-PKG_SECTION:=		comp
+PKG_SECTION:=		debug
 PKG_DEPENDS:=		libthread-db
 
 PKG_TARGET_DEPENDS:=    !foxboard

package/gkrellmd/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.3.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		600f4daa395112ed19a3633deb0829ff
 PKG_DESCR:=		The GNU Krell Monitors Server
-PKG_SECTION:=		net
+PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		glib libpthread
 PKG_BUILDDEP+=		glib
 PKG_URL:=		http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html

package/glproto/Makefile

@@ -7,10 +7,7 @@ PKG_NAME:=		glproto
 PKG_VERSION:=		1.4.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		78e7c4dc7dcb74b1869fee7897e00f59
-PKG_DESCR:=		GL proto headers
-PKG_URL:=		add project url
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk

package/gmediaserver/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.13.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
 PKG_DESCR:=		An UPnP music media server
-PKG_SECTION:=		net
+PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		id3lib libupnp
 PKG_BUILDDEP+=		id3lib libupnp
 PKG_URL:=		http://www.gnu.org/software/gmediaserver

package/gnupg/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		991faf66d3352ac1452acc393c430b23
 PKG_DESCR:=		Gnu Privacy Guard
-PKG_SECTION:=		text
+PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libreadline libiconv
 PKG_BUILDDEP+=		readline libiconv
 PKG_URL:=		http://www.gnupg.org

package/gnutls/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.8.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e3b2788b79bfc82acbe717e3c54d4e92
 PKG_DESCR:=		GNU TLS library
-PKG_SECTION:=		libs
+PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib
 PKG_BUILDDEP+=		libgcrypt liblzo libtasn1 opencdk zlib ncurses
 PKG_URL:=		http://www.gnu.org/software/gnutls
@@ -18,13 +18,14 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_DESCR_GNUTLS_UTILS:=	GNU TLS utilities
 PKG_DEPENDS_GNUTLS_UTILS:=	libgnutls libgnutls-extra
+PKG_SECTION_LIB:=	libs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
 $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_GNUTLS_UTILS},${PKG_DESCR_GNUTLS_UTILS},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
 
 CONFIGURE_ARGS+=	--without-libopencdk-prefix \
 			--disable-camellia \